[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libxml2

[David Tardon]

 external/libxml2/ExternalProject_xml2.mk |    2 +-
 external/libxml2/libxml2-icu.patch.0     |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 32aa2a2a945c66951627bd5e0fc568ab9adbfc81
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jul 21 15:32:37 2014 +0200

    fix debug build of libxml2 on windows
    
    (cherry picked from commit a8a3ad1e5f2c2539aae8067a3506a896b83389de)
    
    Test $(DEBUG) for being non-empty instead of "1" (which it is not)
    
    (cherry picked from commit 22274468ef27ae8651f8ea8805611bf39758b9d5)
    
    fix debug build of libxml2 on windows, version 2
    
    (cherry picked from commit 6831ae4d0e0b69e4f06c2987c3be748c8f35c9d8)
    
    Change-Id: I22e7a142bb874653344a7ffcc55e8a062669fa2a
    Reviewed-on: https://gerrit.libreoffice.org/10442
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk
index cb23686..f19cb52 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_use_external_project,xml2,icu)
 $(call gb_ExternalProject_get_state_target,xml2,build):
 	$(call gb_ExternalProject_run,build,\
 		cscript configure.js \
-			iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
+			iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
 		&& unset MAKEFLAGS \
 		&& LIB="$(ILIB)" nmake \
 	,win32)
diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0
index 6a9f8e4..4db9f9b 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 "$(WITH_RUN_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