d5f7ba
patches/apr-1.5.2.local.patch: skip @installbuilddir@.
|
@@ -25,9 +25,20 @@ diff -ru --new-file apr-1.5.2.orig/include/private/apr_escape_test_char.h apr-1.
|
|
|
25
25
|
+ 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
|
|
26
26
|
+ 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
|
|
27
27
|
+};
|
|
28
|
-
diff -ru
|
|
29
|
-
--- apr-1.5.2.orig/
|
|
30
|
-
+++ apr-1.5.2/
|
|
28
|
+
diff -ru apr-1.5.2.orig/network_io/unix/sendrecv.c apr-1.5.2/network_io/unix/sendrecv.c
|
|
29
|
+
--- apr-1.5.2.orig/network_io/unix/sendrecv.c 2013-10-21 13:57:36.000000000 +0200
|
|
30
|
+
+++ apr-1.5.2/network_io/unix/sendrecv.c 2017-02-02 00:52:39.903022000 +0100
|
|
31
|
+
|
|
32
|
+
/* Define a structure to pass in when we have a NULL header value */
|
|
33
|
+
static apr_hdtr_t no_hdtr;
|
|
34
|
+
|
|
35
|
+
-#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
|
|
36
|
+
+#if (defined(__linux__) || defined(__GNU__)) || defined(__midipix__) && defined(HAVE_WRITEV)
|
|
37
|
+
|
|
38
|
+
apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
|
|
39
|
+
apr_hdtr_t *hdtr, apr_off_t *offset,
|
|
40
|
+
--- apr-1.5.2/Makefile.in.orig 2014-04-25 10:51:11.000000000 +0000
|
|
41
|
+
+++ apr-1.5.2/Makefile.in 2017-02-13 09:58:16.230193677 +0000
|
|
31
42
|
|
|
32
43
|
|
|
33
44
|
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
|
|
|
38
49
|
DISTCLEAN_TARGETS = config.cache config.log config.status \
|
|
39
50
|
include/apr.h include/arch/unix/apr_private.h \
|
|
40
51
|
libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
|
|
41
|
-
|
|
52
|
+
|
|
53
|
+
sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
|
|
54
|
+
|
|
55
|
+
install: $(TARGETS)
|
|
56
|
+
- $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
|
|
57
|
+
+ $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
|
|
58
|
+
$(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
|
|
59
|
+
$(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
|
|
60
|
+
for f in $(top_srcdir)/include/apr_*.h; do \
|
|
61
|
+
|
|
62
|
+
$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
|
|
63
|
+
$(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
|
|
64
|
+
$(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
|
|
65
|
+
- for f in libtool shlibtool; do \
|
|
66
|
+
- if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \
|
|
67
|
+
- done
|
|
68
|
+
- $(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
|
|
69
|
+
- for f in make_exports.awk make_var_export.awk; do \
|
|
70
|
+
- $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
|
|
71
|
+
- done
|
|
72
|
+
- $(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
|
|
73
|
+
$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
|
|
74
|
+
@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
|
|
75
|
+
for i in $(INSTALL_SUBDIRS); do \
|
|
76
|
+
|
|
42
77
|
etags:
|
|
43
78
|
etags `find . -name '*.[ch]'`
|
|
44
79
|
|
|
@@ -57,15 +92,3 @@ diff -ru --new-file apr-1.5.2.orig/Makefile.in apr-1.5.2/Makefile.in
|
|
|
57
92
|
LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
|
|
58
93
|
@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
|
|
59
94
|
|
|
60
|
-
diff -ru apr-1.5.2.orig/network_io/unix/sendrecv.c apr-1.5.2/network_io/unix/sendrecv.c
|
|
61
|
-
--- apr-1.5.2.orig/network_io/unix/sendrecv.c 2013-10-21 13:57:36.000000000 +0200
|
|
62
|
-
+++ apr-1.5.2/network_io/unix/sendrecv.c 2017-02-02 00:52:39.903022000 +0100
|
|
63
|
-
|
|
64
|
-
/* Define a structure to pass in when we have a NULL header value */
|
|
65
|
-
static apr_hdtr_t no_hdtr;
|
|
66
|
-
|
|
67
|
-
-#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
|
|
68
|
-
+#if (defined(__linux__) || defined(__GNU__)) || defined(__midipix__) && defined(HAVE_WRITEV)
|
|
69
|
-
|
|
70
|
-
apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
|
|
71
|
-
apr_hdtr_t *hdtr, apr_off_t *offset,
|