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 | cd2cf15007c80a06f97884ebb480ff9cc637830e (patch) | |
| tree | 4b5b0bbc097806affbe0baac6a9fb7a071636493 /eclass/ghc-package.eclass | |
| parent | Assigned package to VDR-Project. (diff) | |
| download | gentoo-2-cd2cf15007c80a06f97884ebb480ff9cc637830e.tar.gz gentoo-2-cd2cf15007c80a06f97884ebb480ff9cc637830e.tar.bz2 gentoo-2-cd2cf15007c80a06f97884ebb480ff9cc637830e.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/ghc-package.eclass')
| -rw-r--r-- | eclass/ghc-package.eclass | 6 |
1 files changed, 3 insertions, 3 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 |