Attachment #76317 for issue #117693

View | Details | Raw Unified | Return to issue 117693
Collapse All | Expand All




			PERL!:=$(PERL_bak)
		.ENDIF

		OUT32DLL_FOLDER=out32dll
		.IF "$(DBG_LEVEL)" != "0"
			debug_openssl:=true
			.EXPORT : debug_openssl		
			OUT32DLL_FOLDER=out32dll.dbg
		.ENDIF
		CONFIGURE_ACTION=$(PERL) configure
		CONFIGURE_FLAGS=VC-WIN32
		BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak

		OUT2LIB = $(OUT32DLL_FOLDER)$/ssleay32.lib
		OUT2LIB += $(OUT32DLL_FOLDER)$/libeay32.lib
		OUT2BIN = $(OUT32DLL_FOLDER)$/ssleay32.dll
		OUT2BIN += $(OUT32DLL_FOLDER)$/libeay32.dll
		OUT2INC = inc32$/openssl$/*
	.ENDIF
.ENDIF

Lines 1-27 Link Here

(-)a/openssl/openssl.patch

Lines 41-48 Link Here

(-)- misc/openssl-0.9.8o/ms/do_ms.bat
41	-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def	19	-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
42	+%1 util\mkdef.pl 32 libeay > ms\libeay32.def	20	+%1 util\mkdef.pl 32 libeay > ms\libeay32.def
43	+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def	21	+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def

Lines 73-80 Link Here

(-)- misc/openssl-0.9.8o/util/mk1mf.pl
73	#define PLATFORM "$platform"	51	#define PLATFORM "$platform"
74	EOF	52	EOF
75	printf OUT " #define DATE \"%s\"\n", scalar gmtime();	53	printf OUT " #define DATE \"%s\"\n", scalar gmtime();

Return to issue 117693

Lines 150-164 Link Here

(-)a/openssl/makefile.mk (-5 / +10 lines)
150	PERL!:=$(PERL_bak)	150	PERL!:=$(PERL_bak)
151	.ENDIF	151	.ENDIF
152		152
153	#CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure	153	OUT32DLL_FOLDER=out32dll
		154	.IF "$(DBG_LEVEL)" != "0"
		155	debug_openssl:=true
		156	.EXPORT : debug_openssl
		157	OUT32DLL_FOLDER=out32dll.dbg
		158	.ENDIF
154	CONFIGURE_ACTION=$(PERL) configure	159	CONFIGURE_ACTION=$(PERL) configure
155	CONFIGURE_FLAGS=VC-WIN32	160	CONFIGURE_FLAGS=VC-WIN32
156	BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak	161	BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak
157		162
158	OUT2LIB = out32dll$/ssleay32.lib	163	OUT2LIB = $(OUT32DLL_FOLDER)$/ssleay32.lib
159	OUT2LIB += out32dll$/libeay32.lib	164	OUT2LIB += $(OUT32DLL_FOLDER)$/libeay32.lib
160	OUT2BIN = out32dll$/ssleay32.dll	165	OUT2BIN = $(OUT32DLL_FOLDER)$/ssleay32.dll
161	OUT2BIN += out32dll$/libeay32.dll	166	OUT2BIN += $(OUT32DLL_FOLDER)$/libeay32.dll
162	OUT2INC = inc32$/openssl$/*	167	OUT2INC = inc32$/openssl$/*
163	.ENDIF	168	.ENDIF
164	.ENDIF	169	.ENDIF