Fix build failures on >=dev-db/mariadb-10.0

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

5 files changed, 123 insertions, 12 deletions

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index b70a1deee385..858310804103 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/myodbc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.36 2014/07/29 03:35:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.37 2014/08/20 18:52:50 grknight Exp $
+
+  20 Aug 2014;  <grknight@gentoo.org> +files/5.2.7-cxxlinkage.patch,
+  +files/5.2.7-mariadb-dynamic-array.patch, myodbc-5.2.7.ebuild:
+  Fix build failures on >=dev-db/mariadb-10.0
 
 *myodbc-5.2.7 (29 Jul 2014)
 
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 947e4c2ec16a..7cd8ae52a4db 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 5.2.7-cxxlinkage.patch 1136 SHA256 db9cf630c1f64df9b7fac583e71cedd6106b200f5455b5b2be1486fe163d7124 SHA512 a0822f95c4362a571d559cf61da2e99f1dd9a69fe57075693f337f651ed43bcc59a5a6c27b9c88125a9e078b0a0a5d50200d2a4a9c8a8371854c5101cfd58040 WHIRLPOOL d49d4ee8d9a392f04a83c1f1e5d2041fe56e81d18b9f71d8e9728ad7da80b11a786cb247979df0c4e1afa5b1ce409381a7b3d0ce95aaee13b468e3a1232ea45d
+AUX 5.2.7-mariadb-dynamic-array.patch 3053 SHA256 132b49d939fe26939e3c794a1db7dc50f28e552c81db7913006dfee45cb4b503 SHA512 26d35effbf4e74ef634c6e42dced40830402aa0925571f4bd55acd3dfe06f1c8c8f3bab4e9bb4bcd3f72dc87ecc3a093b984df4837548710899f97d8bdeca7b6 WHIRLPOOL a778ec270547a4fd0f7907f7eb5005da966575f77c9c886f545c393e4a21ac58656316202d5bd48cc7523d35e61a97c806564dbf7a7573009780c8c936d502ee
 AUX cmake-doc-path.patch 1498 SHA256 75477998ba483fb1f6a5dde6cbd4719ac2e98e32540e7eb46bd334a0b354abe2 SHA512 2e48af11efb55a1508402d5d1d717a3dfc9897bf0ccce5aa190792fb673ac78b27a9480e951a6347a2c8d0e2fe08a28c11fd08c55dbea835a93f525decaaf09e WHIRLPOOL 0631c7cef81bb8541ca0af96afcf9ed8118aef87702d89d5237a8744bc6d9324b6cb148f3c32e4d225df038d15ad5c8583d0a6a49e33e9fc7b9cd44b319982be
 AUX myodbc-5.1.6-qt4-includedir.patch 580 SHA256 ba1ccd551f87b6d19ddfdb6cfb6f88f61b23c7718a3ed415ef5d94db225373d2 SHA512 79fb5a47f43555b14de8186c0afde91917fa647a000211f1a999cdcfe4aefc374d85e5e950c97260d682ec3498474c25200b27bda63cc31ec5612e08189f317a WHIRLPOOL ecd8eaaac7dc5ea1a294c1f3560c5a8ceb770b4d7abb4a754e71313b5976f82f6df2f8695734470a7988cdc1b01cf0c868ec6a268193dab9179d6043e909d9ba
 AUX odbc.ini.m4 517 SHA256 0f14bd8815aac8c75ff3b2b6e86b2883fbe4e2e6e3de153e772091c7a5c124e5 SHA512 60883bced4be275f9496910ecbf11d92e9d550e28c12eca8549546f3b5f5fd12322fabb81611bb4d951bab6d203ddd82aafe8ec8bdf0b6aa61a94eac6770fb3b WHIRLPOOL 2c12b3565efe6f92f8f43f9de84e667b066f6b82e17590b1c918540becc9554b1224c14f40dfa7c263818089208b7851b2ca6a6f881d77196564b57db49634fe
