[Pcsclite-git-commit] [CCID] 04/04: MacOSX/configure: check for UB only on Mavericks and less

[Ludovic Rousseau]

This is an automated email from the git hooks/post-receive script.

rousseau pushed a commit to branch master
in repository CCID.

commit eea7b5835a7b91cb26d52bf3b9548afc322e83d9
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Fri Dec 16 10:35:35 2016 +0100

    MacOSX/configure: check for UB only on Mavericks and less
    
    On Yosemite (10.10) and later we will provide only a 64-bit driver.
    So no need to check if a Universal Binary libusb is available.
    
    Support of 32-bits computers has been droped with Lion 10.7.
---
 MacOSX/configure | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/MacOSX/configure b/MacOSX/configure
index ce2c39f..7a79185 100755
--- a/MacOSX/configure
+++ b/MacOSX/configure
@@ -67,21 +67,25 @@ CFLAGS="$CFLAGS -DRESPONSECODE_DEFINED_IN_WINTYPES_H"
 # get the Mac OS X major version. Example: El Capitan 10.11 -> 10011
 MAC_VERSION=$(sw_vers -productVersion | awk -F '.' '{print $1 * 1000 + $2}')
 
-# Build a Universal Binary
-UB=$(file $LIBUSB_ARCHIVE | grep "Mach-O universal binary")
-echo $UB
-if [ -z "$UB" ]
+# check for Universal Binary only on macOS Mavericks 10.9 and earlier
+if [ $MAC_VERSION -le 10009 ]
 then
-	echo -en $RED
-	echo "*************************"
-	echo "No Universal Binary build"
-	echo "*************************"
-	echo -en $NORMAL
-else
-	echo "Universal Binary build"
-	CFLAGS="$CFLAGS -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -arch i386 -arch x86_64"
+	# Build a Universal Binary?
+	UB=$(file $LIBUSB_ARCHIVE | grep "Mach-O universal binary")
+	echo $UB
+	if [ -z "$UB" ]
+	then
+		echo -en $RED
+		echo "*************************"
+		echo "No Universal Binary build"
+		echo "*************************"
+		echo -en $NORMAL
+	else
+		echo "Universal Binary build"
+		CFLAGS="$CFLAGS -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -arch i386 -arch x86_64"
+	fi
+	echo
 fi
-echo
 
 CONFIGURE_ARGS="--disable-dependency-tracking"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pcsclite/CCID.git