diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2006-08-02 19:49:03 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2006-08-02 19:49:03 +0000 |
| commit | 678e3e0d14d8b92af9cd68b89387a0fe9fe4b695 (patch) | |
| tree | 09ea763411ce7e306c59fe8cc5187905b06bd9cc /eclass | |
| parent | Assigned package to VDR-Project. (diff) | |
| download | historical-678e3e0d14d8b92af9cd68b89387a0fe9fe4b695.tar.gz historical-678e3e0d14d8b92af9cd68b89387a0fe9fe4b695.tar.bz2 historical-678e3e0d14d8b92af9cd68b89387a0fe9fe4b695.zip | |
Ask portage rather than ghc-pkg about which version of cabal to use.
This way we build packages using version of cabal from portage that we
tested rather than a version that the user installed. This is important
as many packages are sensitive to changes in the Cabal API.
Make ghc-getghc and ghc-getghcpkg functions return absolute paths and fix
up one place in the haskell-cabal eclass where this had a knock-on effect
this should fix bug #140589
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ghc-package.eclass | 6 | ||||
| -rw-r--r-- | eclass/haskell-cabal.eclass | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index 22cfbf69f550..0a68ad212386 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.17 2006/06/15 11:27:38 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.18 2006/08/02 19:49:03 dcoutts Exp $ # # Author: Andres Loeh <kosmikus@gentoo.org> # Maintained by: Haskell herd <haskell@gentoo.org> @@ -16,12 +16,12 @@ PATH="/usr/bin:/opt/ghc/bin:${PATH}" # for later configuration using environment variables/ # returns the name of the ghc executable ghc-getghc() { - echo "ghc" + echo "$(which ghc)" } # returns the name of the ghc-pkg executable ghc-getghcpkg() { - echo "ghc-pkg" + echo "$(which ghc-pkg)" } # returns the name of the ghc-pkg binary (ghc-pkg diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 66c3fbea78d9..a14bc6461a7f 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.6 2006/03/13 09:57:10 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.7 2006/08/02 19:49:03 dcoutts Exp $ # # Original authors: Andres Loeh <kosmikus@gentoo.org> # Duncan Coutts <dcoutts@gentoo.org> @@ -169,7 +169,7 @@ cabal-pkg() { local err if [[ -n ${CABAL_HAS_LIBRARIES} ]]; then - sed -i 's:ghc-pkg:/usr/bin/true:' .setup-config + sed -i "s|$(ghc-getghcpkg)|/usr/bin/true|" .setup-config ./setup register || die "setup register failed" if [[ -f .installed-pkg-config ]]; then ghc-setup-pkg .installed-pkg-config |