From 9bc06e6ac0d2031e6ed95229b0c1e1cf7d86ee90 Mon Sep 17 00:00:00 2001 From: tono Date: Mon, 31 May 2010 21:53:32 +0900 Subject: i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 --- libxml2/makefile.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libxml2') diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 9175391fbae8..057b92a8c121 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -57,17 +57,17 @@ PATCH_FILES=$(TARFILE_NAME).patch .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" PATCH_FILES+=$(TARFILE_NAME)-mingw.patch -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 -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump" BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) .ELSE -- cgit From 9c9bd762f495851613f2e23283abc23c68db76ca Mon Sep 17 00:00:00 2001 From: tono Date: Sat, 5 Jun 2010 07:44:18 +0900 Subject: i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 : more fixes --- libxml2/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libxml2') diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 057b92a8c121..c315b871ac6d 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -67,7 +67,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 -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="$(WRAPCMD) objdump" BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) .ELSE -- cgit From e30d680073fa8485f1829c7f22634882bb122b87 Mon Sep 17 00:00:00 2001 From: tono Date: Sun, 6 Jun 2010 20:54:55 +0900 Subject: i#112159: MinGW port: libxmlsec 1.2.14, libxml2 2.7.6, libxslt 1.1.26 --- libxml2/libxml2-mingw.patch | 11 +++++++++++ libxml2/makefile.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'libxml2') 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 #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 -- cgit From f49fe0bfe93b4543e0b9f0819169f474dc9ad329 Mon Sep 17 00:00:00 2001 From: tono Date: Sat, 12 Jun 2010 19:04:29 +0900 Subject: i#112159: MinGW port: more fix for libxml2 2.7.6 to avoid using pthreads --- libxml2/libxml2-mingw.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'libxml2') diff --git a/libxml2/libxml2-mingw.patch b/libxml2/libxml2-mingw.patch index 37f48c6714ff..651b0c13f1bb 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 @@ -- cgit