INTEGRATION: CWS mingwport09 (1.1.4); FILE ADDED

2007/12/11 12:37:33 vg 1.1.4.2: #i83133# catch-up fixes for MinGW port
2007/11/30 15:39:01 vg 1.1.4.1: file opensslmingw.patch was added on branch cws_src680_mingwport09 on 2007-12-11 12:37:32 +0000

1 files changed, 113 insertions, 0 deletions

diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch
new file mode 100755
index 000000000000..89f859e6eee8
--- /dev/null
+++ b/openssl/opensslmingw.patch
@@ -0,0 +1,113 @@
+*** misc/openssl-0.9.8e/Makefile.shared	Sat May 20 17:51:09 2006
+--- misc/build/openssl-0.9.8e/Makefile.shared	Fri Nov 23 17:19:37 2007
+***************
+*** 248,260 ****
+  	@ $(CALC_VERSIONS); \
+  	INHIBIT_SYMLINKS=yes; \
+  	SHLIB=cyg$(LIBNAME); \
+! 	expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
+  	SHLIB_SUFFIX=.dll; \
+! 	SHLIB_SOVER=-$(LIBVERSION); \
+  	ALLSYMSFLAGS='-Wl,--whole-archive'; \
+  	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+  	base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
+! 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -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; \
+--- 248,260 ----
+  	@ $(CALC_VERSIONS); \
+  	INHIBIT_SYMLINKS=yes; \
+  	SHLIB=cyg$(LIBNAME); \
+! 	expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32 && [ $(LIBNAME) = "crypto" ] && SHLIB=libeay32 ; \
+  	SHLIB_SUFFIX=.dll; \
+! 	SHLIB_SOVER=; \
+  	ALLSYMSFLAGS='-Wl,--whole-archive'; \
+  	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+  	base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
+! 	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.8e/ms/mingw32.bat	Fri May  5 22:19:33 2006
+--- misc/build/openssl-0.9.8e/ms/mingw32.bat	Fri Nov 23 17:19:37 2007
+***************
+*** 79,91 ****
+  rem copy ms\tlhelp32.h outinc
+  
+  echo Building the libraries
+! mingw32-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
+  if errorlevel 1 goto end
+! dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
+  if errorlevel 1 goto end
+  
+  echo Done compiling OpenSSL
+--- 79,97 ----
+  rem copy ms\tlhelp32.h outinc
+  
+  echo Building the libraries
+! make -f ms/mingw32a.mak
+  if errorlevel 1 goto end
+  
+  echo Generating the DLLs and input libraries
+! 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
+! 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
+! 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
+  
+  echo Done compiling OpenSSL
+*** misc/openssl-0.9.8e/util/pl/Mingw32.pl	Fri May  5 22:19:35 2006
+--- misc/build/openssl-0.9.8e/util/pl/Mingw32.pl	Fri Nov 23 17:19:37 2007
+***************
+*** 6,16 ****
+  $o='/';
+  $cp='cp';
+  $rm='rm -f';
+! $mkdir='gmkdir';
+  
+! $o='\\';
+! $cp='copy';
+! $rm='del';
+  $mkdir='mkdir';
+  
+  # C compiler stuff
+--- 6,16 ----
+  $o='/';
+  $cp='cp';
+  $rm='rm -f';
+! #$mkdir='gmkdir';
+  
+! #$o='\\';
+! #$cp='copy';
+! #$rm='del';
+  $mkdir='mkdir';
+  
+  # C compiler stuff
+***************
+*** 87,93 ****
+  	($Name=$name) =~ tr/a-z/A-Z/;
+  
+  	$ret.="$target: \$(${Name}OBJ)\n";
+! 	$ret.="\tif exist $target \$(RM) $target\n";
+  	$ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
+  	$ret.="\t\$(RANLIB) $target\n\n";
+  	}
+--- 87,94 ----
+  	($Name=$name) =~ tr/a-z/A-Z/;
+  
+  	$ret.="$target: \$(${Name}OBJ)\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";
+  	}