| 1 |
commit: 1b0d23325cf132e9f85ec34ae6bac49f3b5f5ec8 |
| 2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 19 23:53:16 2017 +0000 |
| 4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 19 23:53:59 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0d2332 |
| 7 |
|
| 8 |
dev-perl/DBD-mysql: Fix compiling against MariaDB 10.2 bug #634192 |
| 9 |
|
| 10 |
rbump needed because compiles can break and install without errors |
| 11 |
if you disabled tests. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/634192 |
| 14 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 15 |
|
| 16 |
...4.41.0-r1.ebuild => DBD-mysql-4.41.0-r2.ebuild} | 1 + |
| 17 |
dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch | 35 ++++++++++++++++++++++ |
| 18 |
2 files changed, 36 insertions(+) |
| 19 |
|
| 20 |
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r2.ebuild |
| 21 |
similarity index 97% |
| 22 |
rename from dev-perl/DBD-mysql/DBD-mysql-4.41.0-r1.ebuild |
| 23 |
rename to dev-perl/DBD-mysql/DBD-mysql-4.41.0-r2.ebuild |
| 24 |
index dd0e5c3e5dc..34f18b06e62 100644 |
| 25 |
--- a/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r1.ebuild |
| 26 |
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r2.ebuild |
| 27 |
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND} |
| 28 |
PATCHES=( |
| 29 |
"${FILESDIR}/${DIST_VERSION}-no-dot-inc.patch" |
| 30 |
"${FILESDIR}/${DIST_VERSION}-amvis-type-conversions.patch" |
| 31 |
+ "${FILESDIR}/${DIST_VERSION}-mariadb-10.2.patch" |
| 32 |
) |
| 33 |
src_configure() { |
| 34 |
if use test; then |
| 35 |
|
| 36 |
diff --git a/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch b/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch |
| 37 |
new file mode 100644 |
| 38 |
index 00000000000..13fa2775a3c |
| 39 |
--- /dev/null |
| 40 |
+++ b/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch |
| 41 |
@@ -0,0 +1,35 @@ |
| 42 |
+From 509fd6a054de9408ce9032e93fff61f6bdbc568a Mon Sep 17 00:00:00 2001 |
| 43 |
+From: Brian Evans <grknight@g.o> |
| 44 |
+Date: Fri, 13 Oct 2017 15:03:50 -0400 |
| 45 |
+Subject: Fix building/linking against MariaDB 10.2 |
| 46 |
+ |
| 47 |
+Bug: https://bugs.gentoo.org/634192 |
| 48 |
+--- |
| 49 |
+ mysql.xs | 4 ++-- |
| 50 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 51 |
+ |
| 52 |
+diff --git a/mysql.xs b/mysql.xs |
| 53 |
+index 13c6a57..6de3c8e 100644 |
| 54 |
+--- a/mysql.xs |
| 55 |
++++ b/mysql.xs |
| 56 |
+@@ -790,7 +790,7 @@ dbd_mysql_get_info(dbh, sql_info_type) |
| 57 |
+ D_imp_dbh(dbh); |
| 58 |
+ IV type = 0; |
| 59 |
+ SV* retsv=NULL; |
| 60 |
+-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 |
| 61 |
++#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202 |
| 62 |
+ /* MariaDB 10 is not MySQL source level compatible so this only applies to MySQL*/ |
| 63 |
+ IV buffer_len; |
| 64 |
+ #endif |
| 65 |
+@@ -822,7 +822,7 @@ dbd_mysql_get_info(dbh, sql_info_type) |
| 66 |
+ retsv = newSVpvn("`", 1); |
| 67 |
+ break; |
| 68 |
+ case SQL_MAXIMUM_STATEMENT_LENGTH: |
| 69 |
+-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 |
| 70 |
++#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202 |
| 71 |
+ /* MariaDB 10 is not MySQL source level compatible so this |
| 72 |
+ only applies to MySQL*/ |
| 73 |
+ /* mysql_get_option() was added in mysql 5.7.3 */ |
| 74 |
+-- |
| 75 |
+2.14.2 |
| 76 |
+ |
Archives