diff options
| author |   Andres Loeh <kosmikus@gentoo.org> | 2005-09-13 18:19:02 +0000 |
|---|---|---|
| committer | Andres Loeh <kosmikus@gentoo.org> | 2005-09-13 18:19:02 +0000 |
| commit | 77c80c4992d76898222baa1d87bc354eb30f50e3 (patch) | |
| tree | a31e329031db646966edaf563908bbf7ffe0689c /dev-haskell | |
| parent | Mark 0.7.4-r5 stable on alpha (diff) | |
| download | gentoo-2-77c80c4992d76898222baa1d87bc354eb30f50e3.tar.gz gentoo-2-77c80c4992d76898222baa1d87bc354eb30f50e3.tar.bz2 gentoo-2-77c80c4992d76898222baa1d87bc354eb30f50e3.zip | |
Fixed a problem when building with ghc-6.2.2.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/cabal/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/cabal/cabal-1.1.3.ebuild | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog index 80abf06b6c3e..926fb725da4b 100644 --- a/dev-haskell/cabal/ChangeLog +++ b/dev-haskell/cabal/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/cabal # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.4 2005/09/13 13:06:02 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.5 2005/09/13 18:19:02 kosmikus Exp $ + + 13 Sep 2005; Andres Loeh <kosmikus@gentoo.org> cabal-1.1.3.ebuild: + Fixed a problem when building with ghc-6.2.2. *cabal-1.1.3 (13 Sep 2005) diff --git a/dev-haskell/cabal/cabal-1.1.3.ebuild b/dev-haskell/cabal/cabal-1.1.3.ebuild index b1609406c39d..e35a64001f08 100644 --- a/dev-haskell/cabal/cabal-1.1.3.ebuild +++ b/dev-haskell/cabal/cabal-1.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.3.ebuild,v 1.1 2005/09/13 13:06:02 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.3.ebuild,v 1.2 2005/09/13 18:19:02 kosmikus Exp $ CABAL_FEATURES="bootstrap" inherit haskell-cabal eutils base @@ -37,7 +37,11 @@ src_unpack() { } src_compile() { - make setup HC="$(ghc-getghc) -ignore-package Cabal" + if ghc-cabal; then + make setup HC="$(ghc-getghc) -ignore-package Cabal" + else + make setup HC="$(ghc-getghc)" + fi cabal-configure cabal-build } |