<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/a8f2fb48c3af10a2d217dc9370313a4381c25ae2">https://github.com/macports/mpbb/commit/a8f2fb48c3af10a2d217dc9370313a4381c25ae2</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 a8f2fb4 mpbb: exclude ports based on arch on darwin 18+
</span>a8f2fb4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a8f2fb48c3af10a2d217dc9370313a4381c25ae2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 6 18:07:37 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> mpbb: exclude ports based on arch on darwin 18+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Mojave, Catalina and Big Sur can't build for i386.
</span>---
tools/sort-with-subports.tcl | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 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 54349c3..e083da8 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;'>@@ -293,8 +293,8 @@ while {[llength $todo] > 0} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists requestedports($p)] && ($::macports::os_major <= 10 || $::macports::os_major >= 20) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $outputports($p) == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists outputports($p)] && $outputports($p) == 1 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ($::macports::os_major <= 10 || $::macports::os_major >= 18)} {
</span> if {$opened == 1 || ![catch {mportopen $portinfo(porturl) [list subport $portinfo(name)] ""} result]} {
if {$opened != 1} {
set opened 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -305,22 +305,37 @@ while {[llength $todo] > 0} {
</span> switch $::macports::os_arch {
arm {
if {$supported_archs eq "noarch"} {
<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:#e0ffe0;'>+ if {[info exists requestedports($p)]} {
</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;'>+ }
</span> set outputports($p) 0
} elseif {$supported_archs ne "" && "arm64" ni $supported_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "Excluding $portinfo(name) because it does not support the arm64 arch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists requestedports($p)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts stderr "Excluding $portinfo(name) because it does not support the arm64 arch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> set outputports($p) 0
}
}
i386 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#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:#e0ffe0;'>+ if {${is_64bit_capable}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$::macports::os_major >= 18 && $supported_archs ne "" && "x86_64" ni $supported_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists requestedports($p)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts stderr "Excluding $portinfo(name) because it does not support the x86_64 arch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>+ } elseif {$supported_archs ne "" && ("x86_64" ni $supported_archs || "i386" ni $supported_archs)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists requestedports($p)]} {
</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;'>+ }
</span> set outputports($p) 0
}
}
powerpc {
if {$supported_archs ne "" && $supported_archs ne "noarch" && "ppc" ni $supported_archs} {
<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:#e0ffe0;'>+ if {[info exists requestedports($p)]} {
</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;'>+ }
</span> set outputports($p) 0
}
}
</pre><pre style='margin:0'>
</pre>