<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/b40289c17ff6fb7ee3b5c3255202d50fa5a22781">https://github.com/macports/macports-base/commit/b40289c17ff6fb7ee3b5c3255202d50fa5a22781</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b40289c17ff6fb7ee3b5c3255202d50fa5a22781
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sat Mar 4 17:02:12 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> portconfigure: Refactor configure_get_sdkroot to be more readable
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
src/port1.0/portconfigure.tcl | 46 +++++++++++++++++++++++++++++--------------
1 file changed, 31 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a62a423..4048398 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -378,22 +378,38 @@ proc portconfigure::configure_get_ld_archflags {} {
</span>
proc portconfigure::configure_get_sdkroot {sdk_version} {
global developer_dir macosx_version xcodeversion os.arch os.platform
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ($sdk_version ne $macosx_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (${os.arch} eq "powerpc" && $macosx_version eq "10.4" && [variant_exists universal] && [variant_isset universal]))} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $xcodeversion 4.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks_dir ${developer_dir}/SDKs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdks_dir ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$sdk_version eq "10.4"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdk ${sdks_dir}/MacOSX10.4u.sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdk ${sdks_dir}/MacOSX${sdk_version}.sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists $sdk]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is only relevant for macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Special hack for Tiger/ppc, since the system libraries do not contain intel slices
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "powerpc" && $macosx_version eq "10.4" && [variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${developer_dir}/SDKs//MacOSX10.4u.sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use the DevSDK (eg: /usr/include) if the requested SDK version matches the host version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$sdk_version eq $macosx_version} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $xcodeversion 4.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdks_dir ${developer_dir}/SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdks_dir ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$sdk_version eq "10.4"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk ${sdks_dir}/MacOSX10.4u.sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk ${sdks_dir}/MacOSX${sdk_version}.sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists $sdk]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> return {}
}
</pre><pre style='margin:0'>
</pre>