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 | 806b1a8e1ac69680ad609630a3c75317187456cd (patch) | |
| tree | 35888036075be321bac68c196f6de48ee372d8b1 /dev-haskell/cabal | |
| parent | Mark 0.7.4-r5 stable on alpha (diff) | |
| download | historical-806b1a8e1ac69680ad609630a3c75317187456cd.tar.gz historical-806b1a8e1ac69680ad609630a3c75317187456cd.tar.bz2 historical-806b1a8e1ac69680ad609630a3c75317187456cd.zip | |
Fixed a problem when building with ghc-6.2.2.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'dev-haskell/cabal')
| -rw-r--r-- | dev-haskell/cabal/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/cabal/Manifest | 10 | ||||
| -rw-r--r-- | dev-haskell/cabal/cabal-1.1.3.ebuild | 8 |
3 files changed, 15 insertions, 8 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/Manifest b/dev-haskell/cabal/Manifest index 01aecb9a6e54..129efd512bcd 100644 --- a/dev-haskell/cabal/Manifest +++ b/dev-haskell/cabal/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 3c21b65e582574bd7a17d301b7cf6168 cabal-1.1.3.ebuild 1854 -MD5 92dff080fa93f23c87cc176e34969fb1 ChangeLog 719 +MD5 10a1d812aec307038067ad084127adbe cabal-1.1.3.ebuild 1917 +MD5 c2a79d3e66a8b32365d61209b3faab58 ChangeLog 837 MD5 0b2872d51fdf7a2694dab3d34b57667d metadata.xml 232 MD5 b34aabec3ab15c7b74d940437870e91b files/digest-cabal-1.1.3 63 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFDJs84OKSBj1ObwosRAizgAJ9/oPHVu99t3R/F9D6+0Dnuyk5r3wCbBBpg -RiP4CcDnRECRMKdmr549cxM= -=HN2u +iD8DBQFDJxilOKSBj1ObwosRAlRjAJ9Plii6RZnSpVdKBRpqNm5LVP9P9QCfakPP +xtQ3avDke7ZKVBYkmerNews= +=pAFF -----END PGP SIGNATURE----- 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 } |