diff options
| author |   Andres Loeh <kosmikus@gentoo.org> | 2005-03-19 13:12:49 +0000 |
|---|---|---|
| committer | Andres Loeh <kosmikus@gentoo.org> | 2005-03-19 13:12:49 +0000 |
| commit | 5b2771dcb06219c92d96e04a086e2fb7b634fd69 (patch) | |
| tree | 53cab0d01546ffc5dd1f50c22b3ff9f775890da2 /dev-haskell | |
| parent | Stable on alpha. (diff) | |
| download | gentoo-2-5b2771dcb06219c92d96e04a086e2fb7b634fd69.tar.gz gentoo-2-5b2771dcb06219c92d96e04a086e2fb7b634fd69.tar.bz2 gentoo-2-5b2771dcb06219c92d96e04a086e2fb7b634fd69.zip | |
ghc-6.4 compatibility
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/happy/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-haskell/happy/happy-1.14.ebuild | 5 | ||||
| -rw-r--r-- | dev-haskell/happy/happy-1.15.ebuild | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog index d49cdf5681d6..b9e2801ad165 100644 --- a/dev-haskell/happy/ChangeLog +++ b/dev-haskell/happy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/happy # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.9 2005/03/19 12:36:31 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.10 2005/03/19 13:12:49 kosmikus Exp $ + + 19 Mar 2005; Andres Loeh <kosmikus@gentoo.org> happy-1.14.ebuild, + happy-1.15.ebuild: + happy-1.14 is blocked by ghc-6.4 now, whereas happy-1.15 should build with + ghc-6.4. 19 Mar 2005; Andres Loeh <kosmikus@gentoo.org> happy-1.15.ebuild: Added ~amd64 keyword. diff --git a/dev-haskell/happy/happy-1.14.ebuild b/dev-haskell/happy/happy-1.14.ebuild index 33e8b6ac3d2d..ed47f0fac040 100644 --- a/dev-haskell/happy/happy-1.14.ebuild +++ b/dev-haskell/happy/happy-1.14.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/happy/happy-1.14.ebuild,v 1.6 2005/01/01 18:04:41 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.14.ebuild,v 1.7 2005/03/19 13:12:49 kosmikus Exp $ inherit base eutils @@ -12,7 +12,8 @@ SLOT="0" KEYWORDS="x86" IUSE="" -DEPEND="virtual/ghc" +DEPEND="virtual/ghc + !>=virtual/ghc-6.4" RDEPEND="" src_unpack() { diff --git a/dev-haskell/happy/happy-1.15.ebuild b/dev-haskell/happy/happy-1.15.ebuild index 625f3dcc660a..b2c1894d19cb 100644 --- a/dev-haskell/happy/happy-1.15.ebuild +++ b/dev-haskell/happy/happy-1.15.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/happy/happy-1.15.ebuild,v 1.2 2005/03/19 12:36:31 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.15.ebuild,v 1.3 2005/03/19 13:12:49 kosmikus Exp $ inherit base eutils @@ -24,6 +24,9 @@ src_unpack() { src_compile() { econf || die "configure failed" + if has_version '>=dev-lang/ghc-6.4'; then + echo "SRC_HC_OPTS += -ignore-package util" >> mk/build.mk + fi emake -j1 || die "make failed" if use doc; then emake -j1 html || die "make html failed" |