From fde2065b0f3266fc7ee9e1b85733e3ddcf1c9e03 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 3 Nov 2013 20:19:22 +0200 Subject: fdo#70393: move openssl to a subdir of external Change-Id: I10bf92b18ee5ad56f1b4fbee3e4008b35b822be4 Reviewed-on: https://gerrit.libreoffice.org/6547 Reviewed-by: David Tardon Tested-by: David Tardon --- openssl/opensslmingw.patch | 109 --------------------------------------------- 1 file changed, 109 deletions(-) delete mode 100644 openssl/opensslmingw.patch (limited to 'openssl/opensslmingw.patch') diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch deleted file mode 100644 index e0dc96029d6b..000000000000 --- a/openssl/opensslmingw.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- misc/openssl-0.9.8v/Makefile.shared 2008-09-17 17:56:40.000000000 +0200 -+++ misc/build/openssl-0.9.8v/Makefile.shared 2009-03-30 11:52:53.684538000 +0200 -@@ -254,13 +254,17 @@ - base=-Wl,--enable-auto-image-base; \ - if expr $(PLATFORM) : 'mingw' > /dev/null; then \ - 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; \ - fi; \ - SHLIB_SUFFIX=.dll; \ -- 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"; \ - [ -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.8v/e_os2.h 2005-12-19 03:57:07.000000000 +0900 -+++ misc/build/openssl-0.9.8v/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.8v/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200 -+++ misc/build/openssl-0.9.8v/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200 -@@ -79,15 +79,41 @@ - rem copy ms\tlhelp32.h outinc - - echo Building the libraries --mingw32-make -f ms/mingw32a.mak -+make -f ms/mingw32a.mak - if errorlevel 1 goto end - - echo Generating the DLLs and input libraries --dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -lgdi32 -+mv out/libcrypto.a out/libcrypto_static.a -+mv out/libssl.a out/libssl_static.a -+dlltool --dllname libeay32.dll --output-lib out/libcrypto.a --input-def ms/libeay32.def - 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 -+dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def -+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 %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 %MINGW_SHARED_LIBSTDSPP% -+if errorlevel 1 goto end -+goto finished - -+:finished - echo Done compiling OpenSSL - - :end ---- misc/openssl-0.9.8v/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200 -+++ misc/build/openssl-0.9.8v/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200 -@@ -6,11 +6,11 @@ - $o='/'; - $cp='cp'; - $rm='rm -f'; --$mkdir='gmkdir'; -+#$mkdir='gmkdir'; - --$o='\\'; --$cp='copy'; --$rm='del'; -+#$o='\\'; -+#$cp='copy'; -+#$rm='del'; - $mkdir='mkdir'; - - # C compiler stuff -@@ -87,7 +87,8 @@ - ($Name=$name) =~ tr/a-z/A-Z/; - - $ret.="$target: \$(${Name}OBJ)\n"; -- $ret.="\tif exist $target \$(RM) $target\n"; -+ $ret.="\t\$(RM) $target\n"; -+# $ret.="\tif exist $target \$(RM) $target\n"; - $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n"; - $ret.="\t\$(RANLIB) $target\n\n"; - } -- cgit