diff options
| author | tono <tono@openoffice.org> | 2010-06-06 20:54:55 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-06-06 20:54:55 +0900 |
| commit | e30d680073fa8485f1829c7f22634882bb122b87 (patch) | |
| tree | 81ceb9e56335e235bf14c8fd0003b1ec209a3bd3 /libxml2 | |
| parent | a850c52babb1cf3a13fb2bc026504957dfb4b9cf (diff) | |
i#112159: MinGW port: libxmlsec 1.2.14, libxml2 2.7.6, libxslt 1.1.26
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/libxml2-mingw.patch | 11 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libxml2/libxml2-mingw.patch b/libxml2/libxml2-mingw.patch index d160dcb70138..37f48c6714ff 100644 --- a/libxml2/libxml2-mingw.patch +++ b/libxml2/libxml2-mingw.patch @@ -22,3 +22,14 @@ #include <libxml/xmlversion.h> #endif +--- misc/libxml2-2.7.6/include/libxml/xmlexports.h 2009-09-25 00:31:59.000000000 +0900 ++++ misc/build/libxml2-2.7.6/include/libxml/xmlexports.h 2010-06-06 11:15:54.160750000 +0900 +@@ -113,7 +113,7 @@ + * _imp__xmlFree listed as missing. Try to workaround the problem + * by also making that declaration when compiling client code. + */ +- #if !defined(LIBXML_STATIC) ++ #if defined(IN_LIBXML) && !defined(LIBXML_STATIC) + #define XMLPUBFUN __declspec(dllexport) + #define XMLPUBVAR __declspec(dllexport) + #else diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 4502c9055706..555d87254ff8 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -65,7 +65,7 @@ xml2_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP=objdump BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) .ELSE |