diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libxml2/libxml2-icu.patch.0 | 13 | ||||
| -rw-r--r-- | external/libxml2/libxml2-vc10.patch | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/download.lst b/download.lst index 89dd6b4fde62..e1020cb52a3d 100644 --- a/download.lst +++ b/download.lst @@ -152,8 +152,8 @@ export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304 export LIBTOMMATH_TARBALL := ltm-1.0.zip export XMLSEC_SHA256SUM := 967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2 export XMLSEC_TARBALL := xmlsec1-1.2.25.tar.gz -export LIBXML_SHA256SUM := f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c -export LIBXML_VERSION_MICRO := 7 +export LIBXML_SHA256SUM := 0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732 +export LIBXML_VERSION_MICRO := 8 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz export LIBXSLT_SHA256SUM := 526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460 export LIBXSLT_VERSION_MICRO := 32 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) |