From f7197cd244f5d49d96eba32bd843280b2bd040ff Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 11 Nov 2013 14:24:13 +0100 Subject: libxml2: upgrade to version 2.9.1 - from libxml2-configure.patch: * drop config.sub Android stuff (obsolete) * drop Makefile.in disabling targets for Android (hypothetically obsolete) * drop xmlversion.h changes (pointless - configure.js generates it) * split out libxml2-freebsd.patch.1 * split out libxml2-config.patch.1 - drop libxml2-long-path.patch (integrated upstream) - drop libxml2-gnome599717.patch (obsolete) - drop libxml2-xpath.patch (obsolete) - drop libxml2-latin.patch (obsolete) - drop libxml2-aix.patch: presumably don't need special check for V7BETA since it's released now - drop libxml2-mingw.patch: actually appears to patch a MSVC-specific part of the file so is obsolete anyway Change-Id: I87bf8968bd4a554852a2791420a5d0db822beeaa --- external/libxml2/ExternalPackage_xml2.mk | 2 +- external/libxml2/UnpackedTarball_xml2.mk | 9 +- external/libxml2/libxml2-aix.patch | 21 ---- external/libxml2/libxml2-android.patch | 2 +- external/libxml2/libxml2-config.patch.1 | 69 ++++++++++++ external/libxml2/libxml2-configure.patch | 152 -------------------------- external/libxml2/libxml2-freebsd.patch.1 | 15 +++ external/libxml2/libxml2-global-symbols.patch | 4 +- external/libxml2/libxml2-gnome599717.patch | 20 ---- external/libxml2/libxml2-latin.patch | 32 ------ external/libxml2/libxml2-long-path.patch | 34 ------ external/libxml2/libxml2-mingw.patch | 11 -- external/libxml2/libxml2-vc10.patch | 15 +-- external/libxml2/libxml2-xpath.patch | 70 ------------ 14 files changed, 91 insertions(+), 365 deletions(-) delete mode 100644 external/libxml2/libxml2-aix.patch create mode 100644 external/libxml2/libxml2-config.patch.1 delete mode 100644 external/libxml2/libxml2-configure.patch create mode 100644 external/libxml2/libxml2-freebsd.patch.1 delete mode 100644 external/libxml2/libxml2-gnome599717.patch delete mode 100644 external/libxml2/libxml2-latin.patch delete mode 100644 external/libxml2/libxml2-long-path.patch delete mode 100644 external/libxml2/libxml2-mingw.patch delete mode 100644 external/libxml2/libxml2-xpath.patch (limited to 'external/libxml2') diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index 0eb216f54c35..e25a7f8c38e0 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -25,7 +25,7 @@ $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dl $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) endif else # OS!=WNT -$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.7.6)) +$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.1)) endif endif # DISABLE_DYNLOADING diff --git a/external/libxml2/UnpackedTarball_xml2.mk b/external/libxml2/UnpackedTarball_xml2.mk index 796ff5e2eb35..ef00e8e2f97a 100644 --- a/external/libxml2/UnpackedTarball_xml2.mk +++ b/external/libxml2/UnpackedTarball_xml2.mk @@ -12,16 +12,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xml2)) $(eval $(call gb_UnpackedTarball_set_tarball,xml2,$(LIBXML_TARBALL),,libxml2)) $(eval $(call gb_UnpackedTarball_add_patches,xml2,\ - external/libxml2/libxml2-configure.patch \ - external/libxml2/libxml2-gnome599717.patch \ - external/libxml2/libxml2-xpath.patch \ + external/libxml2/libxml2-config.patch.1 \ + external/libxml2/libxml2-freebsd.patch.1 \ external/libxml2/libxml2-global-symbols.patch \ - external/libxml2/libxml2-aix.patch \ external/libxml2/libxml2-vc10.patch \ - external/libxml2/libxml2-latin.patch \ $(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \ - $(if $(filter WNT,$(OS)),external/libxml2/libxml2-long-path.patch \ - $(if $(filter GCC,$(COM)),external/libxml2/libxml2-mingw.patch)) \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libxml2/libxml2-aix.patch b/external/libxml2/libxml2-aix.patch deleted file mode 100644 index d187ea0f807f..000000000000 --- a/external/libxml2/libxml2-aix.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- misc/libxml2-2.7.6/config.guess 2010-09-15 14:53:52.000000000 -0500 -+++ misc/build/libxml2-2.7.6/config.guess 2010-09-15 14:56:09.000000000 -0500 -@@ -548,7 +548,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[456]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -560,6 +560,9 @@ - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi -+ if [ "$IBM_REV" == "V7BETA" ]; then -+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} -+ fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) diff --git a/external/libxml2/libxml2-android.patch b/external/libxml2/libxml2-android.patch index 06d5e57ad31d..cc2c5ab97e00 100644 --- a/external/libxml2/libxml2-android.patch +++ b/external/libxml2/libxml2-android.patch @@ -18,7 +18,7 @@ @@ -327,7 +327,7 @@ if (result == 0.0) { - + -#if defined(TRIO_COMPILER_SUPPORTS_C99) +#if defined(TRIO_COMPILER_SUPPORTS_C99) && !(defined(__ANDROID__) && defined(__clang__)) result = nan(""); diff --git a/external/libxml2/libxml2-config.patch.1 b/external/libxml2/libxml2-config.patch.1 new file mode 100644 index 000000000000..7b2b7f604188 --- /dev/null +++ b/external/libxml2/libxml2-config.patch.1 @@ -0,0 +1,69 @@ +Hack the xml2-config to return paths into WORKDIR. + +--- a/xml2-config.in 2009-12-17 11:45:20.000000000 +0000 ++++ b/xml2-config.in 2009-12-17 11:45:36.000000000 +0000 +@@ -1,9 +1,14 @@ + #! /bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-includedir=@includedir@ +-libdir=@libdir@ ++#prefix=@prefix@ ++#exec_prefix=@exec_prefix@ ++#includedir=@includedir@ ++#libdir=@libdir@ ++ ++prefix=${WORKDIR}/UnpackedTarball/xml2 ++exec_prefix=${WORKDIR}/UnpackedTarball/xml2 ++includedir=${WORKDIR}/UnpackedTarball/xml2/include ++libdir=${WORKDIR}/UnpackedTarball/xml2/.libs + + usage() + { +@@ -67,7 +72,8 @@ + ;; + + --cflags) +- echo @XML_INCLUDEDIR@ @XML_CFLAGS@ ++ echo -I${includedir} ++# echo @XML_INCLUDEDIR@ @XML_CFLAGS@ + ;; + + --libtool-libs) +@@ -82,19 +88,24 @@ + ;; + + --libs) +- if [ "`uname`" = "Linux" ] +- then +- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] +- then +- echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@ +- else +- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ +- fi +- else +- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@ +- fi ++ echo -L${libdir} -lxml2 -lm ++# if [ "`uname`" = "Linux" ] ++# then ++# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] ++# then ++# echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@ ++# else ++# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ ++# fi ++# else ++# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@ ++# fi + ;; + ++ print) # ugly configure hack ++ exit 0 ++ ;; ++ + *) + usage + exit 1 diff --git a/external/libxml2/libxml2-configure.patch b/external/libxml2/libxml2-configure.patch deleted file mode 100644 index 731308ed95a5..000000000000 --- a/external/libxml2/libxml2-configure.patch +++ /dev/null @@ -1,152 +0,0 @@ ---- misc/libxml2-2.7.6/config.sub 2009-06-11 11:29:50.000000000 +0200 -+++ misc/build/libxml2-2.7.6/config.sub 2011-09-26 18:05:31.000000000 +0200 -@@ -120,7 +120,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-android* | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) -@@ -1275,7 +1275,7 @@ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ---- misc/libxml2-2.7.6/Makefile.in -+++ misc/build/libxml2-2.7.6/Makefile.in -@@ -41,9 +41,9 @@ - testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \ - testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \ - testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \ -- testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \ -+ testapi$(EXEEXT) testModule$(EXEEXT) \ - runsuite$(EXEEXT) testchar$(EXEEXT) testdict$(EXEEXT) \ -- runxmlconf$(EXEEXT) testrecurse$(EXEEXT) -+ runxmlconf$(EXEEXT) - bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT) - subdir = . - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ---- misc/libxml2-2.7.6/ltmain.sh 2009-10-06 17:39:54.000000000 +0100 -+++ misc/build/libxml2-2.7.6/ltmain.sh 2009-12-17 11:43:56.000000000 +0000 -@@ -6271,8 +6271,8 @@ - ;; - - freebsd-elf) -- major=".$current" -- versuffix=".$current" -+ major=.`expr $current - $age` -+ versuffix=".$major.$age.$revision"; - ;; - - irix | nonstopux) ---- misc/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:19.000000000 +0000 -+++ misc/build/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:36.000000000 +0000 -@@ -264,7 +264,7 @@ - * - * Whether iconv support is available - */ --#if 1 -+#if 0 - #define LIBXML_ICONV_ENABLED - #endif - -@@ -282,7 +282,7 @@ - * - * Whether Debugging module is configured in - */ --#if 1 -+#if 0 - #define LIBXML_DEBUG_ENABLED - #endif - -@@ -291,7 +291,7 @@ - * - * Whether the memory debugging is configured in - */ --#if 1 -+#if 0 - #define DEBUG_MEMORY_LOCATION - #endif - -@@ -300,7 +300,7 @@ - * - * Whether the runtime debugging is configured in - */ --#if 1 -+#if 0 - #define LIBXML_DEBUG_RUNTIME - #endif - ---- misc/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:20.000000000 +0000 -+++ misc/build/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:36.000000000 +0000 -@@ -1,9 +1,14 @@ - #! /bin/sh - --prefix=@prefix@ --exec_prefix=@exec_prefix@ --includedir=@includedir@ --libdir=@libdir@ -+#prefix=@prefix@ -+#exec_prefix=@exec_prefix@ -+#includedir=@includedir@ -+#libdir=@libdir@ -+ -+prefix=${WORKDIR}/UnpackedTarball/xml2 -+exec_prefix=${WORKDIR}/UnpackedTarball/xml2 -+includedir=${WORKDIR}/UnpackedTarball/xml2/include -+libdir=${WORKDIR}/UnpackedTarball/xml2/.libs - - usage() - { -@@ -67,7 +72,8 @@ - ;; - - --cflags) -- echo @XML_INCLUDEDIR@ @XML_CFLAGS@ -+ echo -I${includedir} -+# echo @XML_INCLUDEDIR@ @XML_CFLAGS@ - ;; - - --libtool-libs) -@@ -82,19 +88,24 @@ - ;; - - --libs) -- if [ "`uname`" = "Linux" ] -- then -- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] -- then -- echo @XML_LIBS@ -- else -- echo @XML_LIBDIR@ @XML_LIBS@ -- fi -- else -- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ -- fi -+ echo -L${libdir} -lxml2 -lm -+# if [ "`uname`" = "Linux" ] -+# then -+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] -+# then -+# echo @XML_LIBS@ -+# else -+# echo @XML_LIBDIR@ @XML_LIBS@ -+# fi -+# else -+# echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ -+# fi - ;; - -+ print) # ugly configure hack -+ exit 0 -+ ;; -+ - *) - usage - exit 1 diff --git a/external/libxml2/libxml2-freebsd.patch.1 b/external/libxml2/libxml2-freebsd.patch.1 new file mode 100644 index 000000000000..a8743155a940 --- /dev/null +++ b/external/libxml2/libxml2-freebsd.patch.1 @@ -0,0 +1,15 @@ +Usual patch to produce Linux-like .so files on FreeBSD + +--- a/ltmain.sh 2009-10-06 17:39:54.000000000 +0100 ++++ b/ltmain.sh 2009-12-17 11:43:56.000000000 +0000 +@@ -6271,8 +6271,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current" ++ major=.`expr $current - $age` ++ versuffix=".$major.$age.$revision"; + ;; + + irix | nonstopux) diff --git a/external/libxml2/libxml2-global-symbols.patch b/external/libxml2/libxml2-global-symbols.patch index 20cd273d745c..ba34ac9cc0c6 100644 --- a/external/libxml2/libxml2-global-symbols.patch +++ b/external/libxml2/libxml2-global-symbols.patch @@ -14,8 +14,8 @@ LIBXML2_2.6.32 { @@ -2231,3 +2231,43 @@ - xmlXIncludeProcessTreeFlagsData; - } LIBXML2_2.7.3; + xmlXPathSetContextNode; + } LIBXML2_2.9.0; +# HACK: export global variable accessor functions (globals.h) +LIBXML2_GLOBAL_VARIABLES { diff --git a/external/libxml2/libxml2-gnome599717.patch b/external/libxml2/libxml2-gnome599717.patch deleted file mode 100644 index cc6617d0e699..000000000000 --- a/external/libxml2/libxml2-gnome599717.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- misc/libxml2-2.7.6/relaxng.c 2009-12-17 11:53:12.000000000 +0000 -+++ misc/build/libxml2-2.7.6/relaxng.c 2009-12-17 16:30:43.000000000 +0000 -@@ -5369,7 +5369,7 @@ - } else { - xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, - "expecting name, anyName, nsName or choice : got %s\n", -- (node == NULL ? "nothing" : node->name), NULL); -+ (node == NULL ? BAD_CAST "nothing" : node->name), NULL); - return (NULL); - } - if (ret != def) { -@@ -9459,7 +9459,7 @@ - ctxt->states = NULL; - if (found == 0) { - if (cur == NULL) { -- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); -+ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, BAD_CAST "noname"); - } else { - VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); - } diff --git a/external/libxml2/libxml2-latin.patch b/external/libxml2/libxml2-latin.patch deleted file mode 100644 index d1744138497e..000000000000 --- a/external/libxml2/libxml2-latin.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- misc/libxml2-2.7.6//runtest.c 2011-08-29 02:41:07.876872800 +0900 -+++ misc/build/libxml2-2.7.6/runtest.c 2011-08-29 02:47:09.068970800 +0900 -@@ -2728,7 +2728,7 @@ - "file:///path/to/a%20b.html", - "/path/to/a b.html", - "/path/to/a%20b.html", -- "urip://example.com/résumé.html", -+ "urip://example.com/r" "\xe9" "sum" "\xe9" ".html", - "urip://example.com/test?a=1&b=2%263&c=4#foo", - NULL - }; ---- misc/libxml2-2.7.6//testapi.c 2011-08-29 02:41:28.088620300 +0900 -+++ misc/build/libxml2-2.7.6/testapi.c 2011-08-29 02:46:32.966174100 +0900 -@@ -291,7 +291,7 @@ - static xmlChar gen_xmlChar(int no, int nr ATTRIBUTE_UNUSED) { - if (no == 0) return('a'); - if (no == 1) return(' '); -- if (no == 2) return((xmlChar) 'ø'); -+ if (no == 2) return((xmlChar) '\xf8'); - return(0); - } - -@@ -399,7 +399,7 @@ - static xmlChar *gen_const_xmlChar_ptr(int no, int nr ATTRIBUTE_UNUSED) { - if (no == 0) return((xmlChar *) "foo"); - if (no == 1) return((xmlChar *) ""); -- if (no == 2) return((xmlChar *) "nøne"); -+ if (no == 2) return((xmlChar *) "n" "\xf8" "ne"); - if (no == 3) return((xmlChar *) " 2ab "); - return(NULL); - } - diff --git a/external/libxml2/libxml2-long-path.patch b/external/libxml2/libxml2-long-path.patch deleted file mode 100644 index d1596301ef99..000000000000 --- a/external/libxml2/libxml2-long-path.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- misc/libxml2-2.7.6/uri.c 2009-10-02 17:28:55.000000000 +0200 -+++ misc/build/libxml2-2.7.6/uri.c 2011-02-24 13:47:19.349299000 +0100 -@@ -2479,7 +2479,16 @@ - if (path == NULL) - return(NULL); - -- /* sanitize filename starting with // so it can be used as URI */ -+#if defined(_WIN32) -+ //We must not change the backslashes to slashes if the path starts with -+ // \\?\ -+ //Those paths can be up to 32k characters long. -+ len = xmlStrlen(path); -+ if ((len > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') ) -+ return xmlStrdup((const xmlChar *) path); -+#endif -+ -+ /* sanitize filename starting with // so it can be used as URI */ - if ((path[0] == '/') && (path[1] == '/') && (path[2] != '/')) - path++; - ---- misc/libxml2-2.7.6/xmlIO.c 2009-09-24 17:32:00.000000000 +0200 -+++ misc/build/libxml2-2.7.6/xmlIO.c 2011-02-24 13:47:26.163762000 +0100 -@@ -772,6 +772,11 @@ - - #ifdef HAVE_STAT - #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) -+ //On Windows stat and wstat do not work with long pathname, -+ //which start with '\\?\' -+ if ((xmlStrlen(path) > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') ) -+ return 1; -+ - if (xmlWrapStat(path, &stat_buffer) == -1) - return 0; - #else diff --git a/external/libxml2/libxml2-mingw.patch b/external/libxml2/libxml2-mingw.patch deleted file mode 100644 index 1dda894cb6e0..000000000000 --- a/external/libxml2/libxml2-mingw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/build/libxml2-2.7.6/include/libxml/xmlexports.h.orig 2011-08-23 10:26:54.000000000 +0200 -+++ misc/build/libxml2-2.7.6/include/libxml/xmlexports.h 2011-08-23 10:27:21.000000000 +0200 -@@ -56,7 +56,7 @@ - #undef XMLPUBVAR - #undef XMLCALL - #undef XMLCDECL -- #if defined(IN_LIBXML) && !defined(LIBXML_STATIC) -+ #if 0 - #define XMLPUBFUN __declspec(dllexport) - #define XMLPUBVAR __declspec(dllexport) - #else diff --git a/external/libxml2/libxml2-vc10.patch b/external/libxml2/libxml2-vc10.patch index f29858029b27..90c43125b384 100644 --- a/external/libxml2/libxml2-vc10.patch +++ b/external/libxml2/libxml2-vc10.patch @@ -1,23 +1,10 @@ --- 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_ZLIB_H" + CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H" !endif CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE +CFLAGS = $(CFLAGS) $(SOLARINC) # The linker and its options. LD = link.exe -@@ -91,8 +91,12 @@ - LDFLAGS = $(LDFLAGS) /DEBUG - !else - CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 -+!if "$(_NMAKE_VER)" >= "10.00.30319.01" -+LDFLAGS = $(LDFLAGS) -+!else - LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 - !endif -+!endif - - # Libxml object files. - XML_OBJS = $(XML_INTDIR)\c14n.obj\ diff --git a/external/libxml2/libxml2-xpath.patch b/external/libxml2/libxml2-xpath.patch deleted file mode 100644 index 107de91ed862..000000000000 --- a/external/libxml2/libxml2-xpath.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- misc/libxml2-2.7.6/xpath.c 2009-09-24 17:32:00.000000000 +0200 -+++ misc/build/libxml2-2.7.6/xpath.c 2011-01-03 17:21:08.788256100 +0100 -@@ -8106,9 +8106,17 @@ - xmlNodePtr - xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { - if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); -- if (cur != NULL && cur->children != NULL) -- return cur->children ; -- if (cur == NULL) cur = ctxt->context->node; -+ if ((cur != NULL) && (cur->type != XML_ATTRIBUTE_NODE) && -+ (cur->type != XML_NAMESPACE_DECL) && (cur->children != NULL)) -+ return(cur->children); -+ -+ if (cur == NULL) { -+ cur = ctxt->context->node; -+ if (cur->type == XML_NAMESPACE_DECL) -+ return(NULL); -+ if (cur->type == XML_ATTRIBUTE_NODE) -+ cur = cur->parent; -+ } - if (cur == NULL) return(NULL) ; /* ERROR */ - if (cur->next != NULL) return(cur->next) ; - do { -@@ -8162,8 +8170,13 @@ - xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) - { - if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); -- if (cur == NULL) -+ if (cur == NULL) { - cur = ctxt->context->node; -+ if (cur->type == XML_NAMESPACE_DECL) -+ return(NULL); -+ if (cur->type == XML_ATTRIBUTE_NODE) -+ return(cur->parent); -+ } - if (cur == NULL) - return (NULL); - if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) -@@ -8207,8 +8220,8 @@ - cur = ctxt->context->node; - if (cur == NULL) - return (NULL); -- if (cur->type == XML_NAMESPACE_DECL) -- cur = (xmlNodePtr)((xmlNsPtr)cur)->next; -+ if (cur->type == XML_NAMESPACE_DECL) -+ return (NULL); - ctxt->ancestor = cur->parent; - } - if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) -@@ -11737,11 +11750,16 @@ - - if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { - xmlXPathObjectPtr tmp; -- /* pop the result */ -+ /* pop the result if any */ - tmp = valuePop(ctxt); -- xmlXPathReleaseObject(xpctxt, tmp); -- /* then pop off contextObj, which will be freed later */ -- valuePop(ctxt); -+ if (tmp != contextObj) { -+ /* -+ * Free up the result -+ * then pop off contextObj, which will be freed later -+ */ -+ xmlXPathReleaseObject(xpctxt, tmp); -+ valuePop(ctxt); -+ } - goto evaluation_error; - } - -- cgit v1.2.3