diff options
| author | David Tardon <dtardon@redhat.com> | 2014-07-17 17:27:05 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-07-20 10:15:25 +0200 |
| commit | 7515b1a90fac9e31733c0fdcc1156adadf0e6f99 (patch) | |
| tree | 442bc11d06390d5ba90c773def726164b31eaa0d /external/libxmlsec | |
| parent | cbc50c90ad63f0e59b8cf3bbfb6b5b1f61db09b9 (diff) | |
fdo#63756 build libxml2 with ICU support
Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab
Diffstat (limited to 'external/libxmlsec')
| -rw-r--r-- | external/libxmlsec/ExternalProject_xmlsec.mk | 1 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-vc.patch | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk index ed65c70dbc28..f554ec839d7e 100644 --- a/external/libxmlsec/ExternalProject_xmlsec.mk +++ b/external/libxmlsec/ExternalProject_xmlsec.mk @@ -59,7 +59,6 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(SYSTEM_LIBXML),,LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\ $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)) \ && $(MAKE) \ diff --git a/external/libxmlsec/xmlsec1-vc.patch b/external/libxmlsec/xmlsec1-vc.patch index f996b8b55aa0..0898d94fd697 100644 --- a/external/libxmlsec/xmlsec1-vc.patch +++ b/external/libxmlsec/xmlsec1-vc.patch @@ -19,7 +19,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) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include ++CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common +!if "$(MSVC_USE_DEBUG_RUNTIME)" != "" +CFLAGS = $(CFLAGS) /MDd +!endif |