diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-11 14:24:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-11 19:44:16 +0100 |
| commit | f7197cd244f5d49d96eba32bd843280b2bd040ff (patch) | |
| tree | c02a75a69cd069b44703e1e81a9f4ce942ef696f /external/libxml2/libxml2-vc10.patch | |
| parent | a3d8715bffa6983bc0c23d13a1359397294e505f (diff) | |
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
Diffstat (limited to 'external/libxml2/libxml2-vc10.patch')
| -rw-r--r-- | external/libxml2/libxml2-vc10.patch | 15 |
1 files changed, 1 insertions, 14 deletions
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\ |