diff options
Diffstat (limited to '')
| -rw-r--r-- | external/apr/windows.build.patch.1 | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/external/apr/windows.build.patch.1 b/external/apr/windows.build.patch.1 new file mode 100644 index 000000000..929910bea --- /dev/null +++ b/external/apr/windows.build.patch.1 @@ -0,0 +1,53 @@ +diff -ur apr_util.org/aprutil.mak apr_util/aprutil.mak +--- apr_util.org/aprutil.mak 2014-03-05 16:40:02.385701779 +0100 ++++ apr_util/aprutil.mak 2014-03-05 16:40:49.409702332 +0100 +@@ -210,8 +210,6 @@ + "$(INTDIR)\apr_uri.obj" \ + "$(INTDIR)\xlate.obj" \ + "$(INTDIR)\apr_xml.obj" \ +- "..\apr-iconv\LibR\apriconv-1.lib" \ +- ".\xml\expat\lib\LibR\xml.lib" + + "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< +@@ -406,8 +404,6 @@ + "$(INTDIR)\apr_uri.obj" \ + "$(INTDIR)\xlate.obj" \ + "$(INTDIR)\apr_xml.obj" \ +- "..\apr-iconv\LibD\apriconv-1.lib" \ +- ".\xml\expat\lib\LibD\xml.lib" + + "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< +@@ -602,8 +598,6 @@ + "$(INTDIR)\apr_uri.obj" \ + "$(INTDIR)\xlate.obj" \ + "$(INTDIR)\apr_xml.obj" \ +- "..\apr-iconv\x64\LibR\apriconv-1.lib" \ +- ".\xml\expat\lib\x64\LibR\xml.lib" + + "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< +@@ -798,8 +792,6 @@ + "$(INTDIR)\apr_uri.obj" \ + "$(INTDIR)\xlate.obj" \ + "$(INTDIR)\apr_xml.obj" \ +- "..\apr-iconv\x64\LibD\apriconv-1.lib" \ +- ".\xml\expat\lib\x64\LibD\xml.lib" + + "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< +diff -ur apr_util.org/include/apu.hw apr_util/include/apu.hw +--- apr_util.org/include/apu.hw 2014-03-05 16:40:02.377701779 +0100 ++++ apr_util/include/apu.hw 2014-03-05 16:40:38.769702207 +0100 +@@ -138,8 +138,8 @@ + #define APU_HAVE_NSS 0 + #endif + +-#define APU_HAVE_APR_ICONV 1 +-#define APU_HAVE_ICONV 0 ++#undef APU_HAVE_APR_ICONV ++#undef APU_HAVE_ICONV + #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV) + + #endif /* APU_H */ |