<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/918c34729bb3b4f33c822cec384f86b8c6d99a54">https://github.com/macports/macports-base/commit/918c34729bb3b4f33c822cec384f86b8c6d99a54</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 918c347 Improve explanations in check_supported_archs
</span>918c347 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 918c34729bb3b4f33c822cec384f86b8c6d99a54
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Nov 16 07:32:30 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> Improve explanations in check_supported_archs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/57245
</span>---
src/port1.0/portutil.tcl | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d9b98ea..f9c6891 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3188,14 +3188,33 @@ proc check_supported_archs {} {
</span> } elseif {[variant_exists universal] && [variant_isset universal]} {
if {[llength ${configure.universal_archs}] > 1 || $universal_archs eq ${configure.universal_archs}} {
return 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set unsupported ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$supported_archs ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch $universal_archs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$arch ni $supported_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set unsupported $arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$unsupported ne ""} {
</span> ui_error "$subport cannot be installed for the configured universal_archs '$universal_archs' because it only supports the arch(s) '$supported_archs'."
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch $universal_archs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$arch ni ${configure.universal_archs}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend unsupported $arch
</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;'>+ ui_error "$subport cannot be installed for the configured universal_archs '$universal_archs' because the arch(s) '$unsupported' are not supported."
</span> }
} elseif {$build_arch eq "" || ${configure.build_arch} ne ""} {
return 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$supported_archs ne "" && $build_arch ni $supported_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "$subport cannot be installed for the configured build_arch '$build_arch' because it only supports the arch(s) '$supported_archs'."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "$subport cannot be installed for the configured build_arch '$build_arch' because it is not supported."
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$subport cannot be installed for the configured build_arch '$build_arch' because it only supports the arch(s) '$supported_archs'."
</span> return 1
}
</pre><pre style='margin:0'>
</pre>