| 1 |
commit: 1c3d12ccc75b97f990ba95de27d345566d6d5b08 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 1 17:51:53 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 1 17:51:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3d12cc |
| 7 |
|
| 8 |
dev-db/myodbc: Fix build of 5.3.10 with mariadb 10.{0,1} |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-db/myodbc/files/5.3.10-mariadb.patch | 58 ++++++++++++++++++++++++++++++++ |
| 13 |
dev-db/myodbc/myodbc-5.3.10-r1.ebuild | 2 +- |
| 14 |
2 files changed, 59 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-db/myodbc/files/5.3.10-mariadb.patch b/dev-db/myodbc/files/5.3.10-mariadb.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..c860349e4b7 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-db/myodbc/files/5.3.10-mariadb.patch |
| 21 |
@@ -0,0 +1,58 @@ |
| 22 |
+--- a/include/sys_main.h 2018-01-19 05:36:38.000000000 -0500 |
| 23 |
++++ b/include/sys_main.h 2018-03-01 11:40:04.554713079 -0500 |
| 24 |
+@@ -20,6 +20,8 @@ |
| 25 |
+ extern "C" { |
| 26 |
+ #endif |
| 27 |
+ |
| 28 |
++#include "sys/mysql/psi/psi_memory.h" |
| 29 |
++ |
| 30 |
+ #define MY_FAE 8 /* Fatal if any error */ |
| 31 |
+ #define MY_WME 16 /* Write message on error */ |
| 32 |
+ #define MY_ZEROFILL 32 /* my_malloc(), fill array with zero */ |
| 33 |
+--- a/driver/connect.c 2018-01-19 05:36:38.000000000 -0500 |
| 34 |
++++ b/driver/connect.c 2018-03-01 11:39:51.458676373 -0500 |
| 35 |
+@@ -179,7 +179,7 @@ |
| 36 |
+ /* Set other connection options */ |
| 37 |
+ |
| 38 |
+ if (ds->allow_big_results || ds->safe) |
| 39 |
+-#if MYSQL_VERSION_ID >= 50709 |
| 40 |
++#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION) |
| 41 |
+ mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, &max_long); |
| 42 |
+ #else |
| 43 |
+ /* max_allowed_packet is a magical mysql macro. */ |
| 44 |
+@@ -252,7 +252,7 @@ |
| 45 |
+ ds_get_utf8attr(ds->rsakey, &ds->rsakey8)); |
| 46 |
+ } |
| 47 |
+ #endif |
| 48 |
+-#if MYSQL_VERSION_ID >= 50710 |
| 49 |
++#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION) |
| 50 |
+ { |
| 51 |
+ char tls_options[128] = { 0 }; |
| 52 |
+ if (!ds->no_tls_1) |
| 53 |
+@@ -323,7 +323,7 @@ |
| 54 |
+ #endif |
| 55 |
+ |
| 56 |
+ mysql->options.use_ssl = !ds->disable_ssl_default; |
| 57 |
+-#if MYSQL_VERSION_ID >= 50703 |
| 58 |
++#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION) |
| 59 |
+ { |
| 60 |
+ if (ds->ssl_enforce) |
| 61 |
+ { |
| 62 |
+@@ -332,7 +332,7 @@ |
| 63 |
+ } |
| 64 |
+ #endif |
| 65 |
+ |
| 66 |
+-#if MYSQL_VERSION_ID >= 50711 |
| 67 |
++#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION) |
| 68 |
+ if (ds->sslmode) |
| 69 |
+ { |
| 70 |
+ unsigned int mode = 0; |
| 71 |
+@@ -510,7 +510,7 @@ |
| 72 |
+ } |
| 73 |
+ } |
| 74 |
+ |
| 75 |
+-#if MYSQL_VERSION_ID >= 50709 |
| 76 |
++#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION) |
| 77 |
+ mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_len); |
| 78 |
+ #else |
| 79 |
+ // for older versions just use net_buffer_length() macro |
| 80 |
|
| 81 |
diff --git a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild b/dev-db/myodbc/myodbc-5.3.10-r1.ebuild |
| 82 |
index 63881efa73e..5aeb327fb5b 100644 |
| 83 |
--- a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild |
| 84 |
+++ b/dev-db/myodbc/myodbc-5.3.10-r1.ebuild |
| 85 |
@@ -43,7 +43,7 @@ PATCHES=( |
| 86 |
"${FILESDIR}/5.3.10-cxxlinkage.patch" |
| 87 |
# "${FILESDIR}/${MAJOR}-mariadb-dynamic-array.patch" |
| 88 |
"${FILESDIR}/5.2.7-my_malloc.patch" |
| 89 |
-# "${FILESDIR}/${MAJOR}-mariadb-buffer_length.patch" |
| 90 |
+ "${FILESDIR}/5.3.10-mariadb.patch" |
| 91 |
) |
| 92 |
|
| 93 |
src_prepare() { |
Archives