From 7b1bbdce791c11563d624edf7e4ce941da0cce39 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 15 Oct 2022 21:19:26 -0400 Subject: [PATCH] apr-util: fix mysql error fixes #39510 --- srcpkgs/apr-util/patches/mysql.patch | 14 ++++++++++++++ srcpkgs/apr-util/template | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/apr-util/patches/mysql.patch diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch new file mode 100644 index 000000000000..d58c45b5be0d --- /dev/null +++ b/srcpkgs/apr-util/patches/mysql.patch @@ -0,0 +1,14 @@ +https://github.com/void-linux/void-packages/issues/39510 + +--- a/dbd/apr_dbd_mysql.c ++++ b/dbd/apr_dbd_mysql.c +@@ -1262,7 +1262,9 @@ + + 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/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index f01bfeb54158..f1cd4363365a 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -1,7 +1,7 @@ # Template file for 'apr-util' pkgname=apr-util version=1.6.1 -revision=12 +revision=13 build_style=gnu-configure configure_args=" --with-pgsql --with-ldap @@ -19,6 +19,8 @@ license="Apache-2.0" homepage="https://apr.apache.org/" distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2" checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b +# fails to build tests +make_check=no if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel"