From 5319be44384de8a6f8a2bf6249f3b2aa59cd8b52 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 4 Dec 2002 09:54:10 +0000 Subject: [PATCH] DJGPP patches. PR: 347 --- INSTALL.DJGPP | 14 ++++++++------ Makefile.org | 5 ++++- e_os.h | 3 +++ test/Makefile.ssl | 1 + 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/INSTALL.DJGPP b/INSTALL.DJGPP index 0120b946b5..cdeac222b2 100644 --- a/INSTALL.DJGPP +++ b/INSTALL.DJGPP @@ -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 diff --git a/Makefile.org b/Makefile.org index 3ad0a68914..c7d7c09bfa 100644 --- a/Makefile.org +++ b/Makefile.org @@ -358,10 +358,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 @@ -373,8 +374,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 diff --git a/e_os.h b/e_os.h index db9ba97ec8..f7d09c5295 100644 --- a/e_os.h +++ b/e_os.h @@ -201,6 +201,9 @@ extern "C" { # ifdef __DJGPP__ # include # include +# include +# include +# include # define _setmode setmode # define _O_TEXT O_TEXT # define _O_BINARY O_BINARY diff --git a/test/Makefile.ssl b/test/Makefile.ssl index 6b4f038faf..ddded30d32 100644 --- a/test/Makefile.ssl +++ b/test/Makefile.ssl @@ -125,6 +125,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: \ -- 2.25.1