diff options
| author | sb <sb@openoffice.org> | 2010-06-30 15:38:26 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-06-30 15:38:26 +0200 |
| commit | da1320efe152132d088042ae8857571113fad5e3 (patch) | |
| tree | 1c98d8a24f20dbdb8a7c1c88c89d6bc4cb0ba6db /libxml2 | |
| parent | 33474c4fff35faaedbd93461acb24496160f820f (diff) | |
| parent | d66343ab594fac375f4e3fc939594e9ebe5d4963 (diff) | |
sb126: merged in DEV300_m84
Diffstat (limited to 'libxml2')
| -rw-r--r--[-rwxr-xr-x] | libxml2/libxml2-mingw.patch | 24 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 6 |
2 files changed, 27 insertions, 3 deletions
diff --git a/libxml2/libxml2-mingw.patch b/libxml2/libxml2-mingw.patch index d160dcb70138..651b0c13f1bb 100755..100644 --- a/libxml2/libxml2-mingw.patch +++ b/libxml2/libxml2-mingw.patch @@ -9,6 +9,19 @@ *-*-cygwin*) MODULE_EXTENSION=".dll" { $as_echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5 +@@ -20632,11 +20636,10 @@ + + fi + case $host_os in +- *mingw32*) if test "$THREAD_LIBS" != "-lpthread"; then ++ *mingw32*) + WITH_THREADS="1" + THREADS_W32="Win32" + THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS" +- fi + ;; + *cygwin*) THREAD_LIBS="" + ;; --- misc/libxml2-2.7.6/libxml.h 2007-11-23 19:47:23.000000000 +0900 +++ misc/build/libxml2-2.7.6/libxml.h 2009-07-10 14:37:34.988250000 +0900 @@ -30,6 +30,10 @@ @@ -22,3 +35,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 70796380c3d9..2c80066ccec1 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -55,17 +55,17 @@ PATCH_FILES=libxml2-configure.patch \ .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -xml2_CC=$(CC) +xml2_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" xml2_CC+=-shared-libgcc .ENDIF -xml2_LIBS=-lws2_32 -lmingwthrd +xml2_LIBS=-lws2_32 .IF "$(MINGW_SHARED_GXXLIB)"=="YES" 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)" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -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 |