| 1 |
slyfox 12/02/07 12:47:54 |
| 2 |
|
| 3 |
Modified: ChangeLog haskell-cabal.eclass |
| 4 |
Log: |
| 5 |
Added support for CABAL_EXTRA_BUILD_FLAGS and HCFLAGS magic variables |
| 6 |
|
| 7 |
CABAL_EXTRA_BUILD_FLAGS allows user to pass arguments to ./setup build phase. |
| 8 |
For example you can get detailed build log this way: |
| 9 |
|
| 10 |
CABAL_EXTRA_BUILD_FLAGS=-v emerge something |
| 11 |
|
| 12 |
HCFLAGS is similar to CFLAGS / CXXFLAGS / FFLAGS in spirit. |
| 13 |
You can use it in make.conf or in one-shot merges to enable |
| 14 |
random ghc features: |
| 15 |
|
| 16 |
HCFLAGS="-O0 -Wall" emerge something-else |
| 17 |
|
| 18 |
Revision Changes Path |
| 19 |
1.117 eclass/ChangeLog |
| 20 |
|
| 21 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.117&view=markup |
| 22 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.117&content-type=text/plain |
| 23 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.116&r2=1.117 |
| 24 |
|
| 25 |
Index: ChangeLog |
| 26 |
=================================================================== |
| 27 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 28 |
retrieving revision 1.116 |
| 29 |
retrieving revision 1.117 |
| 30 |
diff -u -r1.116 -r1.117 |
| 31 |
--- ChangeLog 6 Feb 2012 13:13:44 -0000 1.116 |
| 32 |
+++ ChangeLog 7 Feb 2012 12:47:54 -0000 1.117 |
| 33 |
@@ -1,6 +1,9 @@ |
| 34 |
# ChangeLog for eclass directory |
| 35 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 36 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.116 2012/02/06 13:13:44 nirbheek Exp $ |
| 37 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.117 2012/02/07 12:47:54 slyfox Exp $ |
| 38 |
+ |
| 39 |
+ 07 Feb 2012; Sergei Trofimovich <slyfox@g.o> haskell-cabal.eclass: |
| 40 |
+ Added support for CABAL_EXTRA_BUILD_FLAGS and HCFLAGS magic variables. |
| 41 |
|
| 42 |
06 Feb 2012; Nirbheek Chauhan <nirbheek@g.o> mozconfig-3.eclass: |
| 43 |
Depend on an icon theme, fixes bug 341697 |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.27 eclass/haskell-cabal.eclass |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.27&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.27&content-type=text/plain |
| 51 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.26&r2=1.27 |
| 52 |
|
| 53 |
Index: haskell-cabal.eclass |
| 54 |
=================================================================== |
| 55 |
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v |
| 56 |
retrieving revision 1.26 |
| 57 |
retrieving revision 1.27 |
| 58 |
diff -u -r1.26 -r1.27 |
| 59 |
--- haskell-cabal.eclass 20 Jan 2012 18:24:09 -0000 1.26 |
| 60 |
+++ haskell-cabal.eclass 7 Feb 2012 12:47:54 -0000 1.27 |
| 61 |
@@ -1,6 +1,6 @@ |
| 62 |
# Copyright 1999-2012 Gentoo Foundation |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.26 2012/01/20 18:24:09 slyfox Exp $ |
| 65 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.27 2012/02/07 12:47:54 slyfox Exp $ |
| 66 |
|
| 67 |
# @ECLASS: haskell-cabal.eclass |
| 68 |
# @MAINTAINER: |
| 69 |
@@ -52,6 +52,12 @@ |
| 70 |
# example: /etc/make.conf: CABAL_EXTRA_CONFIGURE_FLAGS=--enable-shared |
| 71 |
: ${CABAL_EXTRA_CONFIGURE_FLAGS:=} |
| 72 |
|
| 73 |
+# @ECLASS-VARIABLE: CABAL_EXTRA_BUILD_FLAGS |
| 74 |
+# @DESCRIPTION: |
| 75 |
+# User-specified additional parameters passed to 'setup build'. |
| 76 |
+# example: /etc/make.conf: CABAL_EXTRA_BUILD_FLAGS=-v |
| 77 |
+: ${CABAL_EXTRA_BUILD_FLAGS:=} |
| 78 |
+ |
| 79 |
# @ECLASS-VARIABLE: GHC_BOOTSTRAP_FLAGS |
| 80 |
# @DESCRIPTION: |
| 81 |
# User-specified additional parameters for ghc when building |
| 82 |
@@ -180,7 +186,7 @@ |
| 83 |
${GHC_BOOTSTRAP_FLAGS} \ |
| 84 |
"$@" \ |
| 85 |
-o setup |
| 86 |
- echo $(ghc-getghc) "$@" |
| 87 |
+ echo $(ghc-getghc) ${HCFLAGS} "$@" |
| 88 |
$(ghc-getghc) "$@" |
| 89 |
} |
| 90 |
if $(ghc-supports-shared-libraries); then |
| 91 |
@@ -250,6 +256,12 @@ |
| 92 |
cabalconf="${cabalconf} --with-cpphs=${EPREFIX}/usr/bin/cpphs" |
| 93 |
fi |
| 94 |
|
| 95 |
+ local option |
| 96 |
+ for option in ${HCFLAGS} |
| 97 |
+ do |
| 98 |
+ cabalconf+=" --ghc-option=$option" |
| 99 |
+ done |
| 100 |
+ |
| 101 |
# Building GHCi libs on ppc64 causes "TOC overflow". |
| 102 |
if use ppc64; then |
| 103 |
cabalconf="${cabalconf} --disable-library-for-ghci" |
| 104 |
@@ -307,7 +319,7 @@ |
| 105 |
|
| 106 |
cabal-build() { |
| 107 |
unset LANG LC_ALL LC_MESSAGES |
| 108 |
- set -- build "$@" |
| 109 |
+ set -- build ${CABAL_EXTRA_BUILD_FLAGS} "$@" |
| 110 |
echo ./setup "$@" |
| 111 |
./setup "$@" \ |
| 112 |
|| die "setup build failed" |
| 113 |
@@ -404,7 +416,7 @@ |
| 114 |
|
| 115 |
cabal-bootstrap |
| 116 |
|
| 117 |
- cabal-configure $ghc_flags "$@" |
| 118 |
+ cabal-configure "$@" |
| 119 |
|
| 120 |
popd > /dev/null |
| 121 |
fi |
Archives