<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/66c4a14947be745c55bdd7c550686fdcbc3b6891">https://github.com/macports/mpbb/commit/66c4a14947be745c55bdd7c550686fdcbc3b6891</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 66c4a14 Build noarch ports on arm64 not x86_64
</span>66c4a14 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 66c4a14947be745c55bdd7c550686fdcbc3b6891
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Oct 30 21:26:02 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> Build noarch ports on arm64 not x86_64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62977
</span>---
tools/sort-with-subports.tcl | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 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 7e947ad..60c6a56 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;'>@@ -331,12 +331,7 @@ while {[llength $todo] > 0} {
</span> set supported_archs [_mportkey $mport supported_archs]
switch $::macports::os_arch {
arm {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$supported_archs eq "noarch"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists requestedports($p)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "Excluding $portinfo(name) because the [lindex [split ${::macports::macosx_version} .] 0]_x86_64 builder will build it"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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 {$supported_archs ne "" && "arm64" ni $supported_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$supported_archs ne "" && $supported_archs ne "noarch" && "arm64" ni $supported_archs} {
</span> if {[info exists requestedports($p)]} {
puts stderr "Excluding $portinfo(name) because it does not support the arm64 arch"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -344,8 +339,15 @@ while {[llength $todo] > 0} {
</span> }
}
i386 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${is_64bit_capable}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$::macports::os_major >= 18 && $supported_archs ne "" && $supported_archs ne "noarch" && "x86_64" ni $supported_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$supported_archs eq "noarch"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$::macports::os_major >= 20} {
</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 [lindex [split ${::macports::macosx_version} .] 0]_arm64 builder will build it"
</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 {${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> if {[info exists requestedports($p)]} {
puts stderr "Excluding $portinfo(name) because it does not support the x86_64 arch"
}
</pre><pre style='margin:0'>
</pre>