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 | f0ec1971d98b5c1805141b53286ec9a2a9b87dac (patch) | |
tree | 2093b636497c8a6a6d5c7520bfe2415c8b7a8a57 /redland | |
parent | CWS-TOOLING: integrate CWS odfmetadata2 (diff) | |
download | core-f0ec1971d98b5c1805141b53286ec9a2a9b87dac.tar.gz core-f0ec1971d98b5c1805141b53286ec9a2a9b87dac.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 'redland')
-rw-r--r-- | redland/raptor/makefile.mk | 11 | ||||
-rw-r--r-- | redland/rasqal/makefile.mk | 11 | ||||
-rw-r--r-- | redland/redland/makefile.mk | 11 |
3 files changed, 30 insertions, 3 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index a200ba06a2c7..9c0bbaf47efd 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -71,10 +71,19 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw +raptor_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +raptor_CC+=-shared-libgcc +.ENDIF +raptor_LIBS=-lmingwthrd +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +raptor_LIBS+=-lstdc++_s +.ENDIF + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure # do not enable grddl parser (#i93768#) -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 99d67b501f96..8753580ff20e 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -70,9 +70,18 @@ BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/src .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" +rasqal_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +rasqal_CC+=-shared-libgcc +.ENDIF +rasqal_LIBS=-lmingwthrd +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +rasqal_LIBS+=-lstdc++_s +.ENDIF + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index d393e8b6e40d..a1bad00117cc 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -72,9 +72,18 @@ BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/librdf .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" +redland_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +redland_CC+=-shared-libgcc +.ENDIF +redland_LIBS=-lmingwthrd +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +redland_LIBS+=-lstdc++_s +.ENDIF + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CFLAGS=-D_MT CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) XSLTLIB="$(XSLTLIB)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |