diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2010-07-12 15:46:39 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2010-07-12 15:46:39 +0000 |
| commit | a068919442e4df5a5db6968504b315b0a9b028df (patch) | |
| tree | 489aeb930bc69eec673eefa99ebba4d1058b45ff /dev-haskell | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-a068919442e4df5a5db6968504b315b0a9b028df.tar.gz gentoo-2-a068919442e4df5a5db6968504b315b0a9b028df.tar.bz2 gentoo-2-a068919442e4df5a5db6968504b315b0a9b028df.zip | |
Fixed bug #278897 (build failure on ghc-6.10+)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/hsql/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-haskell/hsql/hsql-1.7.1.ebuild | 6 | ||||
| -rw-r--r-- | dev-haskell/hsql/hsql-1.7.ebuild | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/dev-haskell/hsql/ChangeLog b/dev-haskell/hsql/ChangeLog index 2857e82597a7..aa96c585a68a 100644 --- a/dev-haskell/hsql/ChangeLog +++ b/dev-haskell/hsql/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/hsql -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.12 2009/08/05 18:07:58 kolmodin Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.13 2010/07/12 15:46:39 slyfox Exp $ + + 12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> hsql-1.7.ebuild, + hsql-1.7.1.ebuild: + Fixed bug #278897 (build failure on ghc-6.10+). Thanks to Nikolay Orlyuk + <virkony@gmail.com> for the report and fix. *hsql-1.7.1 (05 Aug 2009) diff --git a/dev-haskell/hsql/hsql-1.7.1.ebuild b/dev-haskell/hsql/hsql-1.7.1.ebuild index afb98a65584c..5126374bc3b7 100644 --- a/dev-haskell/hsql/hsql-1.7.1.ebuild +++ b/dev-haskell/hsql/hsql-1.7.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.7.1.ebuild,v 1.1 2009/08/05 18:07:58 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.7.1.ebuild,v 1.2 2010/07/12 15:46:39 slyfox Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -11,7 +11,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-6.6.1" diff --git a/dev-haskell/hsql/hsql-1.7.ebuild b/dev-haskell/hsql/hsql-1.7.ebuild index f7bbf185878a..05560b63a0e3 100644 --- a/dev-haskell/hsql/hsql-1.7.ebuild +++ b/dev-haskell/hsql/hsql-1.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.7.ebuild,v 1.11 2007/12/13 05:41:55 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.7.ebuild,v 1.12 2010/07/12 15:46:39 slyfox Exp $ CABAL_FEATURES="lib haddock" inherit eutils haskell-cabal versionator @@ -16,8 +16,10 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.4.1" +CABAL_CONFIGURE_FLAGS="--constraint=base<4" + src_unpack() { - unpack "${A}" + unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-sqltext-to-int.patch" |