@@ -8,17 +10,17 @@ AUX odbcinst.ini.m4 233 SHA256 893011ec62a2631cf41521717cbebfddf48ae3a633c8ca1e7
 DIST mysql-connector-odbc-5.1.6.tar.gz 1041247 SHA256 1d53c3a20cf68b089535278d3e69c0e49f367a457640c5f8af25c1cbf4ffb02e SHA512 74fe41c09a6261e31475c17a6b96d3161737c792fec6b2774f51fa58adae592143e44d6a2bf5dc2ec445b5e19653aa6abc9e6d0d37cc478bb26137f2658766f9 WHIRLPOOL 573f942682581514adb94183c633eb38a0ab1c990ead1f7da1e90aedcff18da392480bfaa1216d3e9b0c8b261f963bd81c0ed5f7192c74a8294028783e6f85e9
 DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256 0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f WHIRLPOOL 928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499
 EBUILD myodbc-5.1.6.ebuild 3351 SHA256 d4e3d271c2d8de85797fd497a9cebcbfbc66c6e511d3a7cd47d3b275f8257c42 SHA512 83bff8d93e2167db4a1f9b51fcd83ffcb91b5993962d99b1e894e7187db01275d8cd3dffc769b67a462b50b520714ae97e66d47792f0f7ac9c8dc5c1cd3a6fa2 WHIRLPOOL 53faa9b1ada3f2f8f57670952891995733cc7fc7d4f7174231f55b03294bb7e2e2edc8baed2e2e7a0cefc97b1cb681fda1951e430fd2f82863059c55ed70a5b6
