[Libreoffice-commits] core.git: external/libxml2

[David Tardon]

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

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

    fix debug build of libxml2 on windows, version 2
    
    Change-Id: I67f269e316906913b1a9b4d91907d95b869ca71f

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 a0ab104..4db9f9b 100644
--- a/external/libxml2/libxml2-icu.patch.0
+++ b/external/libxml2/libxml2-icu.patch.0
@@ -22,7 +22,7 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
  !endif 
  !if "$(WITH_ICU)" == "1"
 -LIBS = $(LIBS) icu.lib
-+!if "$(DEBUG)" != ""
++!if "$(WITH_RUN_DEBUG)" == "1"
 +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
 +!else
 +LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib