| 1 |
commit: 1a15cea15c08b516a1a53d2aaf601100b7599098 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 07:39:19 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 07:39:27 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a15cea1 |
| 7 |
|
| 8 |
dev-haskell/hdbc-mysql: tweak for cabal-3 |
| 9 |
|
| 10 |
Reported-by: Toralf Förster |
| 11 |
Closes: https://bugs.gentoo.org/735956 |
| 12 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch | 11 +++++++++++ |
| 16 |
dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild | 4 +++- |
| 17 |
2 files changed, 14 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..11fe2231d73 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch |
| 24 |
@@ -0,0 +1,11 @@ |
| 25 |
+--- a/Setup.lhs |
| 26 |
++++ b/Setup.lhs |
| 27 |
+@@ -35,7 +35,7 @@ mysqlConfigProgram = (simpleProgram "mysql_config") { |
| 28 |
+ |
| 29 |
+ mysqlBuildInfo :: LocalBuildInfo -> IO BuildInfo |
| 30 |
+ mysqlBuildInfo lbi = do |
| 31 |
+- let mysqlConfig = rawSystemProgramStdoutConf verbosity mysqlConfigProgram (withPrograms lbi) |
| 32 |
++ let mysqlConfig = getDbProgramOutput verbosity mysqlConfigProgram (withPrograms lbi) |
| 33 |
+ ws = " \n\r\t" |
| 34 |
+ |
| 35 |
+ includeDirs <- return . map (drop 2) . split ws =<< mysqlConfig ["--include"] |
| 36 |
|
| 37 |
diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild |
| 38 |
index 5a09fbb7663..b1a0712a1a1 100644 |
| 39 |
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild |
| 40 |
+++ b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-# Copyright 1999-2019 Gentoo Authors |
| 43 |
+# Copyright 1999-2020 Gentoo Authors |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
EAPI=6 |
| 47 |
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND} |
| 48 |
|
| 49 |
S="${WORKDIR}/${MY_P}" |
| 50 |
|
| 51 |
+PATCHES=("${FILESDIR}"/${P}-cabal-3.patch) |
| 52 |
+ |
| 53 |
src_configure() { |
| 54 |
haskell-cabal_src_configure \ |
| 55 |
$(cabal_flag debug debug) |
Archives