-EBUILD myodbc-5.2.7.ebuild 3050 SHA256 ada1515f9c67b5addd015466dd49d7dab44a9a6e3df7cd3a9153df26fa6147c2 SHA512 2de6ae4e71564e9828999850f0f7462aaa476c553cdb36962cdb7cd47f82c623b5a09c877293c0b0604fcb8f47176b5b720ebda7ce83eb6eb7b6969c98f1bd36 WHIRLPOOL 3adfb0cf83492fa0f56165cd2dd149fae16af3b45b50e12cbda407ef55ca90d6ab807f2d401b3976b97b86fa816f9435fea4d77bb784e0fb6c9abb3a5435b1ad
-MISC ChangeLog 5128 SHA256 0859efc2bd34de3e4a0d69ba70a05202060f1d9478c8ba99ce736cb827a0249c SHA512 60db7e8b6af589c60e40746a83f23ebfb07019fe44adaac7c068bd59d10c9090de350c8b6adcb1dd4c28105f44cb1d4ec0d382e413b0f45089cc1b974d289a17 WHIRLPOOL f1bc25a41501f640cd895b923d0ea46fe16764c3b87c9cb66de179017137b0bc7c2be3c0b5e8ca503cc3cf7cb8741e0e0726d68afb8b7e081d26d96fff259627
+EBUILD myodbc-5.2.7.ebuild 3199 SHA256 18f116106ac02fb1375c20e86c71d144b4d16dcec84abf0645390dc6d974d9b4 SHA512 1c95a6bba275e01ebe2e61f8f513c0f042021b0e7373a4f7aa5aab162cc2c33062e4a0eaea29a568225182749dc421291e791c31a8073509610fc6f93d659482 WHIRLPOOL 0dc3f8574b2f8f0562af59d0bc7b5fd080fd06ac5430f89eb32b63b7ceeb1e95844dfafa2cef6181b542ad477f5ae9411bcef9249e88f302ecd6d810ee3d4741
+MISC ChangeLog 5309 SHA256 4593068514655dc93d2153ec93f7bd58b5a714fe9829f197b3214ceea4b9e4d7 SHA512 b2159292b62df2e196a4ff17340f8999aab4eac5be59de0fb1ce7753aae4482a90bef2d2f466fb02abf58f54c4136d8d6339cf20639b5d3fc18bd77c764e0b94 WHIRLPOOL 420e55bc217bb14d73717cff0b9dd5369e3a580d4fdaa6d27e07bf8ed63fca4743e97ab9e4e2333346fb7a5348d62904044e1fa26dfbb214e7417bb092d2c80d
 MISC metadata.xml 158 SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569 SHA512 538b01075e7bf3f429546654620fa773f3926594d7747d778ce6250263a7ba32fd7e63e14232fd89d503780b783fb7ab401ff2a0040a8d36c99c5c232609ca56 WHIRLPOOL 1739fa77f8bf21977b25d7c05d8da902f0a30335da5fcaca2b35200e504199c645d4115b8d2b4790ccdb692d7010c7a2cc09b27994679af8be6164f1c007e964
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT1xaEAAoJEE4V4vFnx44d9PsH/RxLkyiDy+xrAtRpzEg/hacC
-XtwhU3yA51pzFpaXYrcQPA2zkCBfOrEyH5q2BqnqUq7RCG+Y0Ifs02EktzmTr6AD
-UyRLnGYnYkyDaHzxHyNbA7iOlhbYRm/p7FhwrT/RYdS/A0xDKwbXyqIQF4FPOeHN
-g/+ml0vxeEWbW4cyn9szbNLGIE+vM0gWO0CDOJKTsa2BWPhIzUfzgLogKVhMZYET
-iZgX58y6XbPGW1MBq/GCNT4XD7rU48wi7Mdf4dwbxXsQF2xqiAYoNiiQc+1fImcO
-5Mucu3k617ypA5XcFU08V7WYZce2ZLrA/n4xjPKuPg0+Tes4Fi66d8g5gWzPVV8=
-=hEe0
+iQEcBAEBCAAGBQJT9O6GAAoJEE4V4vFnx44dcckH/j481A0TyywOtePmzezcNBkW
+0CSndeAoXVR7VNtN4vQx8BTBNtNuHV4/xIgDwr+j4rqczo0NjV2Ue2UYM3gJnpjc
+0/D0qar3iOs2aE1OD++jvKMCo7SqA5a0t1Fwo3SsATGj/VnWIYh+Bb05kPwLZgYU
+me85NIOnimCB6jCiMUGcr+0FEx5vULfNZrU3+aiB+2mOP9MeH/0m7AtB/GcgBMA+
+9ad6TahswMy+e0Ao27ceqVXJCfrNzz85LBRMchnGIpoy98l5+pke1k7zjncjYNFn
+WdfPI59CMdYDsfhWmlWwhGHmprSXhAAnXOaUcx3TBGZCmzudDTlqoEYCwa6QSd4=
+=b3Ks
 -----END PGP SIGNATURE-----
