* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2012-01-20 18:24 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-01-20 18:24 UTC (permalink / raw
To: gentoo-commits
slyfox 12/01/20 18:24:09
Modified: ChangeLog haskell-cabal.eclass
Log:
Added stdout echoing of most executed phase commands. Added stub for CABAL_USE_HSCOLOUR feature to ease ebuild syncing from haskell overlay.
Revision Changes Path
1.99 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.98&r2=1.99
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- ChangeLog 19 Jan 2012 21:49:38 -0000 1.98
+++ ChangeLog 20 Jan 2012 18:24:08 -0000 1.99
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.98 2012/01/19 21:49:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.99 2012/01/20 18:24:08 slyfox Exp $
+
+ 20 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Added stdout echoing of most executed phase commands. Added stub for
+ CABAL_USE_HSCOLOUR feature to ease ebuild syncing from haskell overlay.
19 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Add AM_CONFIG_HEADER check (for pixman autoreconf).
1.26 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.25&r2=1.26
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- haskell-cabal.eclass 22 Aug 2011 04:46:32 -0000 1.25
+++ haskell-cabal.eclass 20 Jan 2012 18:24:09 -0000 1.26
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.25 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.26 2012/01/20 18:24:09 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -73,6 +73,7 @@
case ${feature} in
haddock) CABAL_USE_HADDOCK=yes;;
hscolour) CABAL_USE_HSCOLOUR=yes;;
+ hoogle) CABAL_USE_HOOGLE=yes;;
alex) CABAL_USE_ALEX=yes;;
happy) CABAL_USE_HAPPY=yes;;
c2hs) CABAL_USE_C2HS=yes;;
@@ -175,10 +176,12 @@
einfo "Using cabal-$(cabal-version)."
make_setup() {
- $(ghc-getghc) -package "${cabalpackage}" --make "${setupmodule}" \
+ set -- -package "${cabalpackage}" --make "${setupmodule}" \
${GHC_BOOTSTRAP_FLAGS} \
"$@" \
-o setup
+ echo $(ghc-getghc) "$@"
+ $(ghc-getghc) "$@"
}
if $(ghc-supports-shared-libraries); then
# some custom build systems might use external libraries,
@@ -205,16 +208,22 @@
}
cabal-hscolour() {
- ./setup hscolour || die "setup hscolour failed"
+ set -- hscolour "$@"
+ echo ./setup "$@"
+ ./setup "$@" || die "setup hscolour failed"
}
cabal-haddock() {
- ./setup haddock || die "setup haddock failed"
+ set -- haddock "$@"
+ echo ./setup "$@"
+ ./setup "$@" || die "setup haddock failed"
}
cabal-hscolour-haddock() {
# --hyperlink-source implies calling 'setup hscolour'
- ./setup haddock --hyperlink-source || die "setup haddock failed"
+ set -- haddock --hyperlink-source
+ echo ./setup "$@"
+ ./setup "$@" --hyperlink-source || die "setup haddock --hyperlink-source failed"
}
cabal-configure() {
@@ -279,7 +288,7 @@
$(ghc-supports-shared-libraries) && \
cabalconf="${cabalconf} --enable-shared"
- ./setup configure \
+ set -- configure \
--ghc --prefix="${EPREFIX}"/usr \
--with-compiler="$(ghc-getghc)" \
--with-hc-pkg="$(ghc-getghcpkg)" \
@@ -291,21 +300,25 @@
${cabalconf} \
${CABAL_CONFIGURE_FLAGS} \
${CABAL_EXTRA_CONFIGURE_FLAGS} \
- "$@" || die "setup configure failed"
+ "$@"
+ echo ./setup "$@"
+ ./setup "$@" || die "setup configure failed"
}
cabal-build() {
unset LANG LC_ALL LC_MESSAGES
- ./setup build \
+ set -- build "$@"
+ echo ./setup "$@"
+ ./setup "$@" \
|| die "setup build failed"
}
cabal-copy() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && ED=${D}
- ./setup copy \
- --destdir="${D}" \
- || die "setup copy failed"
+ set -- copy --destdir="${D}" "$@"
+ echo ./setup "$@"
+ ./setup "$@" || die "setup copy failed"
# cabal is a bit eager about creating dirs,
# so remove them if they are empty
@@ -451,7 +464,9 @@
einfo ">>> No tests for dummy library: ${CATEGORY}/${PF}"
else
einfo ">>> Test phase [cabal test]: ${CATEGORY}/${PF}"
- ./setup test || die "cabal test failed"
+ set -- test "$@"
+ echo ./setup "$@"
+ ./setup "$@" || die "cabal test failed"
fi
popd > /dev/null
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2012-02-07 12:47 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-02-07 12:47 UTC (permalink / raw
To: gentoo-commits
slyfox 12/02/07 12:47:54
Modified: ChangeLog haskell-cabal.eclass
Log:
Added support for CABAL_EXTRA_BUILD_FLAGS and HCFLAGS magic variables
CABAL_EXTRA_BUILD_FLAGS allows user to pass arguments to ./setup build phase.
For example you can get detailed build log this way:
CABAL_EXTRA_BUILD_FLAGS=-v emerge something
HCFLAGS is similar to CFLAGS / CXXFLAGS / FFLAGS in spirit.
You can use it in make.conf or in one-shot merges to enable
random ghc features:
HCFLAGS="-O0 -Wall" emerge something-else
Revision Changes Path
1.117 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.117&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.117&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.116&r2=1.117
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ChangeLog 6 Feb 2012 13:13:44 -0000 1.116
+++ ChangeLog 7 Feb 2012 12:47:54 -0000 1.117
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.116 2012/02/06 13:13:44 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.117 2012/02/07 12:47:54 slyfox Exp $
+
+ 07 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Added support for CABAL_EXTRA_BUILD_FLAGS and HCFLAGS magic variables.
06 Feb 2012; Nirbheek Chauhan <nirbheek@gentoo.org> mozconfig-3.eclass:
Depend on an icon theme, fixes bug 341697
1.27 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.26&r2=1.27
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- haskell-cabal.eclass 20 Jan 2012 18:24:09 -0000 1.26
+++ haskell-cabal.eclass 7 Feb 2012 12:47:54 -0000 1.27
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.26 2012/01/20 18:24:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.27 2012/02/07 12:47:54 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -52,6 +52,12 @@
# example: /etc/make.conf: CABAL_EXTRA_CONFIGURE_FLAGS=--enable-shared
: ${CABAL_EXTRA_CONFIGURE_FLAGS:=}
+# @ECLASS-VARIABLE: CABAL_EXTRA_BUILD_FLAGS
+# @DESCRIPTION:
+# User-specified additional parameters passed to 'setup build'.
+# example: /etc/make.conf: CABAL_EXTRA_BUILD_FLAGS=-v
+: ${CABAL_EXTRA_BUILD_FLAGS:=}
+
# @ECLASS-VARIABLE: GHC_BOOTSTRAP_FLAGS
# @DESCRIPTION:
# User-specified additional parameters for ghc when building
@@ -180,7 +186,7 @@
${GHC_BOOTSTRAP_FLAGS} \
"$@" \
-o setup
- echo $(ghc-getghc) "$@"
+ echo $(ghc-getghc) ${HCFLAGS} "$@"
$(ghc-getghc) "$@"
}
if $(ghc-supports-shared-libraries); then
@@ -250,6 +256,12 @@
cabalconf="${cabalconf} --with-cpphs=${EPREFIX}/usr/bin/cpphs"
fi
+ local option
+ for option in ${HCFLAGS}
+ do
+ cabalconf+=" --ghc-option=$option"
+ done
+
# Building GHCi libs on ppc64 causes "TOC overflow".
if use ppc64; then
cabalconf="${cabalconf} --disable-library-for-ghci"
@@ -307,7 +319,7 @@
cabal-build() {
unset LANG LC_ALL LC_MESSAGES
- set -- build "$@"
+ set -- build ${CABAL_EXTRA_BUILD_FLAGS} "$@"
echo ./setup "$@"
./setup "$@" \
|| die "setup build failed"
@@ -404,7 +416,7 @@
cabal-bootstrap
- cabal-configure $ghc_flags "$@"
+ cabal-configure "$@"
popd > /dev/null
fi
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2012-03-09 22:01 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-03-09 22:01 UTC (permalink / raw
To: gentoo-commits
slyfox 12/03/09 22:01:11
Modified: ChangeLog haskell-cabal.eclass
Log:
Drop haddock from DEPENDS when USE=doc haddock. haddock-2.9.2+ can be used right in the ebuild phase to build it's docs.
Revision Changes Path
1.158 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.158&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.158&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.157&r2=1.158
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- ChangeLog 8 Mar 2012 14:24:40 -0000 1.157
+++ ChangeLog 9 Mar 2012 22:01:11 -0000 1.158
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.157 2012/03/08 14:24:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.158 2012/03/09 22:01:11 slyfox Exp $
+
+ 09 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Drop haddock from DEPENDS when USE=doc haddock. haddock-2.9.2+ can be used
+ right in the ebuild phase to build it's docs.
08 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Die earlier on unsupported EAPI.
1.28 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.27&r2=1.28
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- haskell-cabal.eclass 7 Feb 2012 12:47:54 -0000 1.27
+++ haskell-cabal.eclass 9 Mar 2012 22:01:11 -0000 1.28
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.27 2012/02/07 12:47:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.28 2012/03/09 22:01:11 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -95,7 +95,9 @@
if [[ -n "${CABAL_USE_HADDOCK}" ]]; then
IUSE="${IUSE} doc"
- DEPEND="${DEPEND} doc? ( dev-haskell/haddock )"
+ # don't require depend on itself to build docs.
+ # ebuild bootstraps docs from just built binary
+ [[ ${CATEGORY}/${PN} = "dev-haskell/haddock" ]] || DEPEND="${DEPEND} doc? ( dev-haskell/haddock )"
fi
if [[ -n "${CABAL_USE_HSCOLOUR}" ]]; then
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2012-04-14 19:30 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-04-14 19:30 UTC (permalink / raw
To: gentoo-commits
slyfox 12/04/14 19:30:53
Modified: ChangeLog haskell-cabal.eclass
Log:
fix -dynamic './setup configure' failures against newer libffi (bug #411789 by Leonid Podolny)
Revision Changes Path
1.209 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.209&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.209&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.208&r2=1.209
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- ChangeLog 9 Apr 2012 18:08:45 -0000 1.208
+++ ChangeLog 14 Apr 2012 19:30:53 -0000 1.209
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.208 2012/04/09 18:08:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.209 2012/04/14 19:30:53 slyfox Exp $
+
+ 14 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ fix -dynamic './setup configure' failures against newer libffi (bug #411789
+ by Leonid Podolny)
09 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> ghc-package.eclass,
haskell-cabal.eclass:
1.30 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.29&r2=1.30
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- haskell-cabal.eclass 9 Apr 2012 18:08:45 -0000 1.29
+++ haskell-cabal.eclass 14 Apr 2012 19:30:53 -0000 1.30
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.29 2012/04/09 18:08:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.30 2012/04/14 19:30:53 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -172,9 +172,12 @@
$(ghc-getghc) "$@"
}
if $(ghc-supports-shared-libraries); then
- # some custom build systems might use external libraries,
- # for which we don't have shared libs, so keep static fallback
- make_setup -dynamic "$@" || make_setup "$@" || die "compiling ${setupmodule} failed"
+ # # some custom build systems might use external libraries,
+ # # for which we don't have shared libs, so keep static fallback
+ # Disabled '-dynamic' as ghc does not embed RPATH to used extra-libraries:
+ # bug #411789, http://hackage.haskell.org/trac/ghc/ticket/5743#comment:3
+ # make_setup -dynamic "$@" ||
+ make_setup "$@" || die "compiling ${setupmodule} failed"
else
make_setup "$@" || die "compiling ${setupmodule} failed"
fi
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2012-04-14 20:22 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-04-14 20:22 UTC (permalink / raw
To: gentoo-commits
slyfox 12/04/14 20:22:23
Modified: ChangeLog haskell-cabal.eclass
Log:
move 'dev-haskell/cabal' santy check out from 'pkg_*' to 'src_*' function to allow binary installation. Reported by tamiko.
Revision Changes Path
1.210 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.210&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.210&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.209&r2=1.210
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- ChangeLog 14 Apr 2012 19:30:53 -0000 1.209
+++ ChangeLog 14 Apr 2012 20:22:23 -0000 1.210
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.209 2012/04/14 19:30:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.210 2012/04/14 20:22:23 slyfox Exp $
+
+ 14 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ move 'dev-haskell/cabal' santy check out from 'pkg_*' to 'src_*' function to
+ allow binary installation. Reported by tamiko.
14 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
fix -dynamic './setup configure' failures against newer libffi (bug #411789
1.31 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.30&r2=1.31
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- haskell-cabal.eclass 14 Apr 2012 19:30:53 -0000 1.30
+++ haskell-cabal.eclass 14 Apr 2012 20:22:23 -0000 1.31
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.30 2012/04/14 19:30:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.31 2012/04/14 20:22:23 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -158,6 +158,13 @@
die "No Setup.lhs or Setup.hs found"
fi
+ if [[ -z "${CABAL_BOOTSTRAP}" && -z "${CABAL_FROM_GHC}" ]] && ! ghc-sanecabal "${CABAL_MIN_VERSION}"; then
+ eerror "The package dev-haskell/cabal is not correctly installed for"
+ eerror "the currently active version of ghc ($(ghc-version)). Please"
+ eerror "run haskell-updater or re-build dev-haskell/cabal."
+ die "cabal is not correctly installed"
+ fi
+
# We build the setup program using the latest version of
# cabal that we have installed
cabalpackage=Cabal-$(cabal-version)
@@ -344,12 +351,6 @@
# exported function: check if cabal is correctly installed for
# the currently active ghc (we cannot guarantee this with portage)
haskell-cabal_pkg_setup() {
- if [[ -z "${CABAL_BOOTSTRAP}" && -z "${CABAL_FROM_GHC}" ]] && ! ghc-sanecabal "${CABAL_MIN_VERSION}"; then
- eerror "The package dev-haskell/cabal is not correctly installed for"
- eerror "the currently active version of ghc ($(ghc-version)). Please"
- eerror "run haskell-updater or re-build dev-haskell/cabal."
- die "cabal is not correctly installed"
- fi
if [[ -z "${CABAL_HAS_BINARIES}" ]] && [[ -z "${CABAL_HAS_LIBRARIES}" ]]; then
eqawarn "QA Notice: Neither bin nor lib are in CABAL_FEATURES."
fi
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2012-04-19 17:33 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-04-19 17:33 UTC (permalink / raw
To: gentoo-commits
slyfox 12/04/19 17:33:19
Modified: ChangeLog haskell-cabal.eclass
Log:
Added CABAL_FEATURES=test-suite by Alexander Vershilov. It enables building of test suites introduced in Cabal-1.8
Revision Changes Path
1.216 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.216&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.216&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.215&r2=1.216
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- ChangeLog 19 Apr 2012 14:52:12 -0000 1.215
+++ ChangeLog 19 Apr 2012 17:33:19 -0000 1.216
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.215 2012/04/19 14:52:12 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.216 2012/04/19 17:33:19 slyfox Exp $
+
+ 19 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Added CABAL_FEATURES=test-suite by Alexander Vershilov. It enables building
+ of test suites introduced in Cabal-1.8
19 Apr 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Add appropriate blockers for qt-bearer.
1.32 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.31&r2=1.32
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- haskell-cabal.eclass 14 Apr 2012 20:22:23 -0000 1.31
+++ haskell-cabal.eclass 19 Apr 2012 17:33:19 -0000 1.32
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.31 2012/04/14 20:22:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.32 2012/04/19 17:33:19 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -30,6 +30,7 @@
# nocabaldep -- don't add dependency on cabal.
# only used for packages that _must_ not pull the dependency
# on cabal, but still use this eclass (e.g. haskell-updater).
+# test-suite -- add support for cabal test-suites (introduced in Cabal-1.8)
inherit ghc-package multilib
@@ -76,6 +77,7 @@
bin) CABAL_HAS_BINARIES=yes;;
lib) CABAL_HAS_LIBRARIES=yes;;
nocabaldep) CABAL_FROM_GHC=yes;;
+ test-suite) CABAL_TEST_SUITE=yes;;
*) CABAL_UNKNOWN="${CABAL_UNKNOWN} ${feature}";;
esac
done
@@ -112,6 +114,10 @@
IUSE="${IUSE} profile"
fi
+if [[ -n "${CABAL_TEST_SUITE}" ]]; then
+ IUSE="${IUSE} test"
+fi
+
# We always use a standalone version of Cabal, rather than the one that comes
# with GHC. But of course we can't depend on cabal when building cabal itself.
if [[ -z ${CABAL_MIN_VERSION} ]]; then
@@ -247,6 +253,9 @@
if [[ -n "${CABAL_USE_CPPHS}" ]]; then
cabalconf="${cabalconf} --with-cpphs=${EPREFIX}/usr/bin/cpphs"
fi
+ if [[ -n "${CABAL_TEST_SUITE}" ]]; then
+ cabalconf="${cabalconf} $(use_enable test tests)"
+ fi
local option
for option in ${HCFLAGS}
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2012-07-08 19:16 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-07-08 19:16 UTC (permalink / raw
To: gentoo-commits
slyfox 12/07/08 19:16:46
Modified: ChangeLog haskell-cabal.eclass
Log:
Allow wildcards in CABAL_CORE_LIB_GHC_PV. Guard against breakage of ghc-shipped libraries.
Revision Changes Path
1.338 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.338&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.338&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.337&r2=1.338
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- ChangeLog 8 Jul 2012 12:38:10 -0000 1.337
+++ ChangeLog 8 Jul 2012 19:16:46 -0000 1.338
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.337 2012/07/08 12:38:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.338 2012/07/08 19:16:46 slyfox Exp $
+
+ 08 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Allow wildcards in CABAL_CORE_LIB_GHC_PV. Guard against breakage of
+ ghc-shipped libraries.
08 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> ruby-ng.eclass:
Add a function to wrap around testrb-2 as well.
1.33 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.32&r2=1.33
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- haskell-cabal.eclass 19 Apr 2012 17:33:19 -0000 1.32
+++ haskell-cabal.eclass 8 Jul 2012 19:16:46 -0000 1.33
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.32 2012/04/19 17:33:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.33 2012/07/08 19:16:46 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -352,7 +352,7 @@
# You can also put a space separated list, eg CABAL_CORE_LIB_GHC_PV="6.6 6.6.1".
cabal-is-dummy-lib() {
for version in ${CABAL_CORE_LIB_GHC_PV[*]}; do
- [[ "$(ghc-version)" == "$version" ]] && return 0
+ [[ "$(ghc-version)" == ${version} ]] && return 0
done
return 1
}
@@ -461,6 +461,25 @@
dodir ${ghc_confdir_with_prefix#${EPREFIX}}
local conf_file="${D}/$(ghc-confdir)/$(ghc-localpkgconf)"
[[ -e $conf_file ]] || echo '[]' > "$conf_file" || die
+
+ # make sure installed packages do not destroy ghc's
+ # bundled packages
+ local initial_pkg_db=${ROOT}/$(ghc-libdir)/package.conf.d.initial
+ if [[ -e ${initial_pkg_db} ]]; then
+ local checked_pkg
+ for checked_pkg in $(ghc-listpkg "${conf_file}")
+ do
+ local initial_pkg
+ for initial_pkg in $(ghc-listpkg "${initial_pkg_db}"); do
+ if [[ ${checked_pkg} = ${initial_pkg} ]]; then
+ eerror "Package ${checked_pkg} is shipped with $(ghc-version)."
+ eerror "Ebuild author forgot CABAL_CORE_LIB_GHC_PV entry."
+ eerror "Found in ${initial_pkg_db}."
+ die
+ fi
+ done
+ done
+ fi
}
haskell-cabal_src_install() {
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2012-11-19 20:35 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-11-19 20:35 UTC (permalink / raw
To: gentoo-commits
slyfox 12/11/19 20:35:16
Modified: ChangeLog haskell-cabal.eclass
Log:
Added new helper function 'cabal_chdeps' and and debug variable 'CABAL_DEBUG_LOOSENING' for it.
Revision Changes Path
1.512 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.512&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.512&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.511&r2=1.512
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -r1.511 -r1.512
--- ChangeLog 17 Nov 2012 16:02:17 -0000 1.511
+++ ChangeLog 19 Nov 2012 20:35:16 -0000 1.512
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.511 2012/11/17 16:02:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.512 2012/11/19 20:35:16 slyfox Exp $
+
+ 19 Nov 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Added new helper function 'cabal_chdeps' and and debug variable
+ 'CABAL_DEBUG_LOOSENING' for it.
17 Nov 2012; Mike Gilbert <floppym@gentoo.org> enlightenment.eclass:
Remove the minimum restriction from PYTHON_DEPEND; any version of python from
1.36 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.35&r2=1.36
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- haskell-cabal.eclass 16 Nov 2012 15:47:17 -0000 1.35
+++ haskell-cabal.eclass 19 Nov 2012 20:35:16 -0000 1.36
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.35 2012/11/16 15:47:17 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.36 2012/11/19 20:35:16 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -55,6 +55,12 @@
# linking 'setup' faster.
: ${GHC_BOOTSTRAP_FLAGS:=}
+# @ECLASS-VARIABLE: CABAL_DEBUG_LOOSENING
+# @DESCRIPTION:
+# Show debug output for 'cabal_chdeps' function if set.
+# Needs working 'diff'.
+: ${CABAL_DEBUG_LOOSENING:=}
+
HASKELL_CABAL_EXPF="pkg_setup src_compile src_test src_install"
case "${EAPI:-0}" in
@@ -535,3 +541,68 @@
return 0
}
+
+# @FUNCTION: cabal_chdeps
+# @DESCRIPTION:
+# Allows easier patching of $CABAL_FILE (${S}/${PN}.cabal by default)
+# depends
+#
+# Accepts argument list as pairs of substitutions: <from-string> <to-string>...
+#
+# Dies on error.
+#
+# Usage examples:
+#
+# src_prepare() {
+# cabal_chdeps \
+# 'base >= 4.2 && < 4.6' 'base >= 4.2 && < 4.7' \
+# 'containers ==0.4.*' 'containers >= 0.4 && < 0.6'
+#}
+# or
+# src_prepare() {
+# CABAL_FILE=${S}/${MY_PN}.cabal cabal_chdeps \
+# 'base >= 4.2 && < 4.6' 'base >= 4.2 && < 4.7'
+# CABAL_FILE=${S}/${MY_PN}-tools.cabal cabal_chdeps \
+# 'base == 3.*' 'base >= 4.2 && < 4.7'
+#}
+#
+cabal_chdeps() {
+ local cf=${CABAL_FILE:-${S}/${PN}.cabal}
+ local from_ss # ss - substring
+ local to_ss
+ local orig_c # c - contents
+ local new_c
+
+ [[ -f $cf ]] || die "cabal file '$cf' does not exist"
+
+ orig_c=$(< "$cf")
+
+ while :; do
+ from_pat=$1
+ to_str=$2
+ einfo "CHDEP: '${from_pat}' -> '${to_str}'"
+
+ [[ -n ${from_pat} ]] || break
+ [[ -n ${to_str} ]] || die "'${from_str}' does not have 'to' part"
+
+ # escape pattern-like symbols
+ from_pat=${from_pat//\*/\\*}
+ from_pat=${from_pat//\[/\\[}
+
+ new_c=${orig_c//${from_pat}/${to_str}}
+
+ if [[ -n $CABAL_DEBUG_LOOSENING ]]; then
+ echo "${orig_c}" >"${T}/${cf}".pre
+ echo "${new_c}" >"${T}/${cf}".post
+ diff -u "${T}/${cf}".{pre,post}
+ fi
+
+ [[ "${orig_c}" == "${new_c}" ]] && die "no trigger for '${from_ss}'"
+ orig_c=${new_c}
+ shift
+ shift
+ done
+
+ echo "${new_c}" > "$cf" ||
+ die "failed to update"
+}
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2013-07-29 12:31 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-07-29 12:31 UTC (permalink / raw
To: gentoo-commits
slyfox 13/07/29 12:31:35
Modified: ChangeLog haskell-cabal.eclass
Log:
ask user to run haskell-updater for old packages (like in bug http://bugs.gentoo.org/474840)
Revision Changes Path
1.903 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.903&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.903&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.902&r2=1.903
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -r1.902 -r1.903
--- ChangeLog 29 Jul 2013 09:53:36 -0000 1.902
+++ ChangeLog 29 Jul 2013 12:31:35 -0000 1.903
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.902 2013/07/29 09:53:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.903 2013/07/29 12:31:35 slyfox Exp $
+
+ 29 Jul 2013; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ ask user to run haskell-updater for old packages (like in bug
+ http://bugs.gentoo.org/474840)
29 Jul 2013; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
Fortran-2.eclass: enhance support for binary packages, #477070
1.41 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.40&r2=1.41
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- haskell-cabal.eclass 11 May 2013 12:46:32 -0000 1.40
+++ haskell-cabal.eclass 29 Jul 2013 12:31:35 -0000 1.41
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.40 2013/05/11 12:46:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.41 2013/07/29 12:31:35 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -242,22 +242,33 @@
./setup "$@" --hyperlink-source || die "setup haddock --hyperlink-source failed"
}
+cabal-die-if-nonempty() {
+ local breakage_type=$1
+ shift
+
+ [[ "${#@}" == 0 ]] && return 0
+ eerror "Detected ${breakage_type} packages: ${@}"
+ die "//==-- Please, run 'haskell-updater' to fix ${breakage_type} packages --==//"
+}
+
cabal-show-brokens() {
# pretty-printer
$(ghc-getghcpkg) check 2>&1 \
| egrep -v '^Warning: haddock-(html|interfaces): ' \
| egrep -v '^Warning: include-dirs: '
- set -- $($(ghc-getghcpkg) check --simple-output)
- [[ "${#@}" == 0 ]] && return 0
-
- eerror "Detected broken packages: ${@}"
+ cabal-die-if-nonempty 'broken' \
+ $($(ghc-getghcpkg) check --simple-output)
+}
- die "//==-- Please, run 'haskell-updater' to fix broken packages --==//"
+cabal-show-old() {
+ cabal-die-if-nonempty 'outdated' \
+ $("${EPREFIX}"/usr/sbin/haskell-updater --quiet --upgrade --list-only)
}
cabal-show-brokens-and-die() {
cabal-show-brokens
+ cabal-show-old
die "$@"
}
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2013-11-20 9:19 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-11-20 9:19 UTC (permalink / raw
To: gentoo-commits
slyfox 13/11/20 09:19:19
Modified: ChangeLog haskell-cabal.eclass
Log:
Added 'replace-hcflags()'. Filters HCFLAGS.
Revision Changes Path
1.1062 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1062&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1062&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1061&r2=1.1062
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1061
retrieving revision 1.1062
diff -u -r1.1061 -r1.1062
--- ChangeLog 20 Nov 2013 06:09:43 -0000 1.1061
+++ ChangeLog 20 Nov 2013 09:19:19 -0000 1.1062
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1061 2013/11/20 06:09:43 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1062 2013/11/20 09:19:19 slyfox Exp $
+
+ 20 Nov 2013; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Added 'replace-hcflags()'. Filters HCFLAGS.
20 Nov 2013; Steve Arnold <nerdboy@gentoo.org> gnatbuild.eclass:
Updated to strip graphite flags (all arches) and enable the openmp USE
1.42 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.41&r2=1.42
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- haskell-cabal.eclass 29 Jul 2013 12:31:35 -0000 1.41
+++ haskell-cabal.eclass 20 Nov 2013 09:19:19 -0000 1.42
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.41 2013/07/29 12:31:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.42 2013/11/20 09:19:19 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -638,3 +638,25 @@
echo "${new_c}" > "$cf" ||
die "failed to update"
}
+
+# @FUNCTION: replace-hcflags
+# @USAGE: <old> <new>
+# @DESCRIPTION:
+# Replace the <old> flag with <new> in HCFLAGS. Accepts shell globs for <old>.
+# The implementation is picked from flag-o-matic.eclass:replace-flags()
+replace-hcflags() {
+ [[ $# != 2 ]] && die "Usage: replace-hcflags <old flag> <new flag>"
+
+ local f new=()
+ for f in ${HCFLAGS} ; do
+ # Note this should work with globs like -O*
+ if [[ ${f} == ${1} ]]; then
+ einfo "HCFLAGS: replacing '${f}' to '${2}'"
+ f=${2}
+ fi
+ new+=( "${f}" )
+ done
+ export HCFLAGS="${new[*]}"
+
+ return 0
+}
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2014-05-22 16:35 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-05-22 16:35 UTC (permalink / raw
To: gentoo-commits
slyfox 14/05/22 16:35:11
Modified: ChangeLog haskell-cabal.eclass
Log:
cabal_chdeps() now defaults to MY_PN (autogenerated by hackport) if exists, then to PN
Revision Changes Path
1.1264 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1264&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1264&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1263&r2=1.1264
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1263
retrieving revision 1.1264
diff -u -r1.1263 -r1.1264
--- ChangeLog 22 May 2014 16:30:59 -0000 1.1263
+++ ChangeLog 22 May 2014 16:35:11 -0000 1.1264
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1263 2014/05/22 16:30:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1264 2014/05/22 16:35:11 slyfox Exp $
+
+ 22 May 2014; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ cabal_chdeps() now defaults to MY_PN (autogenerated by hackport) if exists,
+ then to PN
22 May 2014; Sergei Trofimovich <slyfox@gentoo.org> darcs.eclass:
store darcs cache in DISTDIR
1.44 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.43&r2=1.44
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- haskell-cabal.eclass 11 Feb 2014 19:00:06 -0000 1.43
+++ haskell-cabal.eclass 22 May 2014 16:35:11 -0000 1.44
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.43 2014/02/11 19:00:06 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.44 2014/05/22 16:35:11 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -180,10 +180,11 @@
make_setup() {
set -- -package "${cabalpackage}" --make "${setupmodule}" \
+ ${HCFLAGS} \
${GHC_BOOTSTRAP_FLAGS} \
"$@" \
-o setup
- echo $(ghc-getghc) ${HCFLAGS} "$@"
+ echo $(ghc-getghc) "$@"
$(ghc-getghc) "$@"
}
if $(ghc-supports-shared-libraries); then
@@ -209,18 +210,14 @@
}
cabal-mksetup() {
- local setupdir
+ local setupdir=${1:-${S}}
+ local setup_src=${setupdir}/Setup.hs
- if [[ -n $1 ]]; then
- setupdir=$1
- else
- setupdir=${S}
- fi
-
- rm -f "${setupdir}"/Setup.{lhs,hs}
+ rm -vf "${setupdir}"/Setup.{lhs,hs}
+ elog "Creating 'Setup.hs' for 'Simple' build type."
echo 'import Distribution.Simple; main = defaultMainWithHooks defaultUserHooks' \
- > $setupdir/Setup.hs || die "failed to create default Setup.hs"
+ > "${setup_src}" || die "failed to create default Setup.hs"
}
cabal-hscolour() {
@@ -252,10 +249,12 @@
}
cabal-show-brokens() {
+ elog "ghc-pkg check: 'checking for other broken packages:'"
# pretty-printer
$(ghc-getghcpkg) check 2>&1 \
| egrep -v '^Warning: haddock-(html|interfaces): ' \
- | egrep -v '^Warning: include-dirs: '
+ | egrep -v '^Warning: include-dirs: ' \
+ | head -n 20
cabal-die-if-nonempty 'broken' \
$($(ghc-getghcpkg) check --simple-output)
@@ -311,8 +310,10 @@
if ghc-supports-parallel-make; then
local max_jobs=$(makeopts_jobs)
- # limit to sort-of-sane value (same as Cabal)
- [[ ${max_jobs} -gt 64 ]] && max_jobs=64
+ # limit to very small value, as parallelism
+ # helps slightly, but makes things severely worse
+ # when amount of threads is Very Large.
+ [[ ${max_jobs} -gt 4 ]] && max_jobs=4
cabalconf+=(--ghc-option=-j"$max_jobs")
fi
@@ -619,7 +620,8 @@
#}
#
cabal_chdeps() {
- local cf=${CABAL_FILE:-${S}/${PN}.cabal}
+ local cabal_fn=${MY_PN:-${PN}}.cabal
+ local cf=${CABAL_FILE:-${S}/${cabal_fn}}
local from_ss # ss - substring
local to_ss
local orig_c # c - contents
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2014-06-27 7:16 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-06-27 7:16 UTC (permalink / raw
To: gentoo-commits
slyfox 14/06/27 07:16:47
Modified: ChangeLog haskell-cabal.eclass
Log:
Disable QA warning on '--with-hc --with-hc-pkg --with-gcc' flags passed by 'dev-haskell/cabal' to every configure-based haskell package. Don't unset LANG/LC_ALL/LC_MESSAGES anymore.
Revision Changes Path
1.1301 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1301&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1301&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1300&r2=1.1301
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1300
retrieving revision 1.1301
diff -u -r1.1300 -r1.1301
--- ChangeLog 26 Jun 2014 07:01:13 -0000 1.1300
+++ ChangeLog 27 Jun 2014 07:16:47 -0000 1.1301
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1300 2014/06/26 07:01:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1301 2014/06/27 07:16:47 slyfox Exp $
+
+ 27 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Disable QA warning on '--with-hc --with-hc-pkg --with-gcc' flags passed by
+ 'dev-haskell/cabal' to every configure-based haskell package. Don't unset
+ LANG/LC_ALL/LC_MESSAGES anymore.
26 Jun 2014; Justin Lecher <jlec@gentoo.org> readme.gentoo.eclass,
waf-utils.eclass:
1.45 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.44&r2=1.45
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- haskell-cabal.eclass 22 May 2014 16:35:11 -0000 1.44
+++ haskell-cabal.eclass 27 Jun 2014 07:16:47 -0000 1.45
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.44 2014/05/22 16:35:11 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.45 2014/06/27 07:16:47 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -63,6 +63,10 @@
HASKELL_CABAL_EXPF="pkg_setup src_compile src_test src_install"
+# 'dev-haskell/cabal' passes those options with ./configure-based
+# configuration, but most packages don't need/don't accept it
+QA_CONFIGURE_OPTIONS+=" --with-hc --with-hc-pkg --with-gcc"
+
case "${EAPI:-0}" in
2|3|4|5) HASKELL_CABAL_EXPF+=" src_configure" ;;
*) ;;
@@ -382,7 +386,6 @@
}
cabal-build() {
- unset LANG LC_ALL LC_MESSAGES
set -- build ${CABAL_EXTRA_BUILD_FLAGS} "$@"
echo ./setup "$@"
./setup "$@" \
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2014-06-27 7:26 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-06-27 7:26 UTC (permalink / raw
To: gentoo-commits
slyfox 14/06/27 07:26:18
Modified: ChangeLog haskell-cabal.eclass
Log:
Disable QA warning on '--with-compiler' passed by 'dev-haskell/cabal' (bug #515360 by Patrick Lauer).
Revision Changes Path
1.1302 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1302&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1302&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1301&r2=1.1302
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1301
retrieving revision 1.1302
diff -u -r1.1301 -r1.1302
--- ChangeLog 27 Jun 2014 07:16:47 -0000 1.1301
+++ ChangeLog 27 Jun 2014 07:26:18 -0000 1.1302
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1301 2014/06/27 07:16:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1302 2014/06/27 07:26:18 slyfox Exp $
+
+ 27 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Disable QA warning on '--with-compiler' passed by 'dev-haskell/cabal' (bug
+ #515360 by Patrick Lauer).
27 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
Disable QA warning on '--with-hc --with-hc-pkg --with-gcc' flags passed by
1.46 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.45&r2=1.46
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- haskell-cabal.eclass 27 Jun 2014 07:16:47 -0000 1.45
+++ haskell-cabal.eclass 27 Jun 2014 07:26:18 -0000 1.46
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.45 2014/06/27 07:16:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.46 2014/06/27 07:26:18 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -64,8 +64,9 @@
HASKELL_CABAL_EXPF="pkg_setup src_compile src_test src_install"
# 'dev-haskell/cabal' passes those options with ./configure-based
-# configuration, but most packages don't need/don't accept it
-QA_CONFIGURE_OPTIONS+=" --with-hc --with-hc-pkg --with-gcc"
+# configuration, but most packages don't need/don't accept it:
+# #515362, #515362
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-hc --with-hc-pkg --with-gcc"
case "${EAPI:-0}" in
2|3|4|5) HASKELL_CABAL_EXPF+=" src_configure" ;;
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2015-01-02 9:35 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2015-01-02 9:35 UTC (permalink / raw
To: gentoo-commits
slyfox 15/01/02 09:35:02
Modified: ChangeLog haskell-cabal.eclass
Log:
Properly disable USE=hoogle.
Revision Changes Path
1.1495 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1495&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1495&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1494&r2=1.1495
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1494
retrieving revision 1.1495
diff -u -r1.1494 -r1.1495
--- ChangeLog 2 Jan 2015 00:15:15 -0000 1.1494
+++ ChangeLog 2 Jan 2015 09:35:02 -0000 1.1495
@@ -1,6 +1,6 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1494 2015/01/02 00:15:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1495 2015/01/02 09:35:02 slyfox Exp $
02 Jan 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Make python.eclass commands/variables fatal once again since all in-tree
@@ -10,6 +10,9 @@
Add progress overlay-specific commands and variables to the invalid
command/variable lists.
+ 02 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Properly disable USE=hoogle.
+
01 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org> ghc-package.eclass,
haskell-cabal.eclass:
Add support for ghc-7.10 registration. User visible changes: ghc-package
1.48 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.47&r2=1.48
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- haskell-cabal.eclass 1 Jan 2015 21:23:03 -0000 1.47
+++ haskell-cabal.eclass 2 Jan 2015 09:35:02 -0000 1.48
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.47 2015/01/01 21:23:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.48 2015/01/02 09:35:02 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -112,7 +112,7 @@
if [[ -n "${CABAL_USE_HOOGLE}" ]]; then
# enabled only in ::gentoo-haskell
- :
+ CABAL_USE_HOOGLE=
fi
if [[ -n "${CABAL_USE_ALEX}" ]]; then
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2015-03-15 17:03 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2015-03-15 17:03 UTC (permalink / raw
To: gentoo-commits
slyfox 15/03/15 17:03:27
Modified: ChangeLog haskell-cabal.eclass
Log:
Respect CFLAGS. New syntax for revisions CABAL_CORE_LIB_GHC_PV="PM:${ghc_PVR}".
Revision Changes Path
1.1564 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1564&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1564&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1563&r2=1.1564
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1563
retrieving revision 1.1564
diff -u -r1.1563 -r1.1564
--- ChangeLog 15 Mar 2015 01:25:19 -0000 1.1563
+++ ChangeLog 15 Mar 2015 17:03:27 -0000 1.1564
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1563 2015/03/15 01:25:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1564 2015/03/15 17:03:27 slyfox Exp $
+
+ 15 Mar 2015; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Respect CFLAGS. New syntax for revisions
+ CABAL_CORE_LIB_GHC_PV="PM:${ghc_PVR}".
15 Mar 2015; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass,
qt4-build-multilib.eclass:
1.49 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.48&r2=1.49
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- haskell-cabal.eclass 2 Jan 2015 09:35:02 -0000 1.48
+++ haskell-cabal.eclass 15 Mar 2015 17:03:27 -0000 1.49
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.48 2015/01/02 09:35:02 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.49 2015/03/15 17:03:27 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -41,7 +41,8 @@
# @ECLASS-VARIABLE: CABAL_EXTRA_CONFIGURE_FLAGS
# @DESCRIPTION:
# User-specified additional parameters passed to 'setup configure'.
-# example: /etc/portage/make.conf: CABAL_EXTRA_CONFIGURE_FLAGS=--enable-shared
+# example: /etc/portage/make.conf:
+# CABAL_EXTRA_CONFIGURE_FLAGS="--enable-shared --enable-executable-dynamic"
: ${CABAL_EXTRA_CONFIGURE_FLAGS:=}
# @ECLASS-VARIABLE: CABAL_EXTRA_BUILD_FLAGS
@@ -111,7 +112,7 @@
fi
if [[ -n "${CABAL_USE_HOOGLE}" ]]; then
- # enabled only in ::gentoo-haskell
+ # enabled only in ::haskell
CABAL_USE_HOOGLE=
fi
@@ -148,8 +149,9 @@
DEPEND="${DEPEND} >=dev-haskell/cabal-${CABAL_MIN_VERSION}"
fi
-# returns the version of cabal currently in use
-_CABAL_VERSION_CACHE=""
+# returns the version of cabal currently in use.
+# Rarely it's handy to pin cabal version from outside.
+: ${_CABAL_VERSION_CACHE:=""}
cabal-version() {
if [[ -z "${_CABAL_VERSION_CACHE}" ]]; then
if [[ "${CABAL_BOOTSTRAP}" ]]; then
@@ -362,7 +364,8 @@
# currently cabal does not respect CFLAGS and LDFLAGS on it's own (bug #333217)
# so translate LDFLAGS to ghc parameters (without filtering)
local flag
- for flag in $LDFLAGS; do cabalconf+=(--ghc-option="-optl$flag"); done
+ for flag in $CFLAGS; do cabalconf+=(--ghc-option="-optc$flag"); done
+ for flag in $LDFLAGS; do cabalconf+=(--ghc-option="-optl$flag"); done
# disable executable stripping for the executables, as portage will
# strip by itself, and pre-stripping gives a QA warning.
@@ -456,10 +459,21 @@
# However portage still records the dependency and we can upgrade the package
# to a later one that's not included with ghc.
# You can also put a space separated list, eg CABAL_CORE_LIB_GHC_PV="6.6 6.6.1".
+# Those versions are taken as-is from ghc `--numeric-version`.
+# Package manager versions are also supported:
+# CABAL_CORE_LIB_GHC_PV="7.10.* PM:7.8.4-r1".
cabal-is-dummy-lib() {
+ local bin_ghc_version=$(ghc-version)
+ local pm_ghc_p=$(best_version dev-lang/ghc)
+ local pm_ghc_version version
+
+ pm_ghc_version=PM:${pm_ghc_p#dev-lang/ghc-}
+
for version in ${CABAL_CORE_LIB_GHC_PV[*]}; do
- [[ "$(ghc-version)" == ${version} ]] && return 0
+ [[ "${bin_ghc_version}" == ${version} ]] && return 0
+ [[ "${pm_ghc_version}" == ${version} ]] && return 0
done
+
return 1
}
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2015-04-04 20:33 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2015-04-04 20:33 UTC (permalink / raw
To: gentoo-commits
slyfox 15/04/04 20:33:05
Modified: ChangeLog haskell-cabal.eclass
Log:
Disable building dynamic libraris by default before-ghc-7.10 (was accidentally enabled in a previous revision). Fixes bug #545174 by Toralf Förster.
Revision Changes Path
1.1583 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1583&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1583&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1582&r2=1.1583
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1582
retrieving revision 1.1583
diff -u -r1.1582 -r1.1583
--- ChangeLog 4 Apr 2015 17:11:35 -0000 1.1582
+++ ChangeLog 4 Apr 2015 20:33:05 -0000 1.1583
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1582 2015/04/04 17:11:35 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1583 2015/04/04 20:33:05 slyfox Exp $
+
+ 04 Apr 2015; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Disable building dynamic libraris by default before-ghc-7.10 (was
+ accidentally enabled in a previous revision). Fixes bug #545174 by Toralf
+ Förster.
04 Apr 2015; <jason@gentoo.org> selinux-policy-2.eclass:
Drop EAPI<5 from selinux-policy-2.eclass
1.51 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.50&r2=1.51
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- haskell-cabal.eclass 28 Mar 2015 13:32:40 -0000 1.50
+++ haskell-cabal.eclass 4 Apr 2015 20:33:05 -0000 1.51
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.50 2015/03/28 13:32:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.51 2015/04/04 20:33:05 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -387,12 +387,11 @@
cabalconf+=(--enable-shared)
if $(ghc-supports-shared-libraries); then
- # maybe a bit lower
- cabalconf+=(--enable-shared)
-
# Experimental support for dynamically linked binaries.
# We are enabling it since 7.10.1_rc3
if version_is_at_least "7.10.0.20150316" "$(ghc-version)"; then
+ # we didn't enable it before as it was not stable on all arches
+ cabalconf+=(--enable-shared)
# Known to break on ghc-7.8/Cabal-1.18
# https://ghc.haskell.org/trac/ghc/ticket/9625
cabalconf+=(--enable-executable-dynamic)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
@ 2015-07-20 15:05 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2015-07-20 15:05 UTC (permalink / raw
To: gentoo-commits
slyfox 15/07/20 15:05:49
Modified: ChangeLog haskell-cabal.eclass
Log:
Workaround upstream cabal tests hangup bug #537500 by Michael Orlitzky; use ghc's haddock for doc generation.
Revision Changes Path
1.1723 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1723&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1723&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1722&r2=1.1723
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1722
retrieving revision 1.1723
diff -u -r1.1722 -r1.1723
--- ChangeLog 19 Jul 2015 15:46:03 -0000 1.1722
+++ ChangeLog 20 Jul 2015 15:05:49 -0000 1.1723
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1722 2015/07/19 15:46:03 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1723 2015/07/20 15:05:49 slyfox Exp $
+
+ 20 Jul 2015; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+ Workaround upstream cabal tests hangup bug #537500 by Michael Orlitzky; use
+ ghc's haddock for doc generation.
19 Jul 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass:
Change kernel upgrade http link and remove reference to deblob in elog
1.52 eclass/haskell-cabal.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.51&r2=1.52
Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- haskell-cabal.eclass 4 Apr 2015 20:33:05 -0000 1.51
+++ haskell-cabal.eclass 20 Jul 2015 15:05:49 -0000 1.52
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.51 2015/04/04 20:33:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.52 2015/07/20 15:05:49 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -172,6 +172,8 @@
cabal-bootstrap() {
local setupmodule
local cabalpackage
+ local setup_bootstrap_args=()
+
if [[ -f "${S}/Setup.lhs" ]]; then
setupmodule="${S}/Setup.lhs"
elif [[ -f "${S}/Setup.hs" ]]; then
@@ -192,8 +194,16 @@
cabalpackage=Cabal-$(cabal-version)
einfo "Using cabal-$(cabal-version)."
+ if $(ghc-supports-threaded-runtime); then
+ # Cabal has a bug that deadlocks non-threaded RTS:
+ # https://bugs.gentoo.org/537500
+ # https://github.com/haskell/cabal/issues/2398
+ setup_bootstrap_args+=(-threaded)
+ fi
+
make_setup() {
set -- -package "${cabalpackage}" --make "${setupmodule}" \
+ ${setup_bootstrap_args} \
${HCFLAGS} \
${GHC_BOOTSTRAP_FLAGS} \
"$@" \
@@ -311,7 +321,15 @@
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
if [[ -n "${CABAL_USE_HADDOCK}" ]] && use doc; then
- cabalconf+=(--with-haddock=${EPREFIX}/usr/bin/haddock)
+ # We use the bundled with GHC version if exists
+ # Haddock is very picky about index files
+ # it generates for ghc's base and other packages.
+ local p=${EPREFIX}/usr/bin/haddock-ghc-$(ghc-version)
+ if [[ -f $p ]]; then
+ cabalconf+=(--with-haddock="${p}")
+ else
+ cabalconf+=(--with-haddock=${EPREFIX}/usr/bin/haddock)
+ fi
fi
if [[ -n "${CABAL_USE_PROFILE}" ]] && use profile; then
cabalconf+=(--enable-library-profiling)
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2015-07-20 15:06 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-29 12:31 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass Sergei Trofimovich (slyfox)
-- strict thread matches above, loose matches on Subject: below --
2015-07-20 15:05 Sergei Trofimovich (slyfox)
2015-04-04 20:33 Sergei Trofimovich (slyfox)
2015-03-15 17:03 Sergei Trofimovich (slyfox)
2015-01-02 9:35 Sergei Trofimovich (slyfox)
2014-06-27 7:26 Sergei Trofimovich (slyfox)
2014-06-27 7:16 Sergei Trofimovich (slyfox)
2014-05-22 16:35 Sergei Trofimovich (slyfox)
2013-11-20 9:19 Sergei Trofimovich (slyfox)
2012-11-19 20:35 Sergei Trofimovich (slyfox)
2012-07-08 19:16 Sergei Trofimovich (slyfox)
2012-04-19 17:33 Sergei Trofimovich (slyfox)
2012-04-14 20:22 Sergei Trofimovich (slyfox)
2012-04-14 19:30 Sergei Trofimovich (slyfox)
2012-03-09 22:01 Sergei Trofimovich (slyfox)
2012-02-07 12:47 Sergei Trofimovich (slyfox)
2012-01-20 18:24 Sergei Trofimovich (slyfox)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox