* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/, dev-libs/apr-util/files/
@ 2020-07-26 2:41 Thomas Deutschmann
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2020-07-26 2:41 UTC (permalink / raw
To: gentoo-commits
commit: a64869237c80ac96494ed4557d581bd416e7ce38
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 02:41:11 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 02:41:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6486923
dev-libs/apr-util: fix building against >=dev-db/mysql-connector-c-8.0
Closes: https://bugs.gentoo.org/709650
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
...il-1.6.1-r3.ebuild => apr-util-1.6.1-r4.ebuild} | 2 +
.../files/apr-util-1.6.1-mariadb-support.patch | 116 +++++++++++++++++++++
.../apr-util/files/apr-util-1.6.1-my_boold.patch | 17 +++
3 files changed, 135 insertions(+)
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r4.ebuild
similarity index 97%
rename from dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
rename to dev-libs/apr-util/apr-util-1.6.1-r4.ebuild
index 077552fa61f..e73f88b5cf6 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r4.ebuild
@@ -49,6 +49,8 @@ DOCS=(CHANGES NOTICE README)
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
)
src_prepare() {
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
new file mode 100644
index 00000000000..137e99f9763
--- /dev/null
+++ b/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch
@@ -0,0 +1,116 @@
+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 */
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_boold.patch
new file mode 100644
index 00000000000..6cd875bcde8
--- /dev/null
+++ b/dev-libs/apr-util/files/apr-util-1.6.1-my_boold.patch
@@ -0,0 +1,17 @@
+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 @@
+ #endif
+ #endif
+ #include <mysql.h>
++typedef bool my_bool;
+ #include <errmsg.h>
+ #endif
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/, dev-libs/apr-util/files/
@ 2020-07-27 10:30 Thomas Deutschmann
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2020-07-27 10:30 UTC (permalink / raw
To: gentoo-commits
commit: b5c797685526e3f4f99ae9a4384ec2a0bc385702
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 10:28:31 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 10:29:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c79768
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 <AT> gentoo.org>
...{apr-util-1.6.1-r4.ebuild => apr-util-1.6.1-r5.ebuild} | 5 +++--
dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch | 15 +++++++++++++++
...-1.6.1-my_boold.patch => apr-util-1.6.1-my_bool.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
similarity index 96%
rename from dev-libs/apr-util/apr-util-1.6.1-r4.ebuild
rename to dev-libs/apr-util/apr-util-1.6.1-r5.ebuild
index e73f88b5cf6..a30d4b805b2 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 00000000000..741ca65ca32
--- /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
similarity index 100%
rename from dev-libs/apr-util/files/apr-util-1.6.1-my_boold.patch
rename to dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/, dev-libs/apr-util/files/
@ 2020-07-27 22:08 Thomas Deutschmann
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2020-07-27 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 5a8c2df53d8abbe67ae89546075dcd31b65b61f9
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 22:08:19 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 22:08:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8c2df5
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 <AT> gentoo.org>
.../{apr-util-1.6.1-r5.ebuild => apr-util-1.6.1-r6.ebuild} | 0
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
similarity index 100%
rename from dev-libs/apr-util/apr-util-1.6.1-r5.ebuild
rename to 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 48816555a21..eda0cd04128 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,12 +1,14 @@
--- 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/, dev-libs/apr-util/files/
@ 2023-02-13 7:04 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-02-13 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 75b2b9521e8558b0f0d15332839bbdb0e0406c23
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 06:47:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 06:54:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b2b952
dev-libs/apr-util: add 1.6.3
Bug: https://bugs.gentoo.org/811765
Bug: https://bugs.gentoo.org/870004
Bug: https://bugs.gentoo.org/893406
Closes: https://bugs.gentoo.org/875167
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/apr-util/Manifest | 1 +
dev-libs/apr-util/apr-util-1.6.3.ebuild | 147 +++++++++++++++++++++
.../files/apr-util-1.6.3-fix-pkgconfig-libs.patch | 29 ++++
3 files changed, 177 insertions(+)
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 3759f954dca7..5f545419d548 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1 +1,2 @@
DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
+DIST apr-util-1.6.3.tar.bz2 432692 BLAKE2B 5eb56c45ba9d87ff3e3769439a3a9a858a1947de68b34892c729f39736fc41117a41c630c3c4cfb07b444c4ee0d5853ec5be158e8fa0b0c0ab89f0cb51cc9c6d SHA512 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe
diff --git a/dev-libs/apr-util/apr-util-1.6.3.ebuild b/dev-libs/apr-util/apr-util-1.6.3.ebuild
new file mode 100644
index 000000000000..6a870a60553b
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.6.3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
+# APR_PV="${PV}"
+APR_PV="1.7.2"
+
+inherit autotools db-use multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Utility Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
+
+RDEPEND="
+ >=dev-libs/apr-${APR_PV}:1=
+ dev-libs/expat
+ virtual/libcrypt:=
+ berkdb? ( >=sys-libs/db-4:= )
+ gdbm? ( sys-libs/gdbm:= )
+ ldap? ( net-nds/openldap:= )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ >=dev-db/mysql-connector-c-8
+ )
+ )
+ nss? ( dev-libs/nss )
+ odbc? ( dev-db/unixODBC )
+ openssl? ( dev-libs/openssl:= )
+ postgres? ( dev-db/postgresql:= )
+ sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-devel/libtool-2.4.2
+ doc? ( app-doc/doxygen )
+"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.3-sysroot.patch # bug #385775
+ "${FILESDIR}"/${PN}-1.6.1-libtool.patch # bug #779487
+ "${FILESDIR}"/${PN}-1.6.1-my_bool.patch
+ "${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch
+ "${FILESDIR}"/${PN}-1.6.3-fix-pkgconfig-libs.patch
+)
+
+src_prepare() {
+ default
+
+ # Fix usage of libmysqlclient (bug #620230)
+ grep -lrF "libmysqlclient_r" "${S}" \
+ | xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
+ || die
+
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --datadir="${EPREFIX}"/usr/share/apr-util-1
+ --with-apr="${ESYSROOT}"/usr
+ --with-expat="${EPREFIX}"/usr
+ --without-sqlite2
+ $(use_with gdbm)
+ $(use_with ldap)
+ $(use_with mysql)
+ $(use_with nss)
+ $(use_with odbc)
+ $(use_with openssl)
+ $(use_with postgres pgsql)
+ $(use_with sqlite sqlite3)
+ )
+
+ tc-is-static-only && myconf+=( --disable-util-dso )
+
+ if use berkdb; then
+ local db_version
+ db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
+ db_version="$(db_ver_to_slot "${db_version}")"
+ db_version="${db_version/\./}"
+ myconf+=(
+ --with-dbm=db${db_version}
+ # We use ${T} for the libdir because otherwise it'd simply be the normal
+ # system libdir. That's pointless as the compiler will search it for
+ # us already. This makes cross-compiling and such easier.
+ --with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
+ )
+ else
+ myconf+=( --without-berkeley-db )
+ fi
+
+ if use nss || use openssl ; then
+ # bug #518708
+ myconf+=( --with-crypto )
+ fi
+
+ econf "${myconf[@]}"
+
+ # Use the current env build settings rather than whatever apr was built with.
+ sed -i -r \
+ -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
+ -e "/^CC=/s:=.*:=$(tc-getCC):" \
+ -e '/^(C|CPP|CXX|LD)FLAGS=/d' \
+ -e '/^LTFLAGS/s:--silent::' \
+ build/rules.mk || die
+}
+
+src_compile() {
+ emake all $(usev doc dox)
+}
+
+src_test() {
+ # Building tests in parallel is broken
+ emake -j1 check
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name "*.la" -delete || die
+ if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
+ find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
+ fi
+
+ if ! use static-libs ; then
+ find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
+ fi
+
+ if use doc ; then
+ docinto html
+ dodoc -r docs/dox/html/*
+ fi
+
+ # This file is only used on AIX systems, which Gentoo is not,
+ # and causes collisions between the SLOTs, so remove it.
+ rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die
+}
diff --git a/dev-libs/apr-util/files/apr-util-1.6.3-fix-pkgconfig-libs.patch b/dev-libs/apr-util/files/apr-util-1.6.3-fix-pkgconfig-libs.patch
new file mode 100644
index 000000000000..06c8e5d2eb07
--- /dev/null
+++ b/dev-libs/apr-util/files/apr-util-1.6.3-fix-pkgconfig-libs.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/811765
+https://sources.debian.org/patches/apr-util/1.6.3-1/apu_config_dont_list_indep_libs.patch/
+
+From: Peter Samuelson <peter@p12n.org>
+Subject: Prevent recursive linking of dependent libraries by apr-util users.
+
+--- a/apr-util.pc.in
++++ b/apr-util.pc.in
+@@ -8,6 +8,7 @@ Name: APR Utils
+ Description: Companion library for APR
+ Version: @APRUTIL_DOTTED_VERSION@
+ # assume that apr-util requires libapr of same major version
+-Requires: apr-@APRUTIL_MAJOR_VERSION@
+-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@
++Requires.private: apr-@APRUTIL_MAJOR_VERSION@
++Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@
++Libs.private: @APRUTIL_EXPORT_LIBS@
+ Cflags: -I${includedir}
+--- a/apu-config.in
++++ b/apu-config.in
+@@ -27,7 +27,7 @@ bindir="@bindir@"
+ libdir="@libdir@"
+ includedir="${SYSROOT}@includedir@"
+
+-LIBS="@APRUTIL_EXPORT_LIBS@"
++LIBS=
+ INCLUDES="@APRUTIL_INCLUDES@"
+ LDFLAGS="@APRUTIL_LDFLAGS@"
+ LDAP_LIBS="@LDADD_ldap@"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/, dev-libs/apr-util/files/
@ 2023-12-01 12:26 Hans de Graaff
0 siblings, 0 replies; 5+ messages in thread
From: Hans de Graaff @ 2023-12-01 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 132cdde44707185d0aa87107e6e8904803d38b8b
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 1 12:25:31 2023 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri Dec 1 12:26:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132cdde4
dev-libs/apr-util: fix configure for strict C99 compilers
Closes: https://bugs.gentoo.org/918938
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
dev-libs/apr-util/apr-util-1.6.3.ebuild | 1 +
.../files/apr-util-1.6.3-configure-int.patch | 28 ++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/dev-libs/apr-util/apr-util-1.6.3.ebuild b/dev-libs/apr-util/apr-util-1.6.3.ebuild
index a89798ba780f..3645b9fdae6b 100644
--- a/dev-libs/apr-util/apr-util-1.6.3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.3.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.6.1-my_bool.patch
"${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch
"${FILESDIR}"/${PN}-1.6.3-fix-pkgconfig-libs.patch
+ "${FILESDIR}"/${PN}-1.6.3-configure-int.patch
)
src_prepare() {
diff --git a/dev-libs/apr-util/files/apr-util-1.6.3-configure-int.patch b/dev-libs/apr-util/files/apr-util-1.6.3-configure-int.patch
new file mode 100644
index 000000000000..fd394adbe309
--- /dev/null
+++ b/dev-libs/apr-util/files/apr-util-1.6.3-configure-int.patch
@@ -0,0 +1,28 @@
+commit 4286faefa6fe9ee83e30bacd4e4c498981ac92b7
+Author: jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>
+Date: Fri Feb 3 16:36:17 2023 +0000
+
+ Merge r1906347 from trunk:
+
+ Fix configure for compilers which don't accept implicit
+ int (no longer part of C since C99).
+
+ Submitted by: Florian Weimer <fweimer redhat.com>
+ PR: 66396
+
+
+ git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.6.x@1907246 13f79535-47bb-0310-9956-ffa450edef68
+
+diff --git a/build/dbm.m4 b/build/dbm.m4
+index 57bd131..e8c51b5 100644
+--- a/build/dbm.m4
++++ b/build/dbm.m4
+@@ -235,7 +235,7 @@ AC_DEFUN([APU_TRY_BERKELEY_DB],
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main (void)
+ {
+ int major, minor, patch;
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-01 12:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-01 12:26 [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/, dev-libs/apr-util/files/ Hans de Graaff
-- strict thread matches above, loose matches on Subject: below --
2023-02-13 7:04 Sam James
2020-07-27 22:08 Thomas Deutschmann
2020-07-27 10:30 Thomas Deutschmann
2020-07-26 2:41 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox