summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2010-07-12 15:48:39 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2010-07-12 15:48:39 +0000
commitfc6baf4bdca9d2206eecb476873847140022c973 (patch)
tree93faf1279ca1e33004766a563df8544aaaeba526 /dev-haskell/hsql-odbc
parentFixed bug #278897 (build failure on ghc-6.10+) (diff)
downloadgentoo-2-fc6baf4bdca9d2206eecb476873847140022c973.tar.gz
gentoo-2-fc6baf4bdca9d2206eecb476873847140022c973.tar.bz2
gentoo-2-fc6baf4bdca9d2206eecb476873847140022c973.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-odbc')
-rw-r--r--dev-haskell/hsql-odbc/ChangeLog8
-rw-r--r--dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild8
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-haskell/hsql-odbc/ChangeLog b/dev-haskell/hsql-odbc/ChangeLog
index d8f4d68da5f5..fb4b5048c535 100644
--- a/dev-haskell/hsql-odbc/ChangeLog
+++ b/dev-haskell/hsql-odbc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/hsql-odbc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/ChangeLog,v 1.8 2007/12/13 05:43:36 dcoutts Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/ChangeLog,v 1.9 2010/07/12 15:48:39 slyfox Exp $
+
+ 12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> hsql-odbc-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-odbc-1.7.ebuild:
Updates for upward compatability with cabal-1.2 and ghc-6.8
diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild
index 42c5b69c59c8..4919ed2bd2b1 100644
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild
+++ b/dev-haskell/hsql-odbc/hsql-odbc-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-odbc/hsql-odbc-1.7.ebuild,v 1.7 2007/12/13 05:43:36 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild,v 1.8 2010/07/12 15:48:39 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/unixODBC-2.2"
+CABAL_CONFIGURE_FLAGS="--constraint=base<4"
+
src_unpack() {
- unpack "${A}"
+ unpack ${A}
cabal-mksetup
sed -i -e '/cc-options:/d' "${S}/${PN}.cabal"