diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-07-27 12:28:31 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-07-27 12:29:32 +0200 |
| commit | b5c797685526e3f4f99ae9a4384ec2a0bc385702 (patch) | |
| tree | e0b71f411edba4dc3fa4d72d177d134376104dba /dev-libs | |
| parent | dev-python/webencodings: Remove py2 (diff) | |
| download | gentoo-b5c797685526e3f4f99ae9a4384ec2a0bc385702.tar.gz gentoo-b5c797685526e3f4f99ae9a4384ec2a0bc385702.tar.bz2 gentoo-b5c797685526e3f4f99ae9a4384ec2a0bc385702.zip | |
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 <whissi@gentoo.org>
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/apr-util/apr-util-1.6.1-r5.ebuild (renamed from dev-libs/apr-util/apr-util-1.6.1-r4.ebuild) | 5 | ||||
| -rw-r--r-- | dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch | 15 | ||||
| -rw-r--r-- | dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch (renamed from dev-libs/apr-util/files/apr-util-1.6.1-my_boold.patch) | 0 |
3 files changed, 18 insertions, 2 deletions
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r4.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r5.ebuild index e73f88b5cf62..a30d4b805b28 100644 --- a/dev-libs/apr-util/apr-util-1.6.1-r4.ebuild +++ b/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 new file mode 100644 index 000000000000..741ca65ca325 --- /dev/null +++ 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/dev-libs/apr-util/files/apr-util-1.6.1-my_boold.patch b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch index 6cd875bcde89..6cd875bcde89 100644 --- a/dev-libs/apr-util/files/apr-util-1.6.1-my_boold.patch +++ b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch |