macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

use sw_vers -productVersion (breaks jaguar compatibility)

Browse Source 
fix universal target/sdkroot detection on 10.x.>0 releases

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@47706 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Toby Peterson
2009-03-04 04:43:46 +00:00
parent 50cd3a2a4a
commit b0b57c87d6
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aclocal.m4
Vendored
+6 -4
View File
@@ -494,15 +494,17 @@ AC_DEFUN([MP_UNIVERSAL_OPTIONS],[
AC_ARG_WITH(universal-sysroot,[AC_HELP_STRING([--with-universal-sysroot=SDK], [Universal SDK sysroot (with complete path)])], UNIVERSAL_SYSROOT=${withval})
AC_ARG_WITH(universal-archs,[AC_HELP_STRING([--with-universal-archs="CPU"], [Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
MACOSX_MAJOR_VERSION=`$SW_VERS -productVersion | cut -f-2 -d.`
if test "x$UNIVERSAL_TARGET" = "x"; then
UNIVERSAL_TARGET=${MACOSX_VERSION}
UNIVERSAL_TARGET=${MACOSX_MAJOR_VERSION}
fi
if test "x$UNIVERSAL_SYSROOT" = "x"; then
if test "${MACOSX_VERSION}" = "10.4"; then
UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_VERSION}u.sdk
if test "${MACOSX_MAJOR_VERSION}" = "10.4"; then
UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_MAJOR_VERSION}u.sdk
else
UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_VERSION}.sdk
UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_MAJOR_VERSION}.sdk
fi
fi
configure
Vendored
+7 -5
View File
@@ -2247,7 +2247,7 @@ done
if test "x$SW_VERS" != "x"; then
{ $as_echo "$as_me:$LINENO: checking Mac OS X version" >&5
$as_echo_n "checking Mac OS X version... " >&6; }
MACOSX_VERSION=`$SW_VERS | sed -n "s/^ProductVersion:[[:space:]]//p" | cut -f 1-3 -d.`
MACOSX_VERSION=`$SW_VERS -productVersion`
{ $as_echo "$as_me:$LINENO: result: $MACOSX_VERSION" >&5
$as_echo "$MACOSX_VERSION" >&6; }
fi
@@ -7205,15 +7205,17 @@ if test "${with_universal_archs+set}" = set; then
fi
MACOSX_MAJOR_VERSION=`$SW_VERS -productVersion | cut -f-2 -d.`
if test "x$UNIVERSAL_TARGET" = "x"; then
UNIVERSAL_TARGET=${MACOSX_VERSION}
UNIVERSAL_TARGET=${MACOSX_MAJOR_VERSION}
fi
if test "x$UNIVERSAL_SYSROOT" = "x"; then
if test "${MACOSX_VERSION}" = "10.4"; then
UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_VERSION}u.sdk
if test "${MACOSX_MAJOR_VERSION}" = "10.4"; then
UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_MAJOR_VERSION}u.sdk
else
UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_VERSION}.sdk
UNIVERSAL_SYSROOT=/Developer/SDKs/MacOSX${MACOSX_MAJOR_VERSION}.sdk
fi
fi
configure.ac
+1 -1
View File
@@ -19,7 +19,7 @@ MP_PATH_SCAN
AC_CHECK_PROGS(SW_VERS, sw_vers)
if test "x$SW_VERS" != "x"; then
AC_MSG_CHECKING(Mac OS X version)
MACOSX_VERSION=`$SW_VERS | sed -n "s/^ProductVersion:[[[:space:]]]//p" | cut -f 1-3 -d.`
MACOSX_VERSION=`$SW_VERS -productVersion`
AC_MSG_RESULT([$MACOSX_VERSION])
fi