diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-02 19:20:15 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-02 19:20:15 +0000 |
| commit | 2bee8fe23a437439923f35cde08e62a1096426d3 (patch) | |
| tree | 0c4b7d6e979acc3e2e1d9af6c97daae5d4d65113 /patches | |
| parent | 90f8b2d729ec6ea62a85f7367a86685aa51f5801 (diff) | |
| download | midipix_build-2bee8fe23a437439923f35cde08e62a1096426d3.tar.bz2 midipix_build-2bee8fe23a437439923f35cde08e62a1096426d3.tar.xz | |
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.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/apr-util-1.5.4.local.patch | 45 |
1 files changed, 45 insertions, 0 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) > $@ |