diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2010-07-12 15:49:30 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2010-07-12 15:49:30 +0000 |
commit | b6fc388737d7cc0f3419382922b2d1eed03903d7 (patch) | |
tree | 91b23b5fa252f0f853f2b4f8131f0f20881e7232 /dev-haskell | |
parent | Fixed bug #278897 (build failure on ghc-6.10+) (diff) | |
download | gentoo-2-b6fc388737d7cc0f3419382922b2d1eed03903d7.tar.gz gentoo-2-b6fc388737d7cc0f3419382922b2d1eed03903d7.tar.bz2 gentoo-2-b6fc388737d7cc0f3419382922b2d1eed03903d7.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-postgresql/ChangeLog | 7 | ||||
-rw-r--r-- | dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild | 4 | ||||
-rw-r--r-- | dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/dev-haskell/hsql-postgresql/ChangeLog b/dev-haskell/hsql-postgresql/ChangeLog index eb99c2e7a93e..12aa583042fc 100644 --- a/dev-haskell/hsql-postgresql/ChangeLog +++ b/dev-haskell/hsql-postgresql/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/hsql-postgresql # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/ChangeLog,v 1.11 2010/06/17 18:22:48 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/ChangeLog,v 1.12 2010/07/12 15:49:30 slyfox Exp $ + + 12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> + hsql-postgresql-1.7.ebuild: + Fixed bug #278897 (build failure on ghc-6.10+). Thanks to Nikolay Orlyuk + <virkony@gmail.com> for the report and fix. 17 Jun 2010; Patrick Lauer <patrick@gentoo.org> hsql-postgresql-1.7.ebuild, hsql-postgresql-1.7.3.ebuild: diff --git a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild index e8efbb60b59b..d819637904be 100644 --- a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild +++ b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild,v 1.2 2010/06/17 18:22:48 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild,v 1.3 2010/07/12 15:49:30 slyfox Exp $ CABAL_FEATURES="lib profile haddock" inherit base haskell-cabal versionator @@ -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-postgresql/hsql-postgresql-1.7.ebuild b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild index 89028e81374c..f457c1c4bfa8 100644 --- a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild +++ b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild,v 1.9 2010/06/17 18:22:48 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild,v 1.10 2010/07/12 15:49:30 slyfox Exp $ CABAL_FEATURES="lib haddock" inherit haskell-cabal versionator @@ -18,8 +18,10 @@ DEPEND=">=dev-lang/ghc-6.4.1 ~dev-haskell/hsql-${PV} dev-db/postgresql-base" +CABAL_CONFIGURE_FLAGS="--constraint=base<4" + src_unpack() { - unpack "${A}" + unpack ${A} cabal-mksetup echo >> "${S}/${PN}.cabal" |