Code for better build under Darwin (MacOS X).

Submitted by Brad Dominy <jdominy@darwinuser.org>

diff --git a/Configure b/Configure
index cd6afd8babd2015bebf7a185268d7f84a9af0660..dc372a20428e18c09203fe714c1d98b3567c6777 100755 (executable)
--- 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 5da9b12404847a9fa78d451ad3b5396767b2130a..3bdf898882582a24ec190cb8f9ee37f358a2bf71 100644 (file)
--- 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 1b44dc6ba306df0ac5af25b0cec46be3fd4d2feb..a6411528afab6ce31202fc03d4bab854a78525b5 100755 (executable)
--- 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 99df5c303ee233a49494e1de61e1126953c47ae2..171dada2cabb1eb468dfb99359fa7214bc8bca90 100644 (file)
--- 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 5b2077b6430a3571c6d749dc836bd97f4a0b7ce6..f346af64f308080160d68ba15d868023a8ceacbb 100644 (file)
--- 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 2c816671542b115633b2eb59e6ac05115eceb7de..b554ac8cf857bc19033650918a50d8ecf7e4068b 100644 (file)
--- a/crypto/bn/bnspeed.c
+++ b/crypto/bn/bnspeed.c
@@ -71,7 +71,7 @@
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 
-#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 91dc7ff9a7c7c4f85f1d8593a7fd2b9b2f30f0cd..07a1bcf51cfcfccd896304272370d15b5d4da4e3 100644 (file)
--- 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 <openssl/err.h>
 #include <openssl/rand.h>
 
-#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 6e00b90f9d4141e8e7a35bf758cbc30d12c9adee..76abf50d98413927c8fd7c35587bea6495d4ab20 100644 (file)
--- 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 c1076757bb089f0f226aa7f87d5a8a63414df6d9..b53ad3a96d4b678b1d4e9e639440bfedf7fa1884 100644 (file)
--- 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 1c58b76d871aed78770265874b29d0a362c004ab..f211e7c3ef9f507ab21aec08c806ee1e19f6a897 100644 (file)
--- 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 755c7d8b9bf651eb833d95bcaad5910c43ef4384..48ffaff5209c61b1c9fc7cd3fb3934445a0b2ba2 100644 (file)
--- 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 866251e68bc3849daf548ebdca3aa0217f4a1eab..47d34b444e5b4efe0d439ba329bb47b67fd07c82 100644 (file)
--- 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 cea385178bd0d907b58a9852332180451dcf3bb3..ced98c52df948b8065f4ee5cd858b261bc13be18 100644 (file)
--- 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 c6b27255ae69094f4dfd4ef536bbe0f6df7894d6..7d490d5b77fb8524dee254c0d57a029bc7463839 100644 (file)
--- 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 6d40bd7ef30e92f9f2ef4899ef40892c1dbcfd25..eccba43c0b54400461d9409918042f17924c528e 100644 (file)
--- 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