<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.5
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/2fc221abac571f04403f8bf56952360eb2d1ef97">https://github.com/macports/macports-base/commit/2fc221abac571f04403f8bf56952360eb2d1ef97</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2fc221abac571f04403f8bf56952360eb2d1ef97
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Oct 2 09:57:56 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> filter out unsupported archs with 10.14 SDK
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 60544ceee3799833fd70164386421ad74761e6e7)
</span>---
src/port1.0/portconfigure.tcl | 11 +++++++++--
1 file changed, 9 insertions(+), 2 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 5a6a454..f4cd7fd 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;'>@@ -334,8 +334,15 @@ proc portconfigure::configure_start {args} {
</span> # configure.universal_archs based on supported_archs and build_arch or
# universal_archs
proc portconfigure::choose_supported_archs {archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global supported_archs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$supported_archs eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global supported_archs configure.sdk_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macOS 10.14 SDK only supports one arch, x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdk_version} ne "" && [vercmp ${configure.sdk_version} 10.14] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"x86_64" in $archs && "x86_64" in $supported_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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;'>+ } elseif {$supported_archs eq ""} {
</span> return $archs
}
set ret {}
</pre><pre style='margin:0'>
</pre>