* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/
@ 2016-09-04 15:30 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2016-09-04 15:30 UTC (permalink / raw
To: gentoo-commits
commit: d104dadc8ab39f648dd2fc842a38595f59583b7b
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Aug 18 10:24:25 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 15:30:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d104dadc
dev-libs/apr-util: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/2220
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../apr-util/files/apr-util-1.3.12-bdb-5.2.patch | 139 ---------------------
1 file changed, 139 deletions(-)
diff --git a/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch b/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch
deleted file mode 100644
index 5687a8e..00000000
--- a/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- build/dbm.m4
-+++ build/dbm.m4
-@@ -579,6 +579,25 @@
- apu_db_version=5
- fi
- ])
-+dnl
-+dnl APU_CHECK_DB52: is DB5.2 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB52], [
-+ places=$1
-+ if test -z "$places"; then
-+ places="std /usr/local/BerkeleyDB.5.2 /boot/home/config"
-+ fi
-+ APU_CHECK_BERKELEY_DB("5", "2", "-1",
-+ "$places",
-+ "db52/db.h db5/db.h db.h",
-+ "db-5.2 db5-5.2 db52 db5 db"
-+ )
-+ if test "$apu_have_db" = "1"; then
-+ apu_db_version=5
-+ fi
-+])
-
- AC_DEFUN([APU_CHECK_DB], [
- requested=$1
-@@ -681,6 +700,12 @@
- AC_MSG_ERROR(Berkeley db5 not found)
- fi
- ;;
-+ db52)
-+ APU_CHECK_DB52("$check_places")
-+ if test "$apu_db_version" != "5"; then
-+ AC_MSG_ERROR(Berkeley db5 not found)
-+ fi
-+ ;;
- default)
- APU_CHECK_DB_ALL("$check_places")
- ;;
-@@ -688,40 +713,43 @@
- ])
-
- dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.2 to 1.
- dnl
- AC_DEFUN([APU_CHECK_DB_ALL], [
- all_places=$1
-
-- APU_CHECK_DB51("$all_places")
-+ APU_CHECK_DB52("$all_places")
- if test "$apu_db_version" != "5"; then
-- APU_CHECK_DB50("$all_places")
-+ APU_CHECK_DB51("$all_places")
- if test "$apu_db_version" != "5"; then
-- APU_CHECK_DB48("$all_places")
-- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB47("$all_places")
-+ APU_CHECK_DB50("$all_places")
-+ if test "$apu_db_version" != "5"; then
-+ APU_CHECK_DB48("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB46("$all_places")
-+ APU_CHECK_DB47("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB45("$all_places")
-+ APU_CHECK_DB46("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB44("$all_places")
-+ APU_CHECK_DB45("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB43("$all_places")
-+ APU_CHECK_DB44("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB42("$all_places")
-+ APU_CHECK_DB43("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB41("$all_places")
-+ APU_CHECK_DB42("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB4("$all_places")
-+ APU_CHECK_DB41("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB3("$all_places")
-- if test "$apu_db_version" != "3"; then
-- APU_CHECK_DB2("$all_places")
-- if test "$apu_db_version" != "2"; then
-- APU_CHECK_DB1("$all_places")
-- if test "$apu_db_version" != "1"; then
-- APU_CHECK_DB185("$all_places")
-+ APU_CHECK_DB4("$all_places")
-+ if test "$apu_db_version" != "4"; then
-+ APU_CHECK_DB3("$all_places")
-+ if test "$apu_db_version" != "3"; then
-+ APU_CHECK_DB2("$all_places")
-+ if test "$apu_db_version" != "2"; then
-+ APU_CHECK_DB1("$all_places")
-+ if test "$apu_db_version" != "1"; then
-+ APU_CHECK_DB185("$all_places")
-+ fi
- fi
- fi
- fi
-@@ -763,11 +791,11 @@
- apu_db_version=0
-
- AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
-- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])],
-+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51,db52}])],
- [
- if test "$withval" = "yes"; then
- AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
-- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51])
-+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52])
- fi
- requested="$withval"
- ], [
-@@ -978,6 +1006,10 @@
- apu_use_db=1
- apu_default_dbm=db5
- ;;
-+ db52)
-+ apu_use_db=1
-+ apu_default_dbm=db5
-+ ;;
- default)
- dnl ### use more sophisticated DBMs for the default?
- apu_default_dbm="sdbm (default)"
-@@ -985,7 +1017,7 @@
- ;;
- *)
- AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
-- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51])
-+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52])
- ;;
- esac
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/
@ 2017-09-02 14:27 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2017-09-02 14:27 UTC (permalink / raw
To: gentoo-commits
commit: bacd55e3fd6e6760287a20d89d73e3ecbc0bb857
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 29 08:59:09 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 14:27:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacd55e3
dev-libs/apr-util: remove unused patch
.../apr-util/files/apr-util-1.5.3-berkdb6.patch | 69 ----------------------
1 file changed, 69 deletions(-)
diff --git a/dev-libs/apr-util/files/apr-util-1.5.3-berkdb6.patch b/dev-libs/apr-util/files/apr-util-1.5.3-berkdb6.patch
deleted file mode 100644
index a3f4a3c9b19..00000000000
--- a/dev-libs/apr-util/files/apr-util-1.5.3-berkdb6.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-http://svn.apache.org/viewvc/apr/apr/trunk/build/dbm.m4?r1=1495889&r2=1544846&diff_format=h
-
---- apr/apr/trunk/build/dbm.m4 2013/06/23 20:27:54 1495889
-+++ apr/apr/trunk/build/dbm.m4 2013/11/23 17:57:39 1544846
-@@ -112,7 +112,7 @@
- changequote([,])
- unset $cache_id
- AC_CHECK_HEADER([$bdb_header], [
-- if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then
-+ if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6"; then
- # We generate a separate cache variable for each prefix and libname
- # we search under. That way, we avoid caching information that
- # changes if the user runs `configure' with a different set of
-@@ -455,13 +455,13 @@
- ])
-
- dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.X to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 6.X to 1.
- dnl
- AC_DEFUN([APU_CHECK_DB_ALL], [
- all_places=$1
-
-- # Start version search at version 5.9
-- db_version=59
-+ # Start version search at version 6.9
-+ db_version=69
- while [[ $db_version -ge 40 ]]
- do
- db_major=`echo $db_version | sed -e 's/.$//'`
-@@ -511,19 +511,34 @@
- apu_db_version=0
-
- # Maximum supported version announced in help string.
-- # Although we search for all versions up to 5.9,
-+ # Although we search for all versions up to 6.9,
- # we should only include existing versions in our
- # help string.
-- db_max_version=53
-- db_min_version=41
- dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4"
-+ db_max_version=48
-+ db_min_version=41
-+ db_version="$db_min_version"
-+ while [[ $db_version -le $db_max_version ]]
-+ do
-+ dbm_list="$dbm_list, db$db_version"
-+ db_version=`expr $db_version + 1`
-+ done
-+ db_max_version=53
-+ db_min_version=50
-+ db_version="$db_min_version"
-+ while [[ $db_version -le $db_max_version ]]
-+ do
-+ dbm_list="$dbm_list, db$db_version"
-+ db_version=`expr $db_version + 1`
-+ done
-+ db_max_version=60
-+ db_min_version=60
- db_version="$db_min_version"
- while [[ $db_version -le $db_max_version ]]
- do
- dbm_list="$dbm_list, db$db_version"
- db_version=`expr $db_version + 1`
- done
-- dbm_list="$dbm_list, db60"
-
- AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X} for some X=0,...,9])],
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/
@ 2020-07-27 10:46 Thomas Deutschmann
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2020-07-27 10:46 UTC (permalink / raw
To: gentoo-commits
commit: 0a2bddbf014ae3b7bfa42203066f14f04fbe5ede
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 10:45:54 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 10:46:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2bddbf
dev-libs/apr-util: improve my_bool patch
Closes: https://bugs.gentoo.org/734020
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
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 6cd875bcde8..48816555a21 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,17 +1,13 @@
-Description: Reintroduce my_bool to fix build with MySQL 8
-Author: Robie Basak <robie.basak@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1863026
-Forwarded: no
-Last-Update: 2020-02-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/dbd/apr_dbd_mysql.c
+++ b/dbd/apr_dbd_mysql.c
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,10 @@
#endif
#endif
#include <mysql.h>
++#ifndef HAVE_TYPE_MY_BOOL
++#include <stdbool.h>
+typedef bool my_bool;
++#endif
#include <errmsg.h>
#endif
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/
@ 2023-03-20 5:36 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-03-20 5:36 UTC (permalink / raw
To: gentoo-commits
commit: fcf8c8b1a3b361a0e5ddfa887c6fc02d2558a753
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 19 10:43:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 05:32:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcf8c8b1
dev-libs/apr-util: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30230
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../apr-util-1.6.1-fix-gdbm-error-handling.patch | 79 --------------
.../files/apr-util-1.6.1-mariadb-support.patch | 116 ---------------------
2 files changed, 195 deletions(-)
diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch b/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch
deleted file mode 100644
index 92a4738e66a5..000000000000
--- a/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=889170
-# needs to be submitted upstream
---- apr-util.orig/dbm/apr_dbm_gdbm.c
-+++ apr-util/dbm/apr_dbm_gdbm.c
-@@ -36,13 +36,22 @@
- static apr_status_t g2s(int gerr)
- {
- if (gerr == -1) {
-- /* ### need to fix this */
-- return APR_EGENERAL;
-+ return APR_OS_START_USEERR + gdbm_errno;
- }
-
- return APR_SUCCESS;
- }
-
-+static apr_status_t gdat2s(datum d)
-+{
-+ if (d.dptr == NULL) {
-+ return APR_OS_START_USEERR + gdbm_errno;
-+ }
-+
-+ return APR_SUCCESS;
-+}
-+
-+
- static apr_status_t datum_cleanup(void *dptr)
- {
- if (dptr)
-@@ -55,19 +64,15 @@ static apr_status_t set_error(apr_dbm_t
- {
- apr_status_t rv = APR_SUCCESS;
-
-- /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */
--
-- if ((dbm->errcode = gdbm_errno) == GDBM_NO_ERROR) {
-+ if (dbm_said == APR_SUCCESS) {
-+ dbm->errcode = GDBM_NO_ERROR;
- dbm->errmsg = NULL;
- }
- else {
-+ dbm->errcode = dbm_said;
- dbm->errmsg = gdbm_strerror(gdbm_errno);
-- rv = APR_EGENERAL; /* ### need something better */
- }
-
-- /* captured it. clear it now. */
-- gdbm_errno = GDBM_NO_ERROR;
--
- return rv;
- }
-
-@@ -144,7 +149,7 @@ static apr_status_t vt_gdbm_fetch(apr_db
-
- /* store the error info into DBM, and return a status code. Also, note
- that *pvalue should have been cleared on error. */
-- return set_error(dbm, APR_SUCCESS);
-+ return set_error(dbm, gdat2s(rd));
- }
-
- static apr_status_t vt_gdbm_store(apr_dbm_t *dbm, apr_datum_t key,
-@@ -203,7 +208,7 @@ static apr_status_t vt_gdbm_firstkey(apr
- apr_pool_cleanup_null);
-
- /* store any error info into DBM, and return a status code. */
-- return set_error(dbm, APR_SUCCESS);
-+ return set_error(dbm, gdat2s(rd));
- }
-
- static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
-@@ -223,7 +228,7 @@ static apr_status_t vt_gdbm_nextkey(apr_
- apr_pool_cleanup_null);
-
- /* store any error info into DBM, and return a status code. */
-- return set_error(dbm, APR_SUCCESS);
-+ return set_error(dbm, gdat2s(rd));
- }
-
- static void vt_gdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data)
diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch b/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch
deleted file mode 100644
index 137e99f97637..000000000000
--- a/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Backport of http://svn.apache.org/viewvc?rev=1872060&view=rev
-
---- a/build/dbd.m4
-+++ b/build/dbd.m4
-@@ -163,10 +163,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
- old_cppflags="$CPPFLAGS"
- old_ldflags="$LDFLAGS"
-
-+ my_library="mysqlclient"
-+
- AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]),
- [
- if test "$withval" = "yes"; then
- AC_PATH_PROG([MYSQL_CONFIG],[mysql_config])
-+ if test "x$MYSQL_CONFIG" = "x"; then
-+ AC_PATH_TOOL([MYSQL_CONFIG],[mariadb_config])
-+ fi
- if test "x$MYSQL_CONFIG" != 'x'; then
- mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
- mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
-@@ -174,29 +179,37 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
-
- APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
- APR_ADDTO(LIBS, [$mysql_LIBS])
-+
-+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then
-+ my_library="mariadb"
-+ fi
- fi
-
-- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
-- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
-- [apu_have_mysql=0; break],
-- [#include <my_global.h>])
-- if test "$apu_have_mysql" = "0"; then
-- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
-- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
-- [apu_have_mysql=0; break],
-- [#include <mysql/my_global.h>])
-+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
-+ if test "$apr_have_mysql" = "0"; then
-+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
- fi
-- if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
-+ if test "$apr_have_mysql" = "1"; then
-+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
-+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
-+ fi
-+ if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
- fi
- elif test "$withval" = "no"; then
- :
- else
- AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin])
-+ if test "x$MYSQL_CONFIG" = "x"; then
-+ AC_PATH_TOOL([MYSQL_CONFIG],[mariadb_config],,[$withval/bin])
-+ fi
- if test "x$MYSQL_CONFIG" != 'x'; then
- mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
- mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
- mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
-+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then
-+ my_library="mariadb"
-+ fi
- else
- mysql_CPPFLAGS="-I$withval/include"
- mysql_LDFLAGS="-L$withval/lib "
-@@ -207,18 +220,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
- APR_ADDTO(LIBS, [$mysql_LIBS])
-
- AC_MSG_NOTICE(checking for mysql in $withval)
-- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
-- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
-- [apu_have_mysql=0; break],
-- [#include <my_global.h>])
--
-- if test "$apu_have_mysql" != "1"; then
-- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
-- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
-- [apu_have_mysql=0; break],
-- [#include <mysql/my_global.h>])
-+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
-+ if test "$apr_have_mysql" = "0"; then
-+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
-+ fi
-+ if test "$apr_have_mysql" = "1"; then
-+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
-+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
- fi
-- if test "$apu_have_mysql" != "0"; then
-+ if test "$apu_have_mysql" = "1"; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
- fi
- fi
-@@ -229,7 +239,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
- dnl Since we have already done the AC_CHECK_LIB tests, if we have it,
- dnl we know the library is there.
- if test "$apu_have_mysql" = "1"; then
-- APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS])
-+ APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS])
- fi
- AC_SUBST(LDADD_dbd_mysql)
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@ 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 */
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-20 5:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-20 5:36 [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-07-27 10:46 Thomas Deutschmann
2017-09-02 14:27 Michael Palimaka
2016-09-04 15:30 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox