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 1RoJ8Q-0003Jk-Fr for garchives@archives.gentoo.org; Fri, 20 Jan 2012 18:24:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AEFBE0779; Fri, 20 Jan 2012 18:24:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E7D3CE0779 for ; Fri, 20 Jan 2012 18:24:13 +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 4739A1B401F for ; Fri, 20 Jan 2012 18:24:10 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2272) id 17C202004B; Fri, 20 Jan 2012 18:24:09 +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: <20120120182409.17C202004B@flycatcher.gentoo.org> Date: Fri, 20 Jan 2012 18:24:09 +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: 6d2d1df9-7b97-4e12-8c62-180724486454 X-Archives-Hash: 15f17e1197dfad17c7e49837bdc7ed25 slyfox 12/01/20 18:24:09 Modified: ChangeLog haskell-cabal.eclass Log: Added stdout echoing of most executed phase commands. Added stub for CA= BAL_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?r= ev=3D1.99&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.99&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= 1=3D1.98&r2=3D1.99 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.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 haskell-cabal.ecla= ss: + Added stdout echoing of most executed phase commands. Added stub for + CABAL_USE_HSCOLOUR feature to ease ebuild syncing from haskell overlay= . =20 19 Jan 2012; Micha=C5=82 G=C3=B3rny autotools-util= s.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-cab= al.eclass?rev=3D1.26&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cab= al.eclass?rev=3D1.26&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cab= al.eclass?r1=3D1.25&r2=3D1.26 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.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 20= 11/08/22 04:46:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.26 20= 12/01/20 18:24:09 slyfox Exp $ =20 # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -73,6 +73,7 @@ case ${feature} in haddock) CABAL_USE_HADDOCK=3Dyes;; hscolour) CABAL_USE_HSCOLOUR=3Dyes;; + hoogle) CABAL_USE_HOOGLE=3Dyes;; alex) CABAL_USE_ALEX=3Dyes;; happy) CABAL_USE_HAPPY=3Dyes;; c2hs) CABAL_USE_C2HS=3Dyes;; @@ -175,10 +176,12 @@ einfo "Using cabal-$(cabal-version)." =20 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 @@ } =20 cabal-hscolour() { - ./setup hscolour || die "setup hscolour failed" + set -- hscolour "$@" + echo ./setup "$@" + ./setup "$@" || die "setup hscolour failed" } =20 cabal-haddock() { - ./setup haddock || die "setup haddock failed" + set -- haddock "$@" + echo ./setup "$@" + ./setup "$@" || die "setup haddock failed" } =20 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-sourc= e failed" } =20 cabal-configure() { @@ -279,7 +288,7 @@ $(ghc-supports-shared-libraries) && \ cabalconf=3D"${cabalconf} --enable-shared" =20 - ./setup configure \ + set -- configure \ --ghc --prefix=3D"${EPREFIX}"/usr \ --with-compiler=3D"$(ghc-getghc)" \ --with-hc-pkg=3D"$(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" } =20 cabal-build() { unset LANG LC_ALL LC_MESSAGES - ./setup build \ + set -- build "$@" + echo ./setup "$@" + ./setup "$@" \ || die "setup build failed" } =20 cabal-copy() { has "${EAPI:-0}" 0 1 2 && ! use prefix && ED=3D${D} =20 - ./setup copy \ - --destdir=3D"${D}" \ - || die "setup copy failed" + set -- copy --destdir=3D"${D}" "$@" + echo ./setup "$@" + ./setup "$@" || die "setup copy failed" =20 # 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 =20 popd > /dev/null