<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/36270930fade83d5c67483ec9e3d576e2b89b8c2">https://github.com/macports/macports-ports/commit/36270930fade83d5c67483ec9e3d576e2b89b8c2</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 36270930fad muniversal: Change os.arch for Apple Silicon based on changes in base
</span>36270930fad is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 36270930fade83d5c67483ec9e3d576e2b89b8c2
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Thu Aug 13 21:04:08 2020 -0700

<span style='display:block; white-space:pre;color:#404040;'>    muniversal: Change os.arch for Apple Silicon based on changes in base
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    cf: 01afdbbabcedbb3c5cae89542b30f0b90136f668
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
 _resources/port1.0/group/muniversal-1.0.tcl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0897b71d7db..dc1fafdb71b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ proc muniversal_get_arch_flag {arch {fortran ""}} {
</span>             set archf -m32
         } elseif { ${os.arch}=="powerpc" && ${arch}=="ppc64" } {
             set archf -m64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        } elseif { ${os.arch}=="arm64" && ${arch}=="arm64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } elseif { ${os.arch}=="arm" && ${arch}=="arm64" } {
</span>             set archf -m64
         } else {
             if { ${fortran}=="" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +117,7 @@ variant universal {
</span> 
     # user has specified that build platform must be able to run binaries for supported architectures
     if { ${merger_must_run_binaries}=="yes" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {${os.arch}=="arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {${os.arch}=="arm"} {
</span>             set universal_archs_supported [ldelete ${universal_archs_supported} "ppc"]
             set universal_archs_supported [ldelete ${universal_archs_supported} "ppc64"]
             set universal_archs_supported [ldelete ${universal_archs_supported} "i386"]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,14 +164,14 @@ variant universal {
</span>             # Next, delete archs that are not evolutionarilary adjacent
             if { ${os.arch} == "powerpc" } {
                 set universal_archs_to_use [ldelete ${universal_archs_to_use} "arm64"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            } else if {${os.arch} == "arm64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } else if {${os.arch} == "arm" } {
</span>                 set universal_archs_to_use [ldelete ${universal_archs_to_use} "ppc"]
             }
         }
 
         if { [llength ${universal_archs_to_use}] >= 3 } {
             # Next continue to prune architectures that are not evolutionarilary adjacent
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { ${os.arch} == "arm64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if { ${os.arch} == "arm" } {
</span>                 set universal_archs_to_use [ldelete ${universal_archs_to_use} "i386"]
             } else if { ${os.arch} == "powerpc" } {
                 set universal_archs_to_use [ldelete ${universal_archs_to_use} "x86_64"]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -289,7 +289,7 @@ variant universal {
</span> 
                 # check if building for a completely different arch
                 if {$bits_differ || $config_guess_bug
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                 || (${os.arch}=="arm64" && (${arch}=="i386" || ${arch}=="x86_64" || ${arch}=="ppc" || ${arch}=="ppc64"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 || (${os.arch}=="arm" && (${arch}=="i386" || ${arch}=="x86_64" || ${arch}=="ppc" || ${arch}=="ppc64"))
</span>                                  || (${os.arch}=="i386" && (${arch}=="arm64" || ${arch}=="ppc" || ${arch}=="ppc64"))
                                  || (${os.arch}=="powerpc" && (${arch}=="i386" || ${arch}=="x86_64"))} {
                     switch -- ${arch} {
</pre><pre style='margin:0'>

</pre>