From 70d70a3c81c7affbda6b626ff49097aa1714298c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 7 Mar 2001 10:04:00 +0000 Subject: [PATCH] Code for better build under Darwin (MacOS X). Submitted by Brad Dominy --- Configure | 3 ++- apps/s_time.c | 2 +- config | 13 +++++++++++-- crypto/bf/bf_opts.c | 2 +- crypto/bf/bfspeed.c | 2 +- crypto/bn/bnspeed.c | 2 +- crypto/bn/expspeed.c | 2 +- crypto/cast/cast_spd.c | 2 +- crypto/des/des_opts.c | 2 +- crypto/des/speed.c | 2 +- crypto/idea/idea_spd.c | 2 +- crypto/rc2/rc2speed.c | 2 +- crypto/rc4/rc4speed.c | 2 +- crypto/rc5/rc5speed.c | 2 +- crypto/tmdiff.c | 8 ++------ 15 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Configure b/Configure index cd6afd8bab..dc372a2042 100755 --- a/Configure +++ b/Configure @@ -423,7 +423,8 @@ my %table=( ##### MacOS X (a.k.a. Rhapsody or Darwin) setup "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", -"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", +"darwin-ppc-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::-fPIC", +"darwin-i386-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::-fPIC", ##### Sony NEWS-OS 4.x "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", diff --git a/apps/s_time.c b/apps/s_time.c index 5da9b12404..3bdf898882 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -82,7 +82,7 @@ #include "wintext.h" #endif -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/config b/config index 1b44dc6ba3..a6411528af 100755 --- a/config +++ b/config @@ -233,7 +233,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in ;; Darwin:*) - echo "ppc-apple-darwin"; exit 0 + case "$MACHINE" in + Power*) + echo "ppc-apple-darwin${VERSION}" + ;; + *) + echo "i386-apple-darwin${VERSION}" + ;; + esac + exit 0 ;; SunOS:5.*) @@ -449,7 +457,8 @@ EOF m68k-*-linux*) OUT="linux-m68k" ;; ia64-*-linux?) OUT="linux-ia64" ;; ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;; - ppc-apple-darwin) OUT="darwin-ppc-cc" ;; + ppc-apple-darwin*) OUT="darwin-ppc-cc" ;; + i386-apple-darwin*) OUT="darwin-i386-cc" ;; sparc64-*-linux2) #Before we can uncomment following lines we have to wait at least #till 64-bit glibc for SPARC is operational:-( diff --git a/crypto/bf/bf_opts.c b/crypto/bf/bf_opts.c index 99df5c303e..171dada2ca 100644 --- a/crypto/bf/bf_opts.c +++ b/crypto/bf/bf_opts.c @@ -59,7 +59,7 @@ /* define PART1, PART2, PART3 or PART4 to build only with a few of the options. * This is for machines with 64k code segment size restrictions. */ -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/bf/bfspeed.c b/crypto/bf/bfspeed.c index 5b2077b643..f346af64f3 100644 --- a/crypto/bf/bfspeed.c +++ b/crypto/bf/bfspeed.c @@ -59,7 +59,7 @@ /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/bn/bnspeed.c b/crypto/bn/bnspeed.c index 2c81667154..b554ac8cf8 100644 --- a/crypto/bn/bnspeed.c +++ b/crypto/bn/bnspeed.c @@ -71,7 +71,7 @@ #include #include -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/bn/expspeed.c b/crypto/bn/expspeed.c index 91dc7ff9a7..07a1bcf51c 100644 --- a/crypto/bn/expspeed.c +++ b/crypto/bn/expspeed.c @@ -97,7 +97,7 @@ static void genprime_cb(int p, int n, void *arg); #include #include -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/cast/cast_spd.c b/crypto/cast/cast_spd.c index 6e00b90f9d..76abf50d98 100644 --- a/crypto/cast/cast_spd.c +++ b/crypto/cast/cast_spd.c @@ -59,7 +59,7 @@ /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/des/des_opts.c b/crypto/des/des_opts.c index c1076757bb..b53ad3a96d 100644 --- a/crypto/des/des_opts.c +++ b/crypto/des/des_opts.c @@ -59,7 +59,7 @@ /* define PART1, PART2, PART3 or PART4 to build only with a few of the options. * This is for machines with 64k code segment size restrictions. */ -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/des/speed.c b/crypto/des/speed.c index 1c58b76d87..f211e7c3ef 100644 --- a/crypto/des/speed.c +++ b/crypto/des/speed.c @@ -59,7 +59,7 @@ /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/idea/idea_spd.c b/crypto/idea/idea_spd.c index 755c7d8b9b..48ffaff520 100644 --- a/crypto/idea/idea_spd.c +++ b/crypto/idea/idea_spd.c @@ -59,7 +59,7 @@ /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/rc2/rc2speed.c b/crypto/rc2/rc2speed.c index 866251e68b..47d34b444e 100644 --- a/crypto/rc2/rc2speed.c +++ b/crypto/rc2/rc2speed.c @@ -59,7 +59,7 @@ /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/rc4/rc4speed.c b/crypto/rc4/rc4speed.c index cea385178b..ced98c52df 100644 --- a/crypto/rc4/rc4speed.c +++ b/crypto/rc4/rc4speed.c @@ -59,7 +59,7 @@ /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/rc5/rc5speed.c b/crypto/rc5/rc5speed.c index c6b27255ae..7d490d5b77 100644 --- a/crypto/rc5/rc5speed.c +++ b/crypto/rc5/rc5speed.c @@ -59,7 +59,7 @@ /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ -#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) +#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) #define TIMES #endif diff --git a/crypto/tmdiff.c b/crypto/tmdiff.c index 6d40bd7ef3..eccba43c0b 100644 --- a/crypto/tmdiff.c +++ b/crypto/tmdiff.c @@ -65,12 +65,8 @@ #undef TIMES #endif -#ifndef OPENSSL_SYS_MSDOS -# ifndef OPENSSL_SYS_WIN32 -# if !defined(OPENSSL_SYS_VMS) || defined(__DECC) -# define TIMES -# endif -# endif +#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_VMS) || defined(__DECC) && !defined(OPENSSL_SYS_MACOSX) +# define TIMES #endif #ifndef _IRIX -- 2.34.1