diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-03-06 14:49:29 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-03-06 18:48:10 +0100 |
| commit | f775b5427bf085577feb5badb762156283d76ae5 (patch) | |
| tree | 803b836f6169d6b5c64c5a0678ee04b3aeedbfd5 /external/libxml2 | |
| parent | 42ec994f97f82e6aaa2ffc4b99481886909c4163 (diff) | |
libxml2: upgrade to release 2.9.8
Change-Id: Ic6802c16b740f6aee59ae2f74b7edcd37461f1f3
Reviewed-on: https://gerrit.libreoffice.org/50835
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/libxml2')
| -rw-r--r-- | external/libxml2/libxml2-icu.patch.0 | 13 | ||||
| -rw-r--r-- | external/libxml2/libxml2-vc10.patch | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 index 9aaad2de4915..b390b03d8787 100644 --- a/external/libxml2/libxml2-icu.patch.0 +++ b/external/libxml2/libxml2-icu.patch.0 @@ -1,3 +1,5 @@ +Find bundled ICU in workdir and use debug .libs when needed + 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 @@ -18,15 +20,14 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc LIBS = !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1" @@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib - LIBS = $(LIBS) iconv.lib - !endif - !if "$(WITH_ICU)" == "1" --LIBS = $(LIBS) icu.lib + !if "$(STATIC)" == "1" + LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib + !else +!if "$(WITH_RUN_DEBUG)" == "1" +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib +!else -+LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib + LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib +!endif !endif + !endif !if "$(WITH_ZLIB)" == "1" - # could be named differently zdll or zlib diff --git a/external/libxml2/libxml2-vc10.patch b/external/libxml2/libxml2-vc10.patch index f3f2b511f3f2..3892b518d35d 100644 --- a/external/libxml2/libxml2-vc10.patch +++ b/external/libxml2/libxml2-vc10.patch @@ -3,7 +3,7 @@ Add SOLARINC, and disable SSE2 default for MSVC2012 --- build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200 +++ build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200 @@ -59,6 +59,7 @@ - CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H" + CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H" !endif CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE +CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) |