apr-util: fix mysql error

fixes #39510
This commit is contained in:
classabbyamp 2022-10-15 21:19:26 -04:00 committed by classabbyamp
parent 644fab3e8b
commit 732e83dc7c
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,15 @@
fixes: https://github.com/void-linux/void-packages/issues/39510
taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
--- 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 */

View File

@ -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"