<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/21a1d7163e4d33261f01a95e84a6485129f4ac1d">https://github.com/macports/mpbb/commit/21a1d7163e4d33261f01a95e84a6485129f4ac1d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 21a1d7163e4d33261f01a95e84a6485129f4ac1d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Aug 13 14:13:43 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> Refactor arch-specific exclusions using switch
</span>---
tools/sort-with-subports.tcl | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/sort-with-subports.tcl b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ec02ad..2123ca3 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,12 +184,20 @@ while {$todo ne {}} {
</span> if {$outputports($p) == 1 && $::macports::os_major <= 10} {
if {$opened == 1 || ![catch {mportopen $portinfo(porturl) [list subport $portinfo(name)] ""} result]} {
set supported_archs [_mportkey $result supported_archs]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$::macports::os_arch eq "i386" && !${is_64bit_capable} && $supported_archs ne "" && ("x86_64" ni $supported_archs || "i386" ni $supported_archs)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "Excluding $portinfo(name) because the ${::macports::macosx_version}_x86_64 builder will build it"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set outputports($p) 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {$::macports::os_arch eq "powerpc" && $supported_archs ne "" && $supported_archs ne "noarch" && "ppc" ni $supported_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "Excluding $portinfo(name) because it does not support the ppc arch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set outputports($p) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch $::macports::os_arch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!${is_64bit_capable} && $supported_archs ne "" && ("x86_64" ni $supported_archs || "i386" ni $supported_archs)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts stderr "Excluding $portinfo(name) because the ${::macports::macosx_version}_x86_64 builder will build it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set outputports($p) 0
</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;'>+ powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$supported_archs ne "" && $supported_archs ne "noarch" && "ppc" ni $supported_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts stderr "Excluding $portinfo(name) because it does not support the ppc arch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set outputports($p) 0
</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;'>+ default {}
</span> }
} else {
puts stderr "Excluding $portinfo(name) because it failed to open: $result"
</pre><pre style='margin:0'>
</pre>