diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-12 22:18:53 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-13 09:02:59 +0200 |
| commit | fb7c57aa0fbe1e1b627fc3e6616b5bb8ed0a92b0 (patch) | |
| tree | d4628418bd5e395ae8d0d9e2240b2ea32648afef | |
| parent | 7034311dce663c895577267110baadbec312d491 (diff) | |
xmlsec windows: replace debug runtime patch with configure switch
Change-Id: Ib24c800216492ce4b090522831d21e80888185d1
Reviewed-on: https://gerrit.libreoffice.org/60414
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | external/xmlsec/ExternalProject_xmlsec.mk | 2 | ||||
| -rw-r--r-- | external/xmlsec/xmlsec1-vc.patch.1 | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/external/xmlsec/ExternalProject_xmlsec.mk b/external/xmlsec/ExternalProject_xmlsec.mk index d2824344e31c..5f305865436a 100644 --- a/external/xmlsec/ExternalProject_xmlsec.mk +++ b/external/xmlsec/ExternalProject_xmlsec.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js crypto=mscng xslt=no iconv=no static=no \ lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \ - $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ + $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes cruntime=/MDd) \ && nmake \ ,win32) diff --git a/external/xmlsec/xmlsec1-vc.patch.1 b/external/xmlsec/xmlsec1-vc.patch.1 index af41908bdf8d..6e6834d1fb39 100644 --- a/external/xmlsec/xmlsec1-vc.patch.1 +++ b/external/xmlsec/xmlsec1-vc.patch.1 @@ -13,14 +13,11 @@ diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index e7cd5c38..51c91399 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc -@@ -363,6 +363,10 @@ CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H" +@@ -363,6 +363,7 @@ CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H" CFLAGS = $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H" CFLAGS = $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H" CFLAGS = $(CFLAGS) /D "XMLSEC_NO_GOST" /D "XMLSEC_NO_GOST2012" +CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common -+!if "$(MSVC_USE_DEBUG_RUNTIME)" != "" -+CFLAGS = $(CFLAGS) /MDd -+!endif !if "$(UNICODE)" == "1" CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE" |