From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RukSp-0003ND-Ok for garchives@archives.gentoo.org; Tue, 07 Feb 2012 12:48:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B9FBE04EB; Tue, 7 Feb 2012 12:47:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3DAA6E04EB for ; Tue, 7 Feb 2012 12:47:56 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 751B61B400A for ; Tue, 7 Feb 2012 12:47:55 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2272) id 4E0DC2004B; Tue, 7 Feb 2012 12:47:54 +0000 (UTC) From: "Sergei Trofimovich (slyfox)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, slyfox@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog haskell-cabal.eclass X-VCS-Directories: eclass X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich Content-Type: text/plain; charset=utf8 Message-Id: <20120207124754.4E0DC2004B@flycatcher.gentoo.org> Date: Tue, 7 Feb 2012 12:47:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 38691f0f-9984-4c6d-81d1-747ca7f57d14 X-Archives-Hash: 3f907415682eae7a1e1cd94222be23c6 slyfox 12/02/07 12:47:54 Modified: ChangeLog haskell-cabal.eclass Log: Added support for CABAL_EXTRA_BUILD_FLAGS and HCFLAGS magic variables =20 CABAL_EXTRA_BUILD_FLAGS allows user to pass arguments to ./setup build = phase. For example you can get detailed build log this way: =20 CABAL_EXTRA_BUILD_FLAGS=3D-v emerge something =20 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: =20 HCFLAGS=3D"-O0 -Wall" emerge something-else Revision Changes Path 1.117 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.117&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.117&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= 1=3D1.116&r2=3D1.117 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 1= 3:13:44 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.117 2012/02/07 1= 2:47:54 slyfox Exp $ + + 07 Feb 2012; Sergei Trofimovich haskell-cabal.ecla= ss: + Added support for CABAL_EXTRA_BUILD_FLAGS and HCFLAGS magic variables. =20 06 Feb 2012; Nirbheek Chauhan 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-cab= al.eclass?rev=3D1.27&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cab= al.eclass?rev=3D1.27&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cab= al.eclass?r1=3D1.26&r2=3D1.27 Index: haskell-cabal.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 20= 12/01/20 18:24:09 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.27 20= 12/02/07 12:47:54 slyfox Exp $ =20 # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -52,6 +52,12 @@ # example: /etc/make.conf: CABAL_EXTRA_CONFIGURE_FLAGS=3D--enable-shared : ${CABAL_EXTRA_CONFIGURE_FLAGS:=3D} =20 +# @ECLASS-VARIABLE: CABAL_EXTRA_BUILD_FLAGS +# @DESCRIPTION: +# User-specified additional parameters passed to 'setup build'. +# example: /etc/make.conf: CABAL_EXTRA_BUILD_FLAGS=3D-v +: ${CABAL_EXTRA_BUILD_FLAGS:=3D} + # @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=3D"${cabalconf} --with-cpphs=3D${EPREFIX}/usr/bin/cpphs" fi =20 + local option + for option in ${HCFLAGS} + do + cabalconf+=3D" --ghc-option=3D$option" + done + # Building GHCi libs on ppc64 causes "TOC overflow". if use ppc64; then cabalconf=3D"${cabalconf} --disable-library-for-ghci" @@ -307,7 +319,7 @@ =20 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 @@ =20 cabal-bootstrap =20 - cabal-configure $ghc_flags "$@" + cabal-configure "$@" =20 popd > /dev/null fi