[ooo-build-commit] Branch 'ooo/master' - 2 commits - external/gcc3_specific external/gpc external/prj libxmlsec/makefile.mk lpsolve/lp_solve_5.5-windows.patch lpsolve/makefile.mk openssl/opensslmingw.patch redland/raptor redland/rasqal redland/redland
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Aug 27 18:15:17 PDT 2009
external/gcc3_specific/makefile.mk | 20 ++++++++++++
external/gpc/makefile.mk | 57 -------------------------------------
external/prj/build.lst | 1
external/prj/d.lst | 9 +----
libxmlsec/makefile.mk | 10 +++++-
lpsolve/lp_solve_5.5-windows.patch | 4 +-
lpsolve/makefile.mk | 8 ++++-
openssl/opensslmingw.patch | 41 ++++++++++++++++++++++++--
redland/raptor/makefile.mk | 11 ++++++-
redland/rasqal/makefile.mk | 11 ++++++-
redland/redland/makefile.mk | 11 ++++++-
11 files changed, 107 insertions(+), 76 deletions(-)
New commits:
commit 52c02e1d019a1857b0a7576e3f181430d3fd3fc9
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Thu Aug 27 01:14:49 2009 +0000
CWS-TOOLING: integrate CWS gpc100
2009-08-07 20:21:15 +0200 ka r274784 : CWS-TOOLING: rebase CWS gpc100 to trunk at 274622 (milestone: DEV300:m54)
2009-08-07 14:11:35 +0200 ka r274764 : #i75026#: removal of GPC dependency
diff --git a/external/gpc/makefile.mk b/external/gpc/makefile.mk
deleted file mode 100644
index 7eba7b7..0000000
--- a/external/gpc/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=external
-TARGET=gpc
-LIBTARGET=NO
-EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(BUILD_SPECIAL)"==""
-.IF "$(WITH_GPC)"!="NO"
-SLOFILES = $(SLO)$/gpc.obj
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-LIB1OBJFILES=$(SLOFILES)
-.ENDIF
-.ENDIF # "$(BUILD_SPECIAL)"==""
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/external/prj/build.lst b/external/prj/build.lst
index b187daf..20e0d41 100644
--- a/external/prj/build.lst
+++ b/external/prj/build.lst
@@ -1,6 +1,5 @@
el external : SO:external_so soltools NULL
el external usr1 - all el_mkout NULL
el external\glibc nmake - all el_glibc NULL
-el external\gpc nmake - all el_gpc NULL
el external\gcc3_specific nmake - all el_gcc3 NULL
el external\mingwheaders nmake - w el_mingwheaders NULL
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 995ae01..2c50c4c 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -1,6 +1,5 @@
mkdir: %_DEST%\inc%_EXT%\external
mkdir: %_DEST%\inc%_EXT%\external\glibc
-mkdir: %_DEST%\inc%_EXT%\external\gpc
mkdir: %_DEST%\inc%_EXT%\external\mingw
mkdir: %_DEST%\inc%_EXT%\external\mingw\include
mkdir: %_DEST%\inc%_EXT%\external\mingw\include\atl
@@ -8,7 +7,6 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
..\glibc\rtufiles\config.h %_DEST%\inc%_EXT%\external\glibc\config.h
..\glibc\rtufiles\getopt.h %_DEST%\inc%_EXT%\external\glibc\getopt.h
-..\gpc\gpc.h %_DEST%\inc%_EXT%\external\gpc\gpc.h
..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
@@ -18,10 +16,6 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\*
..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\*
-..\%__SRC%\slb\gpc.lib %_DEST%\lib%_EXT%\gpc.lib
-..\%__SRC%\lib\libgpc.a %_DEST%\lib%_EXT%\libgpc.a
-..\%__SRC%\lib\libgpc_static.a %_DEST%\lib%_EXT%\libgpc_static.a
-
..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.*
..\%__SRC%\lib\libgcc_s.so.1 %_DEST%\lib%_EXT%\libgcc_s.so.1
commit 8ad69ffa5c774e2fce0024ec95903c3cba3c8e20
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Wed Aug 26 06:36:38 2009 +0000
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 at 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
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 889b61c..fa409df 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -13,11 +13,29 @@ TARGET=gcc3_specific
.IF "$(COM)" == "GCC"
-all : $(BIN)$/mingwm10.dll
+.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
+MINGWGCCDLL=$(BIN)$/$(MINGW_GCCDLL)
+.ENDIF
+
+.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
+MINGWGXXDLL=$(BIN)$/$(MINGW_GXXDLL)
+.ENDIF
+
+all : $(BIN)$/mingwm10.dll $(MINGWGCCDLL) $(MINGWGXXDLL)
$(BIN)$/mingwm10.dll :
$(COPY) -p $(COMPATH)$/bin$/mingwm10.dll $(BIN)$/
+.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
+$(MINGWGCCDLL) :
+ $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GCCDLL) $(BIN)$/
+.ENDIF
+
+.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
+$(MINGWGXXDLL) :
+ $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GXXDLL) $(BIN)$/
+.ENDIF
+
.ENDIF
.ELSE
diff --git a/external/prj/d.lst b/external/prj/d.lst
index bc7d7c1..995ae01 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -58,6 +58,9 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
..\msi\instmsiw.exe %_DEST%\bin%_EXT%\instmsiw.exe
..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
+..\%__SRC%\bin\libgcc*.dll %_DEST%\bin%_EXT%\libgcc*.dll
+..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin%_EXT%\libstdc++*.dll
+
..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib%_EXT%\lib*.*
..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 950a490..817dc6d 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -77,9 +77,17 @@ CRYPTOLIB=nss
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+xmlsec_CC=$(CC)
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+xmlsec_CC+=-shared-libgcc
+.ENDIF
+xmlsec_LIBS=-lmingwthrd
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+xmlsec_LIBS+=-lstdc++_s
+.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd" LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
.IF "$(SYSTEM_MOZILLA)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no
.ENDIF
diff --git a/lpsolve/lp_solve_5.5-windows.patch b/lpsolve/lp_solve_5.5-windows.patch
index 48acb6c..aae56fc 100644
--- a/lpsolve/lp_solve_5.5-windows.patch
+++ b/lpsolve/lp_solve_5.5-windows.patch
@@ -1,5 +1,5 @@
*** misc/lp_solve_5.5/lpsolve55/cgcc.bat Sun Jun 12 04:27:28 2005
---- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Feb 10 07:55:19 2008
+--- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Dec 14 07:55:19 2008
***************
*** 7,14 ****
@@ -15,7 +15,7 @@
set c=gcc
! windres lpsolve.rc lpsolve_res.obj
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin -enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def -o lpsolve55.dll
+! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin -enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% -o lpsolve55.dll
%c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% -o liblpsolve55.so
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index a69d549..8401f80 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -56,7 +56,13 @@ CONFIGURE_FLAGS=
BUILD_DIR=lpsolve55
.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
-BUILD_ACTION=cmd /c cgcc.bat
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+lpsolve_LDFLAGS=-shared-libgcc
+.ENDIF
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+lpsolve_LIBS=-lstdc++_s
+.ENDIF
+BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
.ELSE
BUILD_ACTION=cmd /c cvc6.bat
OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib
diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch
index 8aa266f..abfe143 100755
--- a/openssl/opensslmingw.patch
+++ b/openssl/opensslmingw.patch
@@ -38,9 +38,20 @@
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
link_app.$${shlib_target}
-(cd ..; \
+--- misc/openssl-0.9.8k/e_os2.h 2005-12-19 03:57:07.000000000 +0900
++++ misc/build/openssl-0.9.8k/e_os2.h 2009-04-04 23:07:15.324250000 +0900
+@@ -264,7 +264,7 @@
+ # define OPENSSL_IMPLEMENT_GLOBAL(type,name) \
+ extern type _hide_##name; \
+ type *_shadow_##name(void) { return &_hide_##name; } \
+- static type _hide_##name
++ type _hide_##name
+ # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
+ # define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
+ #else
--- misc/openssl-0.9.8k/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200
+++ misc/build/openssl-0.9.8k/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200
-@@ -79,13 +79,19 @@
+@@ -79,15 +79,41 @@
rem copy ms\tlhelp32.h outinc
echo Building the libraries
@@ -56,13 +67,35 @@
if errorlevel 1 goto end
-dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
-+if errorlevel 1 goto end
+ if errorlevel 1 goto end
+dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def
+if errorlevel 1 goto end
-+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto
- if errorlevel 1 goto end
++if "%MINGW_SHARED_GXXLIB%"=="YES" goto shared_gxxlib
++if "%MINGW_SHARED_GCCLIB%"=="YES" goto shared_gcclib
++gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
++if errorlevel 1 goto end
++gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto
++if errorlevel 1 goto end
++goto finished
++
++:shared_gcclib
++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
++if errorlevel 1 goto end
++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto
++if errorlevel 1 goto end
++goto finished
++
++:shared_gxxlib
++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 -lstdc++_s
++if errorlevel 1 goto end
++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -lstdc++_s
++if errorlevel 1 goto end
++goto finished
++:finished
echo Done compiling OpenSSL
+
+ :end
--- misc/openssl-0.9.8k/test/Makefile 2009-03-25 19:59:22.000000000 +0900
+++ misc/build/openssl-0.9.8k/test/Makefile 2009-04-10 20:07:21.522500000 +0900
@@ -402,13 +402,13 @@
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index a200ba0..9c0bbaf 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 99d67b5..8753580 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 d393e8b..a1bad00 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)
More information about the ooo-build-commit
mailing list