Commit 1794904a authored by Richard Levitte's avatar Richard Levitte
Browse files

DJGPP patches. 

PR: 347
parent fd28279a

INSTALL.DJGPP

+8 −6
Original line number Diff line number Diff line
@@ -12,12 +12,14 @@ 
 latest versions of DJGPP, GCC, BINUTILS, BASH, etc. This package

 requires that PERL and BC also be installed.



 All of these can be obtained from the usual DJGPP mirror sites, such as

 "ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp". You also need to have

 the WATT-32 networking package installed before you try to compile

 openssl. This can be obtained from "http://www.bgnett.no/~giva/". The

 Makefile assumes that the WATT-32 code is in directory "watt32" under

 /dev/env/DJDIR.

 All of these can be obtained from the usual DJGPP mirror sites, such

 as "ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp". You also need to

 have the WATT-32 networking package installed before you try to compile

 openssl. This can be obtained from "http://www.bgnett.no/~giva/".

 The Makefile assumes that the WATT-32 code is in the directory

 specified by the environment variable WATT_ROOT. If you have watt-32

 in directory "watt32" under your main DJGPP directory, specify

 WATT_ROOT="/dev/env/DJDIR/watt32".



 To compile openssl, start your BASH shell. Then configure for DOS by

 running "./Configure" with appropriate arguments. The basic syntax for

Makefile.org

+4 −1
Original line number Diff line number Diff line
@@ -594,10 +594,11 @@ dclean: 


rehash: rehash.time

rehash.time: certs

	@(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \

	@(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; 

		export OPENSSL OPENSSL_DEBUG_MEMORY; \

		LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \

		if [ "$(PLATFORM)" != "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \

		if [ "$(PLATFORM)" != "DJGPP" ]; then PATH="`pwd`\;$$PATH"; fi; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		$(PERL) tools/c_rehash certs)

	touch rehash.time
@@ -609,8 +610,10 @@ tests: rehash 
	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );

	@LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \

		if [ "$(PLATFORM)" != "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \

		if [ "$(PLATFORM)" != "DJGPP" ]; then PATH="`pwd`\;$$PATH"; fi; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		apps/openssl version -a

endif



report:

	@$(PERL) util/selftest.pl

e_os.h

+3 −0
Original line number Diff line number Diff line
@@ -201,6 +201,9 @@ extern "C" { 
#  ifdef __DJGPP__

#    include <unistd.h>

#    include <sys/stat.h>

#    include <sys/socket.h>

#    include <tcp.h>

#    include <netdb.h>

#    define _setmode setmode

#    define _O_TEXT O_TEXT

#    define _O_BINARY O_BINARY

test/Makefile.ssl

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ apps: 


SET_SO_PATHS=LIBPATH="`cd ..; pwd`"; LD_LIBRARY_PATH="$$LIBPATH"; DYLD_LIBRARY_PATH="$$LIBPATH"; SHLIB_PATH="$$LIBPATH"; \

		if [ "$(PLATFORM)" != "Cygwin" ]; then PATH="$$LIBPATH:$$PATH"; fi; \

		if [ "$(PLATFORM)" != "DJGPP" ]; then PATH="`pwd`\;$$PATH"; fi; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH



alltests: \