giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #308 from martinpaljak/yosemite 

Building on newer OSX versions without xcode command line tools
This commit is contained in:
Martin Paljak 2014-11-08 18:30:40 +02:00
parent 57cd22e586 5448901160
commit 67fcda1636
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
MacOSX/build-package.in
View File

@ -1,29 +1,21 @@
#!/bin/bash
# Building the installer is only tested and supported on 10.9 with Xcode 5.0.1
# Command line tools for Xcode required, install with "xcode-select --install"
# Building the installer is only tested and supported on 10.9+ with Xcode 6.0.1
# Built package targets 10.9+
# Building should also work on older versions with older revisions or slight changes, YMMV
# You need to have the following from homebrew or macports or fink:
# autoconf automake libtool pkg-config
set -ex
test -x ./configure || ./bootstrap
BUILDPATH=${PWD}
# Use new locations for SDK on 10.8+
OSX_RELEASE=`sw_vers -productVersion`
case ${OSX_RELEASE:0:4} in
"10.8")
SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk"
export CFLAGS="-isysroot $SYSROOT -arch i386 -arch x86_64 -mmacosx-version-min=10.7"
;;
"10.9")
SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"
export CFLAGS="-isysroot $SYSROOT -arch i386 -arch x86_64 -mmacosx-version-min=10.7"
;;
*)
SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
export CFLAGS="-isysroot $SYSROOT -arch i386 -arch x86_64 -mmacosx-version-min=10.6"
;;
esac
# Locate the latest OSX SDK
SDKS_PATH="$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs"
SDK_PATH="${SDK_PATH:-$SDKS_PATH/$(ls -1 ${SDKS_PATH} | sort -n -k2 -t. -r | head -1)}"
# Set SDK path
export CFLAGS="-isysroot $SDK_PATH -arch i386 -arch x86_64 -mmacosx-version-min=10.7"
# OpenSSL is deprecated on OSX since 10.7 and that generates lots of
# "false positive" warnings and there is no alternative option.

6
configure.ac
View File

@ -530,7 +530,11 @@ if test "${enable_pcsc}" = "yes"; then
if test -z "${PCSC_CFLAGS}"; then
case "${host}" in
*-*-darwin*)
PCSC_CFLAGS="-I/System/Library/Frameworks/PCSC.framework/Headers"
# Locate the latest SDK.
SDKS_PATH="$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs"
SDK_PATH="${SDK_PATH:-$SDKS_PATH/$(ls -1 ${SDKS_PATH} | sort -n -t. -k2 -r | head -1)}"
# and set the PC/SC include path
PCSC_CFLAGS="-I$SDK_PATH/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers"
;;
*)
PCSC_CFLAGS="-I/usr/include/PCSC"