diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2010-07-12 15:47:40 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2010-07-12 15:47:40 +0000 |
| commit | 2a2d6b45f17f1fdcf3f711b1a0fc79cd32dec179 (patch) | |
| tree | 47bde0f4e51284814215d2cc341f588bbaa7df7c /dev-haskell/hsql-mysql | |
| parent | Fixed bug #278897 (build failure on ghc-6.10+) (diff) | |
| download | gentoo-2-2a2d6b45f17f1fdcf3f711b1a0fc79cd32dec179.tar.gz gentoo-2-2a2d6b45f17f1fdcf3f711b1a0fc79cd32dec179.tar.bz2 gentoo-2-2a2d6b45f17f1fdcf3f711b1a0fc79cd32dec179.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/hsql-mysql')
| -rw-r--r-- | dev-haskell/hsql-mysql/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild | 6 | ||||
| -rw-r--r-- | dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/dev-haskell/hsql-mysql/ChangeLog b/dev-haskell/hsql-mysql/ChangeLog index 406eb1b4a9ca..47f22ddacb3e 100644 --- a/dev-haskell/hsql-mysql/ChangeLog +++ b/dev-haskell/hsql-mysql/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/hsql-mysql -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.9 2009/08/05 18:10:26 kolmodin Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.10 2010/07/12 15:47:40 slyfox Exp $ + + 12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> hsql-mysql-1.7.ebuild, + hsql-mysql-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-mysql-1.7.1 (05 Aug 2009) diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild index 511ccb20c215..5805d7dda3c5 100644 --- a/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild +++ b/dev-haskell/hsql-mysql/hsql-mysql-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-mysql/hsql-mysql-1.7.1.ebuild,v 1.1 2009/08/05 18:10:26 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild,v 1.2 2010/07/12 15:47:40 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-mysql/hsql-mysql-1.7.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild index f109b222710e..7819660fc3ad 100644 --- a/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild +++ b/dev-haskell/hsql-mysql/hsql-mysql-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-mysql/hsql-mysql-1.7.ebuild,v 1.8 2007/12/13 05:42:21 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild,v 1.9 2010/07/12 15:47:40 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} >=virtual/mysql-4.0" +CABAL_CONFIGURE_FLAGS="--constraint=base<4" + src_unpack() { - unpack "${A}" + unpack ${A} cabal-mksetup sed -i '/cc-options:/d' "${S}/${PN}.cabal" |