From 2dd882c605f1f8ae1b4785a1929919ad212894fa Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 13 Nov 2014 01:21:30 -0500 Subject: apr[-util]: Update Signed-off-by: Timothy Gu --- src/apr-1.patch | 82 ++++++++++++++++++++++++++++++++++++++------------ src/apr-2-wtypes.patch | 36 ++++++++++++++++++++++ src/apr-3.patch | 32 ++++++++++++++++++++ src/apr-util.mk | 10 +++--- src/apr.mk | 17 +++++++---- 5 files changed, 146 insertions(+), 31 deletions(-) create mode 100644 src/apr-2-wtypes.patch create mode 100644 src/apr-3.patch diff --git a/src/apr-1.patch b/src/apr-1.patch index de94bb2..530b5da 100644 --- a/src/apr-1.patch +++ b/src/apr-1.patch @@ -1,36 +1,78 @@ This file is part of MXE. See index.html for further information. -From d221ed3c7576a3456a8f5623246b46d355a4db83 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Sun, 9 Feb 2014 02:48:38 +0100 -Subject: [PATCH] winsock2.h must precede windows.h +From 1e244993f497ca7167361dfb29a2fe43232a7661 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 13 Nov 2014 00:17:19 -0500 +Subject: [PATCH] Include windows.h after winsock2.h -MinGW 4 is particular about this. +Signed-off-by: Timothy Gu +--- + include/apr.h.in | 2 +- + include/apr.hw | 2 +- + include/apr.hwc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/apr.h.in b/include/apr.h.in -index 9f1fb6f..f1741c1 100644 +index 0ad7a91..0d70142 100644 --- a/include/apr.h.in +++ b/include/apr.h.in -@@ -115,14 +115,14 @@ - * or the extern "C" namespace - */ +@@ -142,7 +142,6 @@ + #define NOIME + #endif --#if APR_HAVE_WINDOWS_H -#include --#endif -- - #if APR_HAVE_WINSOCK2_H - #include + /* + * Add a _very_few_ declarations missing from the restricted set of headers + * (If this list becomes extensive, re-enable the required headers above!) +@@ -156,6 +155,7 @@ + #else + #include #endif ++#include -+#if APR_HAVE_WINDOWS_H + #endif /* ndef _WINDOWS_ */ + #endif /* APR_HAVE_WINDOWS_H */ +diff --git a/include/apr.hw b/include/apr.hw +index a75bc60..caa933c 100644 +--- a/include/apr.hw ++++ b/include/apr.hw +@@ -95,7 +95,6 @@ + #ifndef NOIME + #define NOIME + #endif +-#include + /* + * Add a _very_few_ declarations missing from the restricted set of headers + * (If this list becomes extensive, re-enable the required headers above!) +@@ -109,6 +108,7 @@ + #else + #include + #endif +#include -+#endif -+ - #if APR_HAVE_SYS_TYPES_H - #include + #endif /* !_WINDOWS_ */ + + /** +diff --git a/include/apr.hwc b/include/apr.hwc +index 0579962..b171d48 100644 +--- a/include/apr.hwc ++++ b/include/apr.hwc +@@ -92,7 +92,6 @@ + #ifndef NOIME + #define NOIME + #endif +-#include + /* + * Add a _very_few_ declarations missing from the restricted set of headers + * (If this list becomes extensive, re-enable the required headers above!) +@@ -106,6 +105,7 @@ + #else + #include #endif ++#include + #endif /* !_WINDOWS_ */ + + /** -- -1.8.4.5 +1.9.1 diff --git a/src/apr-2-wtypes.patch b/src/apr-2-wtypes.patch new file mode 100644 index 0000000..c1676bd --- /dev/null +++ b/src/apr-2-wtypes.patch @@ -0,0 +1,36 @@ +This file is part of MXE. +See index.html for further information. + +From: "Jon Schewe (BBN) " +Taken from https://issues.apache.org/bugzilla/attachment.cgi?id=31800. + +--- a/include/arch/win32/apr_private.h.orig 2014-07-03 14:34:47 -0500 ++++ b/include/arch/win32/apr_private.h 2014-07-03 14:35:51 -0500 +@@ -45,13 +45,9 @@ + */ + #ifndef _WIN32_WCE + #define HAVE_ACLAPI 1 +-#ifdef __wtypes_h__ ++#define COM_NO_WINDOWS_H + #include +-#else +-#define __wtypes_h__ +-#include +-#undef __wtypes_h__ +-#endif ++#undef COM_NO_WINDOWS_H + #else + #define HAVE_ACLAPI 0 + #endif +--- a/file_io/win32/filestat.c.orig 2014-07-03 14:42:41 -0500 ++++ b/file_io/win32/filestat.c 2014-07-03 14:43:09 -0500 +@@ -15,7 +15,9 @@ + */ + + #include "apr.h" ++#define COM_NO_WINDOWS_H + #include ++#undef COM_NO_WINDOWS_H + #include "apr_private.h" + #include "apr_arch_file_io.h" + #include "apr_file_io.h" diff --git a/src/apr-3.patch b/src/apr-3.patch new file mode 100644 index 0000000..19a02d0 --- /dev/null +++ b/src/apr-3.patch @@ -0,0 +1,32 @@ +This file is part of MXE. +See index.html for further information. + +From 72ceb6351c8519ed48b21233246fc87f5dc8ee18 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 13 Nov 2014 01:10:29 -0500 +Subject: [PATCH] Make it possible to use another tools/gen_test_char + +Signed-off-by: Timothy Gu +--- + Makefile.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 6f99733..db08a1f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -137,9 +137,10 @@ tools/gen_test_char.lo: make_tools_dir + tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) + $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) + ++GEN_TEST_CHAR ?= tools/gen_test_char@EXEEXT@ + include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ + $(APR_MKDIR) include/private +- tools/gen_test_char@EXEEXT@ > $@ ++ $(GEN_TEST_CHAR) > $@ + + LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \ + @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@ +-- +1.9.1 + diff --git a/src/apr-util.mk b/src/apr-util.mk index 38a06fb..e232398 100644 --- a/src/apr-util.mk +++ b/src/apr-util.mk @@ -2,13 +2,13 @@ # See index.html for further information. PKG := apr-util -$(PKG)_IGNORE := 1.5% -$(PKG)_VERSION := 1.4.1 -$(PKG)_CHECKSUM := ca4db631d186ea13526fd087aebc06799d4c5415 +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.5.4 +$(PKG)_CHECKSUM := 72cc3ac693b52fb831063d5c0de18723bc8e0095 $(PKG)_SUBDIR := apr-util-$($(PKG)_VERSION) $(PKG)_FILE := apr-util-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://mirror.apache-kr.org/apr/$($(PKG)_FILE) -$(PKG)_URL_2 := http://archive.apache.org/dist/apr/$($(PKG)_FILE) +$(PKG)_URL := http://archive.apache.org/dist/apr/$($(PKG)_FILE) +$(PKG)_URL_2 := http://mirror.apache-kr.org/apr/$($(PKG)_FILE) $(PKG)_DEPS := gcc apr expat libiconv define $(PKG)_UPDATE diff --git a/src/apr.mk b/src/apr.mk index d58b374..22db581 100644 --- a/src/apr.mk +++ b/src/apr.mk @@ -2,13 +2,13 @@ # See index.html for further information. PKG := apr -$(PKG)_IGNORE := 1.5% -$(PKG)_VERSION := 1.4.2 -$(PKG)_CHECKSUM := d48324efb0280749a5d7ccbb053d68545c568b4b +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.5.1 +$(PKG)_CHECKSUM := 9caa83e3f50f3abc9fab7c4a3f2739a12b14c3a3 $(PKG)_SUBDIR := apr-$($(PKG)_VERSION) $(PKG)_FILE := apr-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://mirror.apache-kr.org/apr/$($(PKG)_FILE) -$(PKG)_URL_2 := http://archive.apache.org/dist/apr/$($(PKG)_FILE) +$(PKG)_URL := http://archive.apache.org/dist/apr/$($(PKG)_FILE) +$(PKG)_URL_2 := http://mirror.apache-kr.org/apr/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE @@ -18,6 +18,10 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + cp -Rp '$(1)' '$(1).native' + cd '$(1).native' && ./configure + cd '$(1).native' && make tools/gen_test_char \ + CFLAGS='-DNEED_ENHANCED_ESCAPES' cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ ac_cv_sizeof_off_t=4 \ @@ -25,6 +29,7 @@ define $(PKG)_BUILD ac_cv_sizeof_size_t=4 \ ac_cv_sizeof_ssize_t=4 \ CFLAGS=-D_WIN32_WINNT=0x0500 - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= LDFLAGS=-no-undefined + $(MAKE) -C '$(1)' -j 1 install GEN_TEST_CHAR='$(1).native/tools/gen_test_char' + ln -sf '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config' endef -- cgit v0.12