summaryrefslogtreecommitdiff
path: root/openssl/opensslmingw.patch
blob: 3103fab712dfd20bd4c67695d759430d4deb0ba5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
*** misc/openssl-0.9.8g/Makefile.shared	Sun Sep 16 23:11:51 2007
--- misc/build/openssl-0.9.8g/Makefile.shared	Sat Feb  9 09:46:23 2008
***************
*** 254,266 ****
  	base=-Wl,--enable-auto-image-base; \
  	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
  		SHLIB=$(LIBNAME)eay32; \
! 		base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
  	fi; \
  	SHLIB_SUFFIX=.dll; \
! 	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"; \
  	[ -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; \
! 		base=;  \
!                 if test $(LIBNAME) = "crypto"; then \
!                         SHLIB=libeay32; \
!                         base=-Wl,--image-base,0x63000000; \
!                 fi; \
  	fi; \
  	SHLIB_SUFFIX=.dll; \
! 	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"; \
  	[ -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
***************
*** 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.8g/util/pl/Mingw32.pl	Fri May  5 22:19:35 2006
--- misc/build/openssl-0.9.8g/util/pl/Mingw32.pl	Mon Feb  4 21:11:50 2008
***************
*** 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";
  	}