Revision: 115429 https://trac.macports.org/changeset/115429 Author: jeremyhu@macports.org Date: 2014-01-01 16:22:16 -0800 (Wed, 01 Jan 2014) Log Message: ----------- Turn SDK version and deployment target into separate options Modified Paths: -------------- trunk/base/doc/portfile.7 trunk/base/src/macports1.0/macports.tcl trunk/base/src/port1.0/portconfigure.tcl Modified: trunk/base/doc/portfile.7 =================================================================== --- trunk/base/doc/portfile.7 2014-01-02 00:04:28 UTC (rev 115428) +++ trunk/base/doc/portfile.7 2014-01-02 00:22:16 UTC (rev 115429) @@ -319,7 +319,18 @@ .Em (current OS version) .br .Sy Example: -.Dl macosx_deployment_target 10.4 +.Dl macosx_deployment_target 10.8 +.It Ic macosx_sdk_version +SDK version to build against. +.br +.Sy Type: +.Em optional +.br +.Sy Default: +.Em (current OS version) +.br +.Sy Example: +.Dl macosx_sdk_version 10.8 .It Ic use_parallel_build If set to yes (and the user has enabled buildmakejobs in .Pa macports.conf Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2014-01-02 00:04:28 UTC (rev 115428) +++ trunk/base/src/macports1.0/macports.tcl 2014-01-02 00:22:16 UTC (rev 115429) @@ -45,7 +45,7 @@ porttrace portverbose keeplogs destroot_umask variants_conf rsync_server rsync_options \ rsync_dir startupitem_type startupitem_install place_worksymlink xcodeversion xcodebuildcmd \ configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ - applications_dir frameworks_dir developer_dir universal_archs build_arch macosx_deployment_target \ + applications_dir frameworks_dir developer_dir universal_archs build_arch macosx_sdk_version macosx_deployment_target \ macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip \ master_site_local patch_site_local archive_site_local buildfromsource \ revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds \ @@ -59,7 +59,7 @@ rsync_server rsync_options rsync_dir startupitem_type startupitem_install place_worksymlink macportsuser \ configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ applications_dir current_phase frameworks_dir developer_dir universal_archs build_arch \ - os_arch os_endian os_version os_major os_platform macosx_version macosx_deployment_target \ + os_arch os_endian os_version os_major os_platform macosx_version macosx_sdk_version macosx_deployment_target \ packagemaker_path default_compilers sandbox_enable delete_la_files cxx_stdlib \ pkg_post_unarchive_deletions $user_options" @@ -575,6 +575,7 @@ macports::os_major \ macports::os_platform \ macports::macosx_version \ + macports::macosx_sdk_version \ macports::macosx_deployment_target \ macports::archivefetch_pubkeys \ macports::ping_cache \ @@ -956,6 +957,9 @@ if {![info exists macports::macosx_deployment_target]} { set macports::macosx_deployment_target $macosx_version } + if {![info exists macports::macosx_sdk_version]} { + set macports::macosx_sdk_version $macosx_version + } if {![info exists macports::revupgrade_autorun]} { set macports::revupgrade_autorun yes Modified: trunk/base/src/port1.0/portconfigure.tcl =================================================================== --- trunk/base/src/port1.0/portconfigure.tcl 2014-01-02 00:04:28 UTC (rev 115428) +++ trunk/base/src/port1.0/portconfigure.tcl 2014-01-02 00:22:16 UTC (rev 115429) @@ -327,18 +327,18 @@ } proc portconfigure::configure_get_sdkroot {} { - global developer_dir macosx_deployment_target macosx_version xcodeversion os.arch os.platform - if {${os.platform} == "darwin" && ($macosx_deployment_target != $macosx_version + global developer_dir macosx_sdk_version macosx_version xcodeversion os.arch os.platform + if {${os.platform} == "darwin" && ($macosx_sdk_version != $macosx_version || (${os.arch} == "powerpc" && $macosx_version == "10.4" && [variant_exists universal] && [variant_isset universal]))} { if {[vercmp $xcodeversion 4.3] < 0} { set sdks_dir "${developer_dir}/SDKs" } else { set sdks_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs" } - if {$macosx_deployment_target == "10.4"} { + if {$macosx_sdk_version == "10.4"} { set sdk "${sdks_dir}/MacOSX10.4u.sdk" } else { - set sdk "${sdks_dir}/MacOSX${macosx_deployment_target}.sdk" + set sdk "${sdks_dir}/MacOSX${macosx_sdk_version}.sdk" } if {[file exists $sdk]} { return $sdk