dev-libs/apr-util: improve mysql-8 compatibility

Don't call my_init() which was removed in mysql-8.0.2+. Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann <[email protected]>
johu · Jul 27, 2020 · b5c7976 · b5c7976
1 parent 7b7cf87
commit b5c7976
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r4.ebuild → dev-libs/apr-util/apr-util-1.6.1-r5.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r4.ebuild → dev-libs/apr-util/apr-util-1.6.1-r5.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
  ldap? ( =net-nds/openldap-2* )
  mysql? ( || (
  dev-db/mariadb-connector-c
- dev-db/mysql-connector-c
+ >=dev-db/mysql-connector-c-8
  ) )
  nss? ( dev-libs/nss )
  odbc? ( dev-db/unixODBC )
@@ -50,7 +50,8 @@ PATCHES=(
  "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
  "${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch
  "${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch
- "${FILESDIR}"/${PN}-1.6.1-my_boold.patch
+ "${FILESDIR}"/${PN}-1.6.1-my_bool.patch
+ "${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch
 )
 
 src_prepare() {

diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch b/dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch
@@ -0,0 +1,15 @@
+Was finally removed in >=mysql-8.0.2
+
+--- a/dbd/apr_dbd_mysql.c
++++ b/dbd/apr_dbd_mysql.c
+@@ -1262,9 +1262,6 @@ static apr_status_t thread_end(void *data)
+
+ static void dbd_mysql_init(apr_pool_t *pool)
+ {
+-#if MYSQL_VERSION_ID < 100000
+- my_init();
+-#endif
+ mysql_thread_init();
+
+ /* FIXME: this is a guess; find out what it really does */
+
diff --git a/...-util/files/apr-util-1.6.1-my_boold.patch → ...r-util/files/apr-util-1.6.1-my_bool.patch b/...-util/files/apr-util-1.6.1-my_boold.patch → ...r-util/files/apr-util-1.6.1-my_bool.patch