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/libxml2 | |
| parent | cbc50c90ad63f0e59b8cf3bbfb6b5b1f61db09b9 (diff) | |
fdo#63756 build libxml2 with ICU support
Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab
Diffstat (limited to 'external/libxml2')
| -rw-r--r-- | external/libxml2/ExternalProject_xml2.mk | 4 | ||||
| -rw-r--r-- | external/libxml2/UnpackedTarball_xml2.mk | 1 | ||||
| -rw-r--r-- | external/libxml2/libxml2-icu.patch.0 | 28 |
3 files changed, 32 insertions, 1 deletions
diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk index 0e775f6c74c1..cb23686430d4 100644 --- a/external/libxml2/ExternalProject_xml2.mk +++ b/external/libxml2/ExternalProject_xml2.mk @@ -28,10 +28,12 @@ $(call gb_ExternalProject_get_state_target,xml2,build): && $(MAKE) \ ) else # COM=MSC +$(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 sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ + iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ ,win32) diff --git a/external/libxml2/UnpackedTarball_xml2.mk b/external/libxml2/UnpackedTarball_xml2.mk index ef00e8e2f97a..9c53b1fac6d5 100644 --- a/external/libxml2/UnpackedTarball_xml2.mk +++ b/external/libxml2/UnpackedTarball_xml2.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xml2,\ external/libxml2/libxml2-global-symbols.patch \ external/libxml2/libxml2-vc10.patch \ $(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \ + external/libxml2/libxml2-icu.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 new file mode 100644 index 000000000000..6a9f8e42aab3 --- /dev/null +++ b/external/libxml2/libxml2-icu.patch.0 @@ -0,0 +1,28 @@ +diff -up win32/Makefile.msvc.dt win32/Makefile.msvc +--- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200 ++++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200 +@@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" + CC = cl.exe + CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "NOLIBTOOL" /W1 $(CRUNTIME) + CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) ++CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common + !if "$(WITH_THREADS)" != "no" + CFLAGS = $(CFLAGS) /D "_REENTRANT" + !endif +@@ -67,6 +68,7 @@ CFLAGS = $(CFLAGS) $(SOLARINC) + # The linker and its options. + LD = link.exe + LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION) ++LDFLAGS = $(LDFLAGS) /LIBPATH:$(WORKDIR)/UnpackedTarball/icu/source/lib + 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 + LIBS = $(LIBS) iconv.lib + !endif + !if "$(WITH_ICU)" == "1" +-LIBS = $(LIBS) icu.lib ++LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib + !endif + !if "$(WITH_ZLIB)" == "1" + # could be named differently zdll or zlib |