apr-util: add configure vars

Adds configure variables for features that the compiler or the libc
supports and which cannot be detected by apr-util's configure script
when cross-compiling.

Also removes one call to INSTALL_DIR (no functional change here).

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
index cab11a585e54f028dcd24b879995280fd0a5b82c..c5cdb347a8000d259742a6ddc96a0b7718c7e1f2 100644 (file)
--- a/libs/apr-util/Makefile
+++ b/libs/apr-util/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apr-util
 PKG_VERSION:=1.6.1
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@APACHE/apr/
@@ -106,8 +106,14 @@ endif
 
 CONFIGURE_VARS += \
        ac_cv_path_ODBC_CONFIG= \
+       apu_cv_weak_symbols=yes \
        APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1"
 
+ifeq ($(CONFIG_USE_GLIBC)$(CONFIG_USE_MUSL),y)
+CONFIGURE_VARS += \
+       apu_cv_explicit_bzero=yes
+endif
+
 define Package/libaprutil/install/driver
        $(INSTALL_DIR) $(1)/usr/lib/apr-util-1
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/apr-util-1/apr_$(2)*.so \
@@ -135,10 +141,9 @@ endef
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 \
-                               $(1)/usr/lib/pkgconfig
+               $(1)/usr/lib/apr-util-1 $(1)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* $(1)/usr/include/apr-1
-       $(INSTALL_DIR) $(1)/usr/lib/apr-util-1
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/apr-util-1/apr_*.{a,so} \
                        $(1)/usr/lib/apr-util-1 2>/dev/null || :
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{a,so*} \