diff --git a/dev-db/myodbc/files/5.2.7-cxxlinkage.patch b/dev-db/myodbc/files/5.2.7-cxxlinkage.patch
new file mode 100644
index 000000000000..a78c89ba4f56
--- /dev/null
+++ b/dev-db/myodbc/files/5.2.7-cxxlinkage.patch
@@ -0,0 +1,23 @@
+diff -uarN mysql-connector-odbc-5.3.4-src.orig/cmake/FindMySQL.cmake mysql-connector-odbc-5.3.4-src/cmake/FindMySQL.cmake
+--- mysql-connector-odbc-5.3.4-src.orig/cmake/FindMySQL.cmake	2014-06-18 18:50:16.000000000 -0400
++++ mysql-connector-odbc-5.3.4-src/cmake/FindMySQL.cmake	2014-08-20 10:05:00.191485304 -0400
+@@ -105,16 +105,16 @@
+   # Finally remove the dot
+   STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}")
+ 
+-  IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
++  IF(MYSQL_CXX_LINKAGE)
+     EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags"
+             OUTPUT_VARIABLE _mysql_config_output
+             )
+     SET(MYSQL_CXX_LINKAGE 1)
+-  ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
++  ELSE (MYSQL_CXX_LINKAGE)
+     EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
+             OUTPUT_VARIABLE _mysql_config_output
+             )
+-  ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
++  ENDIF(MYSQL_CXX_LINKAGE)
+ 
+   # Remove the stl4port dependency
+   STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}")
diff --git a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch b/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch
new file mode 100644
index 000000000000..6cfe7cd274b3
--- /dev/null
+++ b/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch
@@ -0,0 +1,79 @@
+diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c
+--- a/driver/catalog_no_i_s.c	2014-06-18 18:50:16.000000000 -0400
++++ b/driver/catalog_no_i_s.c	2014-08-20 14:08:33.997339096 -0400
+@@ -1093,7 +1093,11 @@
+   unsigned long *lengths;
+   SQLRETURN rc= SQL_SUCCESS;
+ 
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++  my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0));
++#else
+   my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
++#endif
+ 
+   /* Get the list of tables that match szCatalog and szTable */
+   pthread_mutex_lock(&stmt->dbc->lock);
+diff -aurN a/driver/desc.c b/driver/desc.c
+--- a/driver/desc.c	2014-06-18 18:50:16.000000000 -0400
++++ b/driver/desc.c	2014-08-20 14:07:37.409169269 -0400
+@@ -63,8 +63,12 @@
+      but in desc_get_rec we manually get a pointer to it. This avoids
+      having to call set_dynamic after modifying the DESCREC.
+   */
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++  if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0)))
++#else
+   if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
++#endif
+   {
+     x_free((char *)desc);
+     return NULL;
+   }
+@@ -995,9 +1003,15 @@
+ 
+   /* copy the records */
+   delete_dynamic(&dest->records);
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++  if (my_init_dynamic_array(&dest->records, sizeof(DESCREC),
++                            src->records.max_element,
++                            src->records.alloc_increment, MYF(0)))
++#else
+   if (my_init_dynamic_array(&dest->records, sizeof(DESCREC),
+                             src->records.max_element,
+                             src->records.alloc_increment))
++#endif
+   {
+     return set_desc_error(dest, "HY001",
+               "Memory allocation error",
+diff -aurN a/driver/handle.c b/driver/handle.c
+--- a/driver/handle.c	2014-06-18 18:50:16.000000000 -0400
++++ b/driver/handle.c	2014-08-20 14:05:00.364248403 -0400
+@@ -403,7 +403,11 @@
+     }
+   }
+ 
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++  my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0));
++#else
+   my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
++#endif
+   memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
+ 											(*param_bind)->max_element);
+ 
+diff -aurN a/driver/parse.c b/driver/parse.c
+--- a/driver/parse.c	2014-06-18 18:50:16.000000000 -0400
++++ b/driver/parse.c	2014-08-20 14:03:54.336383876 -0400
+@@ -129,8 +129,13 @@
+ 
+     /* TODO: Store offsets rather than ptrs. In this case we will be fine
+        if work with copy of the originally parsed string */
++#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
++    my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10, MYF(0));
++    my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0));
++#else
+     my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10);
+     my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
++#endif
+   }
+ 
+   return pq;
diff --git a/dev-db/myodbc/myodbc-5.2.7.ebuild b/dev-db/myodbc/myodbc-5.2.7.ebuild
index 1c5fb94da4ef..8f853ade869d 100644
--- a/dev-db/myodbc/myodbc-5.2.7.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild,v 1.1 2014/07/29 03:35:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild,v 1.2 2014/08/20 18:52:50 grknight Exp $
 
 EAPI=5
 inherit cmake-utils eutils flag-o-matic versionator
@@ -38,7 +38,9 @@ src_prepare() {
 	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
 
 	# Patch document path so it doesn't install files to /usr
-	epatch "${FILESDIR}/cmake-doc-path.patch"
+	epatch "${FILESDIR}/cmake-doc-path.patch" \
+		"${FILESDIR}/${PV}-cxxlinkage.patch" \
+		"${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
 }
 
 src_configure() {
@@ -49,6 +51,7 @@ src_configure() {
 		-DWITH_UNIXODBC=1
 		-DRPM_BUILD=1
 		-DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so"
+		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${P}
 	)
 
 	cmake-utils_src_configure