summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2017-02-13 09:59:05 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2017-02-13 09:59:05 +0000
commitd5f7baf67485e4e9af56551503f5daa18ba3f5c3 (patch)
treef32211c10e987bb56398ecba76428f1a688fdcd4
parent557c73899991c3ba1b79662f8666c177ecd89683 (diff)
downloadmidipix_build-d5f7baf67485e4e9af56551503f5daa18ba3f5c3.tar.bz2
midipix_build-d5f7baf67485e4e9af56551503f5daa18ba3f5c3.tar.xz
patches/apr-1.5.2.local.patch: skip @installbuilddir@.
-rw-r--r--patches/apr-1.5.2.local.patch55
1 files changed, 39 insertions, 16 deletions
diff --git a/patches/apr-1.5.2.local.patch b/patches/apr-1.5.2.local.patch
index 073e0628..e96002f5 100644
--- a/patches/apr-1.5.2.local.patch
+++ b/patches/apr-1.5.2.local.patch
@@ -25,9 +25,20 @@ diff -ru --new-file apr-1.5.2.orig/include/private/apr_escape_test_char.h apr-1.
+ 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
+ 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
+};
-diff -ru --new-file apr-1.5.2.orig/Makefile.in apr-1.5.2/Makefile.in
---- apr-1.5.2.orig/Makefile.in 2014-04-25 12:51:11.000000000 +0200
-+++ apr-1.5.2/Makefile.in 2017-01-26 04:51:55.981668783 +0100
+diff -ru apr-1.5.2.orig/network_io/unix/sendrecv.c apr-1.5.2/network_io/unix/sendrecv.c
+--- apr-1.5.2.orig/network_io/unix/sendrecv.c 2013-10-21 13:57:36.000000000 +0200
++++ apr-1.5.2/network_io/unix/sendrecv.c 2017-02-02 00:52:39.903022000 +0100
+@@ -252,7 +252,7 @@
+ /* Define a structure to pass in when we have a NULL header value */
+ static apr_hdtr_t no_hdtr;
+
+-#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
++#if (defined(__linux__) || defined(__GNU__)) || defined(__midipix__) && defined(HAVE_WRITEV)
+
+ apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
+ apr_hdtr_t *hdtr, apr_off_t *offset,
+--- apr-1.5.2/Makefile.in.orig 2014-04-25 10:51:11.000000000 +0000
++++ apr-1.5.2/Makefile.in 2017-02-13 09:58:16.230193677 +0000
@@ -46,8 +46,7 @@
CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
@@ -38,7 +49,31 @@ diff -ru --new-file apr-1.5.2.orig/Makefile.in apr-1.5.2/Makefile.in
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
-@@ -129,18 +128,6 @@
+@@ -74,7 +73,7 @@
+ sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
+
+ install: $(TARGETS)
+- $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
++ $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
+ $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
+ $(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
+ for f in $(top_srcdir)/include/apr_*.h; do \
+@@ -83,14 +82,6 @@
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
+ $(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
+ $(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
+- for f in libtool shlibtool; do \
+- if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \
+- done
+- $(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
+- for f in make_exports.awk make_var_export.awk; do \
+- $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
+- done
+- $(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
+ $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
+ @if [ $(INSTALL_SUBDIRS) != "none" ]; then \
+ for i in $(INSTALL_SUBDIRS); do \
+@@ -129,18 +120,6 @@
etags:
etags `find . -name '*.[ch]'`
@@ -57,15 +92,3 @@ diff -ru --new-file apr-1.5.2.orig/Makefile.in apr-1.5.2/Makefile.in
LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
-diff -ru apr-1.5.2.orig/network_io/unix/sendrecv.c apr-1.5.2/network_io/unix/sendrecv.c
---- apr-1.5.2.orig/network_io/unix/sendrecv.c 2013-10-21 13:57:36.000000000 +0200
-+++ apr-1.5.2/network_io/unix/sendrecv.c 2017-02-02 00:52:39.903022000 +0100
-@@ -252,7 +252,7 @@
- /* Define a structure to pass in when we have a NULL header value */
- static apr_hdtr_t no_hdtr;
-
--#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
-+#if (defined(__linux__) || defined(__GNU__)) || defined(__midipix__) && defined(HAVE_WRITEV)
-
- apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
- apr_hdtr_t *hdtr, apr_off_t *offset,