diff options
| author | Release Engineers <releng@openoffice.org> | 2009-05-04 11:45:11 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-05-04 11:45:11 +0000 |
| commit | 616f513395dfe2efd32e86e381667a4110904a72 (patch) | |
| tree | 34902ae5bd624a2727fa68e4673859a83f826754 /openssl | |
| parent | 010c6b93aefa966e9c92dd64ea79065353304a49 (diff) | |
CWS-TOOLING: integrate CWS mingwport19
2009-04-23 16:09:03 +0200 tono r271180 : revert changes
2009-04-20 15:15:31 +0200 tono r270988 : i101223: MinGW port: atl patch fix
2009-04-14 14:54:29 +0200 tono r270779 : i101077: mingw port: make python to work with OOo
2009-04-14 14:52:46 +0200 tono r270777 : i101073: Mingw port fix: openssl 0.9.8k in cygwin case
Diffstat (limited to 'openssl')
| -rwxr-xr-x | openssl/opensslmingw.patch | 75 |
1 files changed, 61 insertions, 14 deletions
diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch index 91e19bcac498..8aa266fd4e7f 100755 --- a/openssl/opensslmingw.patch +++ b/openssl/opensslmingw.patch @@ -1,28 +1,43 @@ --- misc/openssl-0.9.8k/Makefile.shared 2008-09-17 17:56:40.000000000 +0200 +++ misc/build/openssl-0.9.8k/Makefile.shared 2009-03-30 11:52:53.684538000 +0200 -@@ -238,14 +238,19 @@ - SHLIB=cyg$(LIBNAME); \ +@@ -254,13 +254,17 @@ base=-Wl,--enable-auto-image-base; \ if expr $(PLATFORM) : 'mingw' > /dev/null; then \ -- SHLIB=$(LIBNAME)eay32; base=; \ -+ SHLIB=$(LIBNAME)eay32; \ + SHLIB=$(LIBNAME)eay32; \ +- base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \ + base=; \ -+ if test $(LIBNAME) = "crypto"; then \ -+ SHLIB=libeay32; \ -+ base=-Wl,--image-base,0x63000000; \ -+ fi; \ ++ if test $(LIBNAME) = "crypto"; then \ ++ SHLIB=libeay32; \ ++ base=-Wl,--image-base,0x63000000; \ ++ fi; \ fi; \ SHLIB_SUFFIX=.dll; \ - LIBVERSION="$(LIBVERSION)"; \ -- SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \ -+ SHLIB_SOVER=\ +- SHLIB_SOVER=-$(LIBVERSION); \ ++ SHLIB_SOVER=; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ + 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.8k/apps/Makefile 2008-11-20 01:03:48.000000000 +0900 ++++ misc/build/openssl-0.9.8k/apps/Makefile 2009-04-10 19:49:37.006875000 +0900 +@@ -153,12 +153,12 @@ + shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ + shlib_target="$(SHLIB_TARGET)"; \ + elif [ -n "$(FIPSCANLIB)" ]; then \ +- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ + fi; \ + LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ + [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ + $(MAKE) -f $(TOP)/Makefile.shared -e \ +- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ ++ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + link_app.$${shlib_target} + -(cd ..; \ --- 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 @@ @@ -48,6 +63,38 @@ if errorlevel 1 goto end echo Done compiling OpenSSL +--- 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 @@ + if [ "$(FIPSCANLIB)" = "libfips" ]; then \ + LIBRARIES="-L$(TOP) -lfips"; \ + elif [ -n "$(FIPSCANLIB)" ]; then \ +- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ + LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \ + else \ + LIBRARIES="$(LIBCRYPTO)"; \ + fi; \ + $(MAKE) -f $(TOP)/Makefile.shared -e \ +- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ ++ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + link_app.$${shlib_target} + +@@ -417,11 +417,11 @@ + fi; \ + LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \ + if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \ +- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ + fi; \ + [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ + $(MAKE) -f $(TOP)/Makefile.shared -e \ +- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ ++ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + link_app.$${shlib_target} + --- misc/openssl-0.9.8k/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200 +++ misc/build/openssl-0.9.8k/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200 @@ -6,11 +6,11 @@ |