<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/e2913036ee257c52f66f87451617f8e531a126c0">https://github.com/macports/macports-base/commit/e2913036ee257c52f66f87451617f8e531a126c0</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 e2913036e selfupdate: attempt to force a native build on arm64
</span>e2913036e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e2913036ee257c52f66f87451617f8e531a126c0
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Aug 9 05:49:46 2024 +1000

<span style='display:block; white-space:pre;color:#404040;'>    selfupdate: attempt to force a native build on arm64
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/70512
</span>---
 src/macports1.0/selfupdate.tcl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/selfupdate.tcl b/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3167de62c..f6b76ca5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -454,6 +454,7 @@ proc selfupdate::install {source} {
</span>     # Choose a sane compiler and SDK
     set cc_arg {}
     set sdk_arg {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set arch_arg {}
</span>     set jobs [macports::get_parallel_jobs yes]
     if {$os_platform eq "darwin"} {
         catch {exec /usr/bin/cc 2>@1} output
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -488,12 +489,16 @@ proc selfupdate::install {source} {
</span>                 }
             }
         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {$os_major >= 20 && ![catch {sysctl sysctl.proc_translated} translated] && $translated} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # Force a native build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set arch_arg "/usr/bin/arch -arm64 /usr/bin/env "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     # do the actual configure, build and installation of new base
     ui_msg "$ui_prefix Installing new MacPorts release in $prefix as ${owner}:${group}; permissions ${perms}"
     macports_try -pass_signal {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        system -W $source "${cc_arg}${sdk_arg}./configure $configure_args_string && ${sdk_arg}make -j${jobs} SELFUPDATING=1 && make install SELFUPDATING=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system -W $source "${arch_arg}${cc_arg}${sdk_arg}./configure $configure_args_string && ${arch_arg}${sdk_arg}make -j${jobs} SELFUPDATING=1 && ${arch_arg}make install SELFUPDATING=1"
</span>     } on error {eMessage} {
         error "Error installing new MacPorts base: $eMessage"
     }
</pre><pre style='margin:0'>

</pre>