diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-01-19 12:20:03 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-01-19 12:20:03 +0100 |
| commit | 9c83c0f0c4e7b883fa46d2528ebd1a6f33d5eb7d (patch) | |
| tree | e62a7fcce337f5bb8a3a3cf06ca6b4645d2036ee | |
| parent | 370ca6689a6d39735dc9c6dc822ec04ff5672a16 (diff) | |
| parent | 5256f32b980016ff11e2eef15c39bd942a08d200 (diff) | |
CWS-TOOLING: integrate CWS mingwport33
Notes
split repo tag: libs-extern_ooo/DEV300_m98
| -rw-r--r-- | libxmlsec/makefile.mk | 2 | ||||
| -rw-r--r-- | lpsolve/makefile.mk | 2 | ||||
| -rwxr-xr-x | openssl/opensslmingw.patch | 4 | ||||
| -rw-r--r-- | redland/raptor/makefile.mk | 2 | ||||
| -rw-r--r-- | redland/rasqal/makefile.mk | 2 | ||||
| -rw-r--r-- | redland/redland/makefile.mk | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index f721db3148a4..322f82599e17 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -95,7 +95,7 @@ xmlsec_CC+=-shared-libgcc .ENDIF xmlsec_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -xmlsec_LIBS+=-lstdc++_s +xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 3e66303b038a..06cc41772dbf 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -57,7 +57,7 @@ BUILD_DIR=lpsolve55 lpsolve_LDFLAGS=-shared-libgcc .ENDIF .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -lpsolve_LIBS=-lstdc++_s +lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP) .ENDIF BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat .ELSE diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch index 10b48531190d..0ea8287b53eb 100755 --- a/openssl/opensslmingw.patch +++ b/openssl/opensslmingw.patch @@ -69,9 +69,9 @@ +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 ++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 %MINGW_SHARED_LIBSTDSPP% +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 ++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 %MINGW_SHARED_LIBSTDSPP% +if errorlevel 1 goto end +goto finished diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index b67f6ef314ce..82e92b41b2b7 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -74,7 +74,7 @@ raptor_CC+=-shared-libgcc .ENDIF raptor_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -raptor_LIBS+=-lstdc++_s +raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 66fca99d1600..6f2afc423f71 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -72,7 +72,7 @@ rasqal_CC+=-shared-libgcc .ENDIF rasqal_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -rasqal_LIBS+=-lstdc++_s +rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 20b1210dd2f9..ac1558475c5e 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -72,7 +72,7 @@ redland_CC+=-shared-libgcc .ENDIF redland_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -redland_LIBS+=-lstdc++_s +redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= |