<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/494e9283ac158f6102aa3e847e253c0920eb03b2">https://github.com/macports/macports-base/commit/494e9283ac158f6102aa3e847e253c0920eb03b2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 494e9283ac158f6102aa3e847e253c0920eb03b2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jun 24 17:08:36 2020 +1000
<span style='display:block; white-space:pre;color:#404040;'> Set os.arch to "arm" on arm64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This follows the existing pattern where we set os.arch to match the output of
</span><span style='display:block; white-space:pre;color:#404040;'> `uname -p`.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 01afdbbabcedbb3c5cae89542b30f0b90136f668)
</span>---
src/macports1.0/macports.tcl | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index af1e30e5..dc31578e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -678,8 +678,14 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
</span>
# set up platform info variables
set os_arch $tcl_platform(machine)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$os_arch eq "Power Macintosh"} {set os_arch "powerpc"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$os_arch eq "i586" || $os_arch eq "i686" || $os_arch eq "x86_64"} {set os_arch "i386"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set os_arch to match `uname -p`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$os_arch eq "Power Macintosh"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os_arch "powerpc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$os_arch eq "i586" || $os_arch eq "i686" || $os_arch eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os_arch "i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$os_arch eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os_arch "arm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> set os_version $tcl_platform(osVersion)
set os_major [lindex [split $os_version .] 0]
set os_minor [lindex [split $os_version .] 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1094,7 +1100,7 @@ match macports.conf.default."
</span> if {![info exists macports::build_arch]} {
if {$os_platform eq "darwin"} {
if {$os_major >= 20} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$os_arch eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$os_arch eq "arm"} {
</span> set macports::build_arch arm64
} else {
set macports::build_arch x86_64
</pre><pre style='margin:0'>
</pre>