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

Tue Jan 22 23:15:01 UTC 2019

external/libxml2/ExternalProject_xml2.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fb1895f1b627a8213d35fbb186f4c5b1ee6c203e
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Jan 18 12:18:01 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jan 23 00:14:14 2019 +0100

    libxml2: fix MSVC build
    
    libxml2.rc(1) : fatal error RC1015: cannot open include file 'winver.h'.
    
    Change-Id: I6653eaefd1da0440811154a718683951d79fb871

diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk
index f60d960d6790..54815e55d812 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -22,7 +22,8 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
 			iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
 			$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
 		&& unset MAKEFLAGS \
-		&& LIB="$(ILIB)" nmake \
+		&& INCLUDE="$(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC)))" \
+		   LIB="$(ILIB)" nmake \
 	,win32)
 else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,xml2,build):
