<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.6
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/c323cefeeb5a4646bebd332ab5b1054670f2fa70">https://github.com/macports/macports-base/commit/c323cefeeb5a4646bebd332ab5b1054670f2fa70</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c323cefeeb5a4646bebd332ab5b1054670f2fa70
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sat Mar 30 00:05:06 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    Improve filter of 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 d6ea0c88c86d22286eb4cdea2b0dfd85eebc9d8b)
</span>---
 src/port1.0/portconfigure.tcl | 12 ++++--------
 1 file changed, 4 insertions(+), 8 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 fbad66d9..be7c68c0 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;'>@@ -388,14 +388,7 @@ proc portconfigure::configure_start {args} {
</span> # universal_archs
 proc portconfigure::choose_supported_archs {archs} {
     global supported_archs configure.sdk_version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # macOS 10.14 SDK only supports one arch, x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${configure.sdk_version} ne "" && [vercmp ${configure.sdk_version} 10.14] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {"x86_64" in $archs && ($supported_archs eq "" || "x86_64" in $supported_archs)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            return x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            return ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } elseif {$supported_archs eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {$supported_archs eq ""} {
</span>         return $archs
     }
     set ret {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -403,6 +396,9 @@ proc portconfigure::choose_supported_archs {archs} {
</span>         if {$arch in $supported_archs} {
             set add_arch $arch
         } elseif {$arch eq "x86_64" && "i386" in $supported_archs} {
<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;'>+                continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span>             set add_arch "i386"
         } elseif {$arch eq "ppc64" && "ppc" in $supported_archs} {
             set add_arch "ppc"
</pre><pre style='margin:0'>

</pre>