patches/apr-1.6.2.local.patch: skip installing {apr_common,find_apr}.m4 to ${PREFIX_NATIVE}/build-1/.

1 files changed, 46 insertions, 44 deletions

diff --git a/patches/apr-1.6.2.local.patch b/patches/apr-1.6.2.local.patch
index 472dbc45..c4c0ec6e 100644
--- a/patches/apr-1.6.2.local.patch
+++ b/patches/apr-1.6.2.local.patch
@@ -1,5 +1,44 @@
+--- apr-1.6.2/network_io/unix/sendrecv.c.orig	2013-10-21 13:57:36.000000000 +0200
++++ apr-1.6.2/network_io/unix/sendrecv.c	2017-08-03 16:18:08.681830961 +0200
+@@ -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.6.2/include/private/apr_escape_test_char.h.orig	2017-08-03 16:23:34.315833536 +0200
++++ apr-1.6.2/include/private/apr_escape_test_char.h	2017-08-03 16:26:23.512610809 +0200
+@@ -0,0 +1,25 @@
++/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
++#define T_ESCAPE_SHELL_CMD     (1)
++#define T_ESCAPE_PATH_SEGMENT  (2)
++#define T_OS_ESCAPE_PATH       (4)
++#define T_ESCAPE_ECHO          (8)
++#define T_ESCAPE_URLENCODED    (16)
++#define T_ESCAPE_XML           (32)
++#define T_ESCAPE_LDAP_DN       (64)
++#define T_ESCAPE_LDAP_FILTER   (128)
++
++static const unsigned char test_char_table[256] = {
++    224,222,222,222,222,222,222,222,222,222,223,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,6,16,127,22,17,22,49,17,
++    145,145,129,80,80,0,0,18,0,0,0,0,0,0,0,0,0,0,16,87,
++    119,16,119,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++    0,0,0,0,0,0,0,0,0,0,0,23,223,23,23,0,23,0,0,0,
++    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++    0,0,0,23,23,23,17,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
++    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222 
++};
 --- apr-1.6.2/Makefile.in.orig	2017-05-31 17:04:18.000000000 +0200
-+++ apr-1.6.2/Makefile.in	2017-08-03 16:20:20.174740106 +0200
++++ apr-1.6.2/Makefile.in	2017-10-17 15:50:46.869583816 +0200
 @@ -46,8 +46,7 @@
  
  CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
@@ -19,7 +58,7 @@
  		     $(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 @@
+@@ -83,16 +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)
@@ -31,10 +70,12 @@
 -	    $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
 -	done
 -	$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
- 	$(INSTALL_DATA) $(top_srcdir)/build/apr_common.m4 $(DESTDIR)$(installbuilddir)
- 	$(INSTALL_DATA) $(top_srcdir)/build/find_apr.m4 $(DESTDIR)$(installbuilddir)
+-	$(INSTALL_DATA) $(top_srcdir)/build/apr_common.m4 $(DESTDIR)$(installbuilddir)
+-	$(INSTALL_DATA) $(top_srcdir)/build/find_apr.m4 $(DESTDIR)$(installbuilddir)
  	$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
-@@ -131,18 +122,6 @@
+ 	@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
+             for i in $(INSTALL_SUBDIRS); do \
+@@ -131,18 +120,6 @@
  etags:
  	etags `find . -name '*.[ch]'`
  
@@ -53,42 +94,3 @@
  LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
  	    @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
  
---- apr-1.6.2/network_io/unix/sendrecv.c.orig	2013-10-21 13:57:36.000000000 +0200
-+++ apr-1.6.2/network_io/unix/sendrecv.c	2017-08-03 16:18:08.681830961 +0200
-@@ -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.6.2/include/private/apr_escape_test_char.h.orig	2017-08-03 16:23:34.315833536 +0200
-+++ apr-1.6.2/include/private/apr_escape_test_char.h	2017-08-03 16:26:23.512610809 +0200
-@@ -0,0 +1,25 @@
-+/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
-+#define T_ESCAPE_SHELL_CMD     (1)
-+#define T_ESCAPE_PATH_SEGMENT  (2)
-+#define T_OS_ESCAPE_PATH       (4)
-+#define T_ESCAPE_ECHO          (8)
-+#define T_ESCAPE_URLENCODED    (16)
-+#define T_ESCAPE_XML           (32)
-+#define T_ESCAPE_LDAP_DN       (64)
-+#define T_ESCAPE_LDAP_FILTER   (128)
-+
-+static const unsigned char test_char_table[256] = {
-+    224,222,222,222,222,222,222,222,222,222,223,222,222,222,222,222,222,222,222,222,
-+    222,222,222,222,222,222,222,222,222,222,222,222,6,16,127,22,17,22,49,17,
-+    145,145,129,80,80,0,0,18,0,0,0,0,0,0,0,0,0,0,16,87,
-+    119,16,119,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,23,223,23,23,0,23,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,23,23,23,17,222,222,222,222,222,222,222,222,222,222,222,222,222,
-+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
-+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
-+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
-+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
-+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
-+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222 
-+};