vars/build.vars: adds apr-util v1.5.4.

patches/apr-util-1.5.4.local.patch: force slibtool when installing/linking and force -lapr-1 when linking modules.

2 files changed, 54 insertions, 3 deletions

diff --git a/patches/apr-util-1.5.4.local.patch b/patches/apr-util-1.5.4.local.patch
new file mode 100644
index 00000000..b9fc8a12
--- /dev/null
+++ b/patches/apr-util-1.5.4.local.patch
@@ -0,0 +1,45 @@
+--- apr-util-1.5.4/configure.orig	2014-09-16 23:30:58.000000000 +0000
++++ apr-util-1.5.4/configure	2017-02-02 19:13:14.380272997 +0000
+@@ -20614,10 +20614,10 @@
+       if test "$apu_have_sqlite3" = "1"; then
+ 
+   if test "x$LDADD_dbd_sqlite3" = "x"; then
+-    test "x$silent" != "xyes" && echo "  setting LDADD_dbd_sqlite3 to \"$sqlite3_LDFLAGS -lsqlite3\""
+-    LDADD_dbd_sqlite3="$sqlite3_LDFLAGS -lsqlite3"
++    test "x$silent" != "xyes" && echo "  setting LDADD_dbd_sqlite3 to \"$sqlite3_LDFLAGS -lsqlite3 -lapr-1 -L/home/vxp/midipix/nt64/debug/tmp/apr-util-1.5.4/.libs -laprutil-1\""
++    LDADD_dbd_sqlite3="$sqlite3_LDFLAGS -lsqlite3 -lapr-1 -L/home/vxp/midipix/nt64/debug/tmp/apr-util-1.5.4/.libs -laprutil-1"
+   else
+-    apr_addto_bugger="$sqlite3_LDFLAGS -lsqlite3"
++    apr_addto_bugger="$sqlite3_LDFLAGS -lsqlite3 -lapr-1 -L/home/vxp/midipix/nt64/debug/tmp/apr-util-1.5.4/.libs -laprutil-1"
+     for i in $apr_addto_bugger; do
+       apr_addto_duplicate="0"
+       for j in $LDADD_dbd_sqlite3; do
+--- apr-util-1.5.4/Makefile.in.orig	2008-11-21 06:30:43.000000000 +0000
++++ apr-util-1.5.4/Makefile.in	2017-02-02 19:18:54.417141284 +0000
+@@ -23,7 +23,7 @@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+ APU_MODULES = @APU_MODULES@
+-LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
++LINK_MODULE = slibtool $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
+ APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
+ 
+ LT_VERSION = @APU_LTVERSION@
+@@ -85,7 +85,7 @@
+ 	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
+ 		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
+ 	done
+-	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
++	slibtool --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
+ 	$(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
+ 	$(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
+ 
+@@ -98,7 +98,7 @@
+ 
+ install-modules-yes: $(APU_MODULES)
+ 	$(APR_MKDIR) $(DESTDIR)$(APU_DSO_LIBDIR)
+-	@for m in $(APU_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APU_DSO_LIBDIR); done
++	@for m in $(APU_MODULES); do slibtool $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 756 $$m $(DESTDIR)$(APU_DSO_LIBDIR); done
+ 
+ exports.c: $(HEADERS)
+ 	$(APR_MKEXPORT) $(HEADERS) > $@
diff --git a/vars/build.vars b/vars/build.vars
index 0bd25f80..21c5625d 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -255,9 +255,9 @@ LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targe
 LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LIB_PACKAGES_PACKAGES_LEAVES="
-apr bzip2 curl expat libz libffi gdbm pcre glib gzip libarchive libatomic_ops libpipeline
-libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt libksba lua ncurses
-ncursestw ncursesw npth sqlite3 xz";
+apr apr_util bzip2 curl expat libz libffi gdbm pcre glib gzip libarchive libatomic_ops
+libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt libksba
+lua ncurses ncursestw ncursesw npth sqlite3 xz";
 LIB_PACKAGES_PACKAGES_X11="
 inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11
 libXext libICE libSM libXt libXmu renderproto Xrender libXpm libXaw libxkbfile";
@@ -271,6 +271,12 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_APR_SHA256SUM:=7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a};
 : ${PKG_APR_VERSION:=1.5.2};
 : ${PKG_APR_URL:=http://mirror.yannic-bonenberger.com/apache//apr/apr-${PKG_APR_VERSION}.tar.bz2};
+: ${PKG_APR_UTIL_SHA256SUM:=a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e};
+: ${PKG_APR_UTIL_VERSION:=1.5.4};
+: ${PKG_APR_UTIL_URL:=http://apache.lauf-forum.at//apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2};
+: ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${WORKDIR}/apr-${PKG_APR_VERSION}-native-${TARGET}"};
+: ${PKG_APR_UTIL_SUBDIR:=apr-util-1.5.4};
+: ${PKG_APR_UTIL_BUILD_DIR:=${PKG_APR_UTIL_SUBDIR}};
 : ${PKG_BZIP2_SHA256SUM:=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd};
 : ${PKG_BZIP2_VERSION:=1.0.6};
 : ${PKG_BZIP2_URL:=http://www.bzip.org/1.0.6/bzip2-${PKG_BZIP2_VERSION}.tar.gz};