[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3dfcb6a0ecbc210899e4b674331d0294189281b9 (commit)
      from  7ad5fb6267e9da1634998bf2eccaa753f443fa83 (commit)


- Log -----------------------------------------------------------------
commit 3dfcb6a0ecbc210899e4b674331d0294189281b9
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue May 10 23:22:29 2016 +0200

    Add a case for 64-bit OS X in config
    
    This makes it possible to just run ./config on a x86_64 machine with
    no extra fuss.
    
    RT#4356
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES |  9 +++++++++
 config  | 21 ++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 0b533ac..6933da6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,15 @@
 
  Changes between 1.0.2g and 1.1.0  [xx XXX xxxx]
 
+  *) Automatic Darwin/OSX configuration has had a refresh, it will now
+     recognise x86_64 architectures automatically.  You can still decide
+     to build for a different bitness with the environment variable
+     KERNEL_BITS (can be 32 or 64), for example:
+
+         KERNEL_BITS=32 ./config
+
+     [Richard Levitte]
+
   *) Change default algorithms in pkcs8 utility to use PKCS#5 v2.0,
      256 bit AES and HMAC with SHA256.
      [Steve Henson]
diff --git a/config b/config
index 33682fb..dfdca4d 100755
--- a/config
+++ b/config
@@ -261,6 +261,9 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	    Power*)
 		echo "ppc-apple-darwin${VERSION}"
 		;;
+	    x86_64)
+		echo "x86_64-apple-darwin${VERSION}"
+		;;
 	    *)
 		echo "i686-apple-darwin${VERSION}"
 		;;
@@ -503,7 +506,7 @@ case "$GUESSOS" in
 	ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
 	if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
 	    echo "WARNING! If you wish to build 64-bit library, then you have to"
-	    echo "         invoke '$THERE/Configure darwin64-x86_64-cc $options' *manually*."
+	    echo "         invoke 'KERNEL_BITS=64 $THERE/config $options'."
 	    if [ "$TEST" = "false" -a -t 1 ]; then
 	      echo "         You have about 5 seconds to press Ctrl-C to abort."
 	      # The stty technique used elsewhere doesn't work on
@@ -516,6 +519,22 @@ case "$GUESSOS" in
 	else
 	    OUT="darwin-i386-cc"
 	fi ;;
+  x86_64-apple-darwin*)
+	if [ -z "$KERNEL_BITS" ]; then
+	    echo "WARNING! If you wish to build 32-bit library, then you have to"
+	    echo "         invoke 'KERNEL_BITS=32 $THERE/config $options'."
+	    if [ "$TEST" = "false" -a -t 1 ]; then
+	      echo "         You have about 5 seconds to press Ctrl-C to abort."
+	      # The stty technique used elsewhere doesn't work on
+	      # MacOS. At least, right now on this Mac.
+	      sleep 5
+	    fi
+	fi
+	if [ "$KERNEL_BITS" = "32" ]; then
+	    OUT="darwin-i386-cc"
+	else
+	    OUT="darwin64-x86_64-cc"
+	fi ;;
   armv6+7-*-iphoneos)
 	options="$options -arch%20armv6 -arch%20armv7"
 	OUT="iphoneos-cross" ;;