<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115429] trunk/base</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115429">115429</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-01-01 16:22:16 -0800 (Wed, 01 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Turn SDK version and deployment target into separate options</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasedocportfile7">trunk/base/doc/portfile.7</a></li>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#trunkbasesrcport10portconfiguretcl">trunk/base/src/port1.0/portconfigure.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasedocportfile7"></a>
<div class="modfile"><h4>Modified: trunk/base/doc/portfile.7 (115428 => 115429)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -319,7 +319,18 @@
</span><span class="cx"> .Em (current OS version)
</span><span class="cx"> .br
</span><span class="cx"> .Sy Example:
</span><del>-.Dl macosx_deployment_target 10.4
</del><ins>+.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
</ins><span class="cx"> .It Ic use_parallel_build
</span><span class="cx"> If set to yes (and the user has enabled buildmakejobs in
</span><span class="cx"> .Pa macports.conf
</span></span></pre></div>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (115428 => 115429)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> porttrace portverbose keeplogs destroot_umask variants_conf rsync_server rsync_options \
</span><span class="cx"> rsync_dir startupitem_type startupitem_install place_worksymlink xcodeversion xcodebuildcmd \
</span><span class="cx"> configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \
</span><del>- applications_dir frameworks_dir developer_dir universal_archs build_arch macosx_deployment_target \
</del><ins>+ applications_dir frameworks_dir developer_dir universal_archs build_arch macosx_sdk_version macosx_deployment_target \
</ins><span class="cx"> macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip \
</span><span class="cx"> master_site_local patch_site_local archive_site_local buildfromsource \
</span><span class="cx"> revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds \
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> rsync_server rsync_options rsync_dir startupitem_type startupitem_install place_worksymlink macportsuser \
</span><span class="cx"> configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \
</span><span class="cx"> applications_dir current_phase frameworks_dir developer_dir universal_archs build_arch \
</span><del>- os_arch os_endian os_version os_major os_platform macosx_version macosx_deployment_target \
</del><ins>+ os_arch os_endian os_version os_major os_platform macosx_version macosx_sdk_version macosx_deployment_target \
</ins><span class="cx"> packagemaker_path default_compilers sandbox_enable delete_la_files cxx_stdlib \
</span><span class="cx"> pkg_post_unarchive_deletions $user_options"
</span><span class="cx">
</span><span class="lines">@@ -575,6 +575,7 @@
</span><span class="cx"> macports::os_major \
</span><span class="cx"> macports::os_platform \
</span><span class="cx"> macports::macosx_version \
</span><ins>+ macports::macosx_sdk_version \
</ins><span class="cx"> macports::macosx_deployment_target \
</span><span class="cx"> macports::archivefetch_pubkeys \
</span><span class="cx"> macports::ping_cache \
</span><span class="lines">@@ -956,6 +957,9 @@
</span><span class="cx"> if {![info exists macports::macosx_deployment_target]} {
</span><span class="cx"> set macports::macosx_deployment_target $macosx_version
</span><span class="cx"> }
</span><ins>+ if {![info exists macports::macosx_sdk_version]} {
+ set macports::macosx_sdk_version $macosx_version
+ }
</ins><span class="cx">
</span><span class="cx"> if {![info exists macports::revupgrade_autorun]} {
</span><span class="cx"> set macports::revupgrade_autorun yes
</span></span></pre></div>
<a id="trunkbasesrcport10portconfiguretcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portconfigure.tcl (115428 => 115429)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -327,18 +327,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc portconfigure::configure_get_sdkroot {} {
</span><del>- global developer_dir macosx_deployment_target macosx_version xcodeversion os.arch os.platform
- if {${os.platform} == "darwin" && ($macosx_deployment_target != $macosx_version
</del><ins>+ global developer_dir macosx_sdk_version macosx_version xcodeversion os.arch os.platform
+ if {${os.platform} == "darwin" && ($macosx_sdk_version != $macosx_version
</ins><span class="cx"> || (${os.arch} == "powerpc" && $macosx_version == "10.4" && [variant_exists universal] && [variant_isset universal]))} {
</span><span class="cx"> if {[vercmp $xcodeversion 4.3] < 0} {
</span><span class="cx"> set sdks_dir "${developer_dir}/SDKs"
</span><span class="cx"> } else {
</span><span class="cx"> set sdks_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs"
</span><span class="cx"> }
</span><del>- if {$macosx_deployment_target == "10.4"} {
</del><ins>+ if {$macosx_sdk_version == "10.4"} {
</ins><span class="cx"> set sdk "${sdks_dir}/MacOSX10.4u.sdk"
</span><span class="cx"> } else {
</span><del>- set sdk "${sdks_dir}/MacOSX${macosx_deployment_target}.sdk"
</del><ins>+ set sdk "${sdks_dir}/MacOSX${macosx_sdk_version}.sdk"
</ins><span class="cx"> }
</span><span class="cx"> if {[file exists $sdk]} {
</span><span class="cx"> return $sdk
</span></span></pre>
</div>
</div>
</body>
</html>