diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-07-28 00:08:19 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-07-28 00:08:36 +0200 |
| commit | 5a8c2df53d8abbe67ae89546075dcd31b65b61f9 (patch) | |
| tree | 65eda9f7b22c4d520e7f4fc48840f6e424d6d0f1 /dev-libs | |
| parent | www-client/firefox: needs >=rust-1.43.0 (diff) | |
| download | gentoo-5a8c2df53d8abbe67ae89546075dcd31b65b61f9.tar.gz gentoo-5a8c2df53d8abbe67ae89546075dcd31b65b61f9.tar.bz2 gentoo-5a8c2df53d8abbe67ae89546075dcd31b65b61f9.zip | |
dev-libs/apr-util: update my_bool patch
We need to take a different solution because MariaDB Connector C
is still defining my_bool.
Closes: https://bugs.gentoo.org/734020
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-r6.ebuild (renamed from dev-libs/apr-util/apr-util-1.6.1-r5.ebuild) | 0 | ||||
| -rw-r--r-- | dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch | 8 |
2 files changed, 5 insertions, 3 deletions
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r5.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild index a30d4b805b28..a30d4b805b28 100644 --- a/dev-libs/apr-util/apr-util-1.6.1-r5.ebuild +++ b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch index 48816555a21c..eda0cd041287 100644 --- a/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch +++ b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch @@ -1,13 +1,15 @@ --- a/dbd/apr_dbd_mysql.c +++ b/dbd/apr_dbd_mysql.c -@@ -41,6 +41,10 @@ +@@ -41,6 +41,12 @@ #endif #endif #include <mysql.h> -+#ifndef HAVE_TYPE_MY_BOOL -+#include <stdbool.h> ++// MariaDB still include definition of my_bool but has a higher version ID ++#ifndef MARIADB_VERSION_ID ++#if MYSQL_VERSION_ID > 80000 +typedef bool my_bool; +#endif ++#endif #include <errmsg.h> #endif |