<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5571d04597554343c40d166bc0f930a45db9d926">https://github.com/macports/macports-ports/commit/5571d04597554343c40d166bc0f930a45db9d926</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5571d04597554343c40d166bc0f930a45db9d926
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun Mar 24 05:05:29 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    octave PG: fix host for ppc
</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/69573
</span>---
 _resources/port1.0/group/octave-1.0.tcl | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/octave-1.0.tcl b/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d58fa5d94f4..2c2557af3e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,17 +226,20 @@ pre-destroot {
</span> 
     destroot.pre_args -q -f -H --eval
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if { ${os.arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if { ${os.major} >= 9 && ![catch {sysctl hw.cpu64bit_capable} result] && $result == 1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set short_host_name x86_64-apple-${os.platform}${os.major}.x.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set short_host_name i686-apple-${os.platform}${os.major}.x.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if { ${os.major} >= 9 && ![catch {sysctl hw.cpu64bit_capable} result] && $result == 1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set short_host_name powerpc64-apple-${os.platform}${os.major}.x.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Keep ppc before i386, so that Rosetta builds for ppc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Also, use build_arch and not sysctl:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # https://trac.macports.org/ticket/69573
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if { ${configure.build_arch} eq "ppc" } {
</span>             set short_host_name powerpc-apple-${os.platform}${os.major}.x.x
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        } elseif { ${configure.build_arch} eq "ppc64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set short_host_name powerpc64-apple-${os.platform}${os.major}.x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } elseif { ${os.arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if { ${os.major} >= 9 && [sysctl hw.cpu64bit_capable] == 1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set short_host_name x86_64-apple-${os.platform}${os.major}.x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set short_host_name i686-apple-${os.platform}${os.major}.x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span>         }
     }
 
</pre><pre style='margin:0'>

</pre>