<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/73e66dfc7de0cc51f459151142f51ccc49f9ee7b">https://github.com/macports/macports-base/commit/73e66dfc7de0cc51f459151142f51ccc49f9ee7b</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 73e66dfc7 Set correct os/build arch on additional archs
</span>73e66dfc7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 73e66dfc7de0cc51f459151142f51ccc49f9ee7b
</span>Author: harens <12570877+harens@users.noreply.github.com>
AuthorDate: Thu Jul 28 12:21:36 2022 +0100

<span style='display:block; white-space:pre;color:#404040;'>    Set correct os/build arch on additional archs
</span>---
 src/macports1.0/macports.tcl | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 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 42f1d5682..87c5bff39 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;'>@@ -736,12 +736,19 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
</span>     # set up platform info variables
     set os_arch $tcl_platform(machine)
     # Set os_arch to match `uname -p`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {$os_arch eq "Power Macintosh"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set os_arch "powerpc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } elseif {$os_arch eq "i586" || $os_arch eq "i686" || $os_arch eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set os_arch "i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } elseif {$os_arch eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set os_arch "arm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    switch -glob $os_arch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       "Power Macintosh" -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       ppc* {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           set os_arch powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       i[3-7]86 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       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;'>+       }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       arm* -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       aarch* {
</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]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1185,11 +1192,24 @@ match macports.conf.default."
</span>                 }
             }
         } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # List of currently supported CPU architectures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {$tcl_platform(machine) in [list arm64 x86_64 i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set macports::build_arch $tcl_platform(machine)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set macports::build_arch {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            switch -glob $tcl_platform(machine) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               "Power Macintosh" -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               ppc* {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   set macports::build_arch ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               i[3-7]86 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   set macports::build_arch i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               x86_64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   set macports::build_arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               arm* -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               aarch* {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   set macports::build_arch arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               default {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   set macports::build_arch {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               }
</span>             }
         }
     } else {
</pre><pre style='margin:0'>

</pre>