[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass

["Sergei Trofimovich (slyfox)" <slyfox@gentoo.org>]

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