mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
apr-util: sync with master
This is a squash of the following cherry-picked commits:27c472393603124bf4b4141bd5531640c7e952101d25dcde24ea5b746e58a62c0e599ba16b294805c24f5d258bf6c218e74dShort summary: - adds external modules (crypto-openssl dbd-mysql dbd-odbc dbd-pgsql dbd-sqlite3 dbm-gdbm ldap) - Makefile and patches are updated and cleaned - adds myself as maintainer - improves the cross-compile setup (via configure variables sed scripts) For more details please check the individual commits provided above. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
From: Ryan Niebur <ryanryan52@gmail.com>
|
||||
Subject: by default --avoid-ldap since apache2 is the only user, and we don't
|
||||
want to add extra dependencies to other apr-utils rdepends
|
||||
|
||||
--- a/apu-config.in
|
||||
+++ b/apu-config.in
|
||||
@@ -30,7 +30,8 @@ includedir="@includedir@"
|
||||
LIBS="@APRUTIL_EXPORT_LIBS@"
|
||||
INCLUDES="@APRUTIL_INCLUDES@"
|
||||
LDFLAGS="@APRUTIL_LDFLAGS@"
|
||||
-LDAP_LIBS="@LDADD_ldap@"
|
||||
+ORIG_LDAP_LIBS="@LDADD_ldap@"
|
||||
+LDAP_LIBS=""
|
||||
DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
|
||||
|
||||
APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
|
||||
@@ -55,7 +56,7 @@ Known values for OPTION are:
|
||||
--includedir print location where headers are installed
|
||||
--ldflags print linker flags
|
||||
--libs print library information
|
||||
- --avoid-ldap do not include ldap library information with --libs
|
||||
+ --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
|
||||
@@ -121,7 +122,7 @@ while test $# -gt 0; do
|
||||
flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
|
||||
;;
|
||||
--ldap-libs)
|
||||
- flags="$flags $LDAP_LIBS"
|
||||
+ flags="$flags $ORIG_LDAP_LIBS"
|
||||
;;
|
||||
--dbm-libs)
|
||||
flags="$flags $DBM_LIBS"
|
||||
Reference in New Issue
Block a user