diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 16:36:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 16:36:21 +0000 |
| commit | 0c2b81b34d795bf005a464d6617bcf7d7a841fc5 (patch) | |
| tree | 738765490f4a2f0a648c3380cf7bdea894878b6f /openssl | |
| parent | ef6cb13a304ed22d5cf22b7ccf623693d6be8726 (diff) | |
CWS-TOOLING: integrate CWS mingwport16
2009-01-15 13:11:20 +0100 releng r266363 : tidy-up tabs
2008-11-28 15:33:23 +0100 tono r264557 : i95203: mingw build without stlport
2008-11-22 07:19:50 +0100 tono r264180 : i96436: make mingw bridge conform with reg-struct-return
2008-11-22 05:14:58 +0100 tono r264179 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 17:09:04 +0100 tono r264153 : i95203: mingw build without stlport
2008-11-21 16:59:55 +0100 tono r264152 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:59:18 +0100 tono r264151 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:57:01 +0100 tono r264150 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:53:19 +0100 tono r264149 : i96100: mingw port for icu 4.0
2008-11-13 13:41:13 +0100 tono r263643 : i95203: mingw: Build without stlport
2008-11-13 13:29:38 +0100 tono r263640 : i96100: MinGW port for icu 4.0
2008-11-13 13:17:10 +0100 tono r263634 : i96098: MinGW port fix for new Windows API
2008-11-09 15:22:59 +0100 tono r263497 : i95198: mingwport do not interfere with Cygwin
2008-11-09 14:44:54 +0100 tono r263496 : i95190: mingwport avoid use of MS assembler
2008-11-09 14:32:26 +0100 tono r263495 : i95190: mingwport trivial build fixes
Diffstat (limited to 'openssl')
| -rwxr-xr-x | openssl/opensslmingw.patch | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch index 32c110512093..3103fab712df 100755 --- a/openssl/opensslmingw.patch +++ b/openssl/opensslmingw.patch @@ -1,40 +1,38 @@ *** misc/openssl-0.9.8g/Makefile.shared Sun Sep 16 23:11:51 2007 ---- misc/build/openssl-0.9.8g/Makefile.shared Mon Feb 4 21:12:51 2008 +--- misc/build/openssl-0.9.8g/Makefile.shared Sat Feb 9 09:46:23 2008 *************** -*** 238,251 **** - SHLIB=cyg$(LIBNAME); \ +*** 254,266 **** base=-Wl,--enable-auto-image-base; \ if expr $(PLATFORM) : 'mingw' > /dev/null; then \ -! SHLIB=$(LIBNAME)eay32; base=; \ + SHLIB=$(LIBNAME)eay32; \ +! base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \ fi; \ SHLIB_SUFFIX=.dll; \ - LIBVERSION="$(LIBVERSION)"; \ -! SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \ +! SHLIB_SOVER=-$(LIBVERSION); \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ ! SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ - $(LINK_SO_O) - link_a.cygwin: - @ $(CALC_VERSIONS); \ ---- 238,255 ---- - SHLIB=cyg$(LIBNAME); \ + [ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \ + [ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \ + $(LINK_SO_A) || exit 1; \ +--- 254,270 ---- base=-Wl,--enable-auto-image-base; \ if expr $(PLATFORM) : 'mingw' > /dev/null; then \ -! SHLIB=$(LIBNAME)eay32; \ + SHLIB=$(LIBNAME)eay32; \ +! base=; \ ! if test $(LIBNAME) = "crypto"; then \ ! SHLIB=libeay32; \ +! base=-Wl,--image-base,0x63000000; \ ! fi; \ -! base=; \ fi; \ SHLIB_SUFFIX=.dll; \ - LIBVERSION="$(LIBVERSION)"; \ ! SHLIB_SOVER=; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ ! SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--export-all-symbols -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ - $(LINK_SO_O) - link_a.cygwin: - @ $(CALC_VERSIONS); \ + [ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \ + [ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \ + $(LINK_SO_A) || exit 1; \ *** misc/openssl-0.9.8g/ms/mingw32.bat Fri May 5 22:19:33 2006 --- misc/build/openssl-0.9.8g/ms/mingw32.bat Mon Feb 4 20:11:50 2008 *************** |