summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2010-07-12 15:50:22 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2010-07-12 15:50:22 +0000
commit72c9e47f0cfc58907dd07b03ed769a2be08cfd96 (patch)
treeed73384592dceb3366d36f3a66b716d587d9f45f /dev-haskell/hsql-sqlite
parentFixed bug #278897 (build failure on ghc-6.10+) (diff)
downloadgentoo-2-72c9e47f0cfc58907dd07b03ed769a2be08cfd96.tar.gz
gentoo-2-72c9e47f0cfc58907dd07b03ed769a2be08cfd96.tar.bz2
gentoo-2-72c9e47f0cfc58907dd07b03ed769a2be08cfd96.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-sqlite')
-rw-r--r--dev-haskell/hsql-sqlite/ChangeLog9
-rw-r--r--dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild8
2 files changed, 12 insertions, 5 deletions
diff --git a/dev-haskell/hsql-sqlite/ChangeLog b/dev-haskell/hsql-sqlite/ChangeLog
index 5b01c3ef04f0..9a4cb49072a7 100644
--- a/dev-haskell/hsql-sqlite/ChangeLog
+++ b/dev-haskell/hsql-sqlite/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-haskell/hsql-sqlite
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/ChangeLog,v 1.9 2007/12/13 05:43:11 dcoutts Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/ChangeLog,v 1.10 2010/07/12 15:50:22 slyfox Exp $
+
+ 12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org>
+ hsql-sqlite-1.7.ebuild:
+ Fixed bug #278897 (build failure on ghc-6.10+). Thanks to Nikolay Orlyuk
+ <virkony@gmail.com> for the report and fix.
13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-sqlite-1.7.ebuild:
Updates for upward compatability with cabal-1.2 and ghc-6.8
diff --git a/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild b/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild
index bbef73e92801..092df92beca4 100644
--- a/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild
+++ b/dev-haskell/hsql-sqlite/hsql-sqlite-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-sqlite/hsql-sqlite-1.7.ebuild,v 1.7 2007/12/13 05:43:11 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild,v 1.8 2010/07/12 15:50:22 slyfox Exp $
CABAL_FEATURES="lib haddock"
inherit haskell-cabal
@@ -23,8 +23,10 @@ DEPEND=">=dev-lang/ghc-6.4.1
S="${WORKDIR}/${MY_P}"
+CABAL_CONFIGURE_FLAGS="--constraint=base<4"
+
src_unpack() {
- unpack "${A}"
+ unpack ${A}
cabal-mksetup
echo 'extra-libraries: sqlite3' >> "${S}/hsql-sqlite3.cabal"