diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2009-08-26 06:36:38 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2009-08-26 06:36:38 +0000 |
commit | e863a48ae31253e02dab4454ed1edf22bc87a328 (patch) | |
tree | a818a663b0f226d81e37197de6190db870b8dbb5 /libxml2 | |
parent | CWS-TOOLING: integrate CWS jl123 (diff) | |
download | core-e863a48ae31253e02dab4454ed1edf22bc87a328.tar.gz core-e863a48ae31253e02dab4454ed1edf22bc87a328.zip |
CWS-TOOLING: integrate CWS mingwport22
2009-08-19 16:18:46 +0200 tono r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-08-05 12:27:41 +0200 tono r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk@274622 (milestone: DEV300:m54)
2009-08-01 00:56:35 +0200 tono r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-27 00:13:27 +0200 tono r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 06:19:59 +0200 tono r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static"
2009-07-25 06:13:56 +0200 tono r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread
2009-07-25 06:05:22 +0200 tono r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section
2009-07-25 05:54:09 +0200 tono r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope
2009-07-25 05:44:58 +0200 tono r274328 : i#103799: mingw gcc-4.4.0 port: add some #include
2009-07-25 05:33:09 +0200 tono r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path
2009-07-25 05:24:42 +0200 tono r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge
2009-07-25 05:16:20 +0200 tono r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 04:01:59 +0200 tono r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-07-25 02:44:01 +0200 tono r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging
2009-07-25 02:28:21 +0200 tono r274321 : i#103791: mingw port fix typo
Diffstat (limited to 'libxml2')
-rwxr-xr-x | libxml2/libxml2-2.6.31-mingw.patch | 13 | ||||
-rw-r--r-- | libxml2/makefile.mk | 11 |
2 files changed, 23 insertions, 1 deletions
diff --git a/libxml2/libxml2-2.6.31-mingw.patch b/libxml2/libxml2-2.6.31-mingw.patch new file mode 100755 index 000000000000..102ef3e2dbb2 --- /dev/null +++ b/libxml2/libxml2-2.6.31-mingw.patch @@ -0,0 +1,13 @@ +--- misc/libxml2-2.6.31/libxml.h 2007-11-23 19:47:23.000000000 +0900 ++++ misc/build/libxml2-2.6.31/libxml.h 2009-07-10 14:37:34.988250000 +0900 +@@ -30,6 +30,10 @@ + #include <libxml/xmlversion.h> + #else + #include "config.h" ++#ifdef __MINGW32__ ++#undef HAVE_LIBPTHREAD ++#undef HAVE_PTHREAD_H ++#endif + #include <libxml/xmlversion.h> + #endif + diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 7ae2265271b8..b99c52f6aa88 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -59,9 +59,18 @@ PATCH_FILES=$(TARFILE_NAME).patch .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" +PATCH_FILES+=$(TARFILE_NAME)-mingw.patch +xml2_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +xml2_CC+=-shared-libgcc +.ENDIF +xml2_LIBS=-lws2_32 -lmingwthrd +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +xml2_LIBS+=-lstdc++_s +.ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --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" BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) .ELSE |