summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-07-21 15:32:37 +0200
committerDavid Tardon <dtardon@redhat.com>2014-07-21 15:33:37 +0200
commita8a3ad1e5f2c2539aae8067a3506a896b83389de (patch)
treeaf5e5ae234510af0c68de1c75bfb662b731baa39
parent8f199a3f0bcc5c1600ce5562605475c9e6b3def1 (diff)
fix debug build of libxml2 on windows
Change-Id: I36672c56742468cda8c0481b76ee6e3fec700983
-rw-r--r--external/libxml2/libxml2-icu.patch.06
1 files changed, 5 insertions, 1 deletions
diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0
index 6a9f8e42aab3..f33e2612b01c 100644
--- a/external/libxml2/libxml2-icu.patch.0
+++ b/external/libxml2/libxml2-icu.patch.0
@@ -17,12 +17,16 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
LIBS =
!if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
-@@ -78,7 +78,7 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
+@@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
LIBS = $(LIBS) iconv.lib
!endif
!if "$(WITH_ICU)" == "1"
-LIBS = $(LIBS) icu.lib
++!if "$(DEBUG)" == "1"
++LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
++!else
+LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib
++!endif
!endif
!if "$(WITH_ZLIB)" == "1"
# could be named differently zdll or zlib