mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-14 03:13:54 +02:00
ea5b746e58
004-avoid_ldap_by_defaut.patch: By default use --avoid-ldap since apache2 is the only user, and we don't want to add extra dependencies to other apr-utils rdepends. Patch from Ryan Niebur <ryanryan52@gmail.com>, copied from Debian. 005-apu_config_dont_list_indep_libs.patch: Prevent recursive linking of dependent libraries by apr-util users. Patch from Peter Samuelson <peter@p12n.org>, also copied from Debian. Makes libexpat and libiconv private. 006-avoid_db_by-default.patch: Make apu-config not output dbm libs by default. See Debian #622081. Patch from Stefan Fritsch <sf@debian.org>, also copied from Debian While bumping the revision also correct license information. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From: Stefan Fritsch <sf@debian.org>
|
|
Subject: Make apu-config not output dbm libs by default. See #622081
|
|
|
|
--- a/apu-config.in
|
|
+++ b/apu-config.in
|
|
@@ -32,7 +32,8 @@ INCLUDES="@APRUTIL_INCLUDES@"
|
|
LDFLAGS="@APRUTIL_LDFLAGS@"
|
|
ORIG_LDAP_LIBS="@LDADD_ldap@"
|
|
LDAP_LIBS=""
|
|
-DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
|
|
+ORIG_DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
|
|
+DBM_LIBS=""
|
|
|
|
APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
|
|
|
|
@@ -58,8 +59,8 @@ Known values for OPTION are:
|
|
--libs print library information
|
|
--avoid-ldap do not include ldap library information with --libs (default on OpenWrt)
|
|
--ldap-libs print library information to link with ldap
|
|
- --avoid-dbm do not include DBM library information with --libs
|
|
- --dbm-libs print additional library information to link with DBM
|
|
+ --avoid-dbm do not include DBM library information with --libs (default on OpenWrt)
|
|
+ --dbm-libs print library information to link with DBM
|
|
--srcdir print APR-util source directory
|
|
--link-ld print link switch(es) for linking to APR-util
|
|
--link-libtool print the libtool inputs for linking to APR-util
|
|
@@ -125,7 +126,7 @@ while test $# -gt 0; do
|
|
flags="$flags $ORIG_LDAP_LIBS"
|
|
;;
|
|
--dbm-libs)
|
|
- flags="$flags $DBM_LIBS"
|
|
+ flags="$flags $ORIG_DBM_LIBS"
|
|
;;
|
|
--includedir)
|
|
if test "$location" = "installed"; then
|