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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/07972a956df49c6998722bcf783ba5aba47d1ec1">https://github.com/macports/macports-ports/commit/07972a956df49c6998722bcf783ba5aba47d1ec1</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 07972a956df muniversal: avoid sysctl where possible
</span>07972a956df is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 07972a956df49c6998722bcf783ba5aba47d1ec1
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Dec 19 05:24:47 2023 +1100

<span style='display:block; white-space:pre;color:#404040;'>    muniversal: avoid sysctl where possible
</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/68685
</span>---
 _resources/port1.0/group/muniversal-1.0.tcl | 4 ++--
 _resources/port1.0/group/muniversal-1.1.tcl | 5 ++++-
 2 files changed, 6 insertions(+), 3 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 9dd8b37c308..0a3aebdadbc 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;'>@@ -118,14 +118,14 @@ proc universal_setup {args} {
</span>         } elseif {${os.arch} eq "i386"} {
             set universal_archs_supported [ldelete ${universal_archs_supported} "ppc64"]
             set universal_archs_supported [ldelete ${universal_archs_supported} "arm64"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {${os.major} >= 9 && ![catch {sysctl hw.cpu64bit_capable} result] && $result == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {${os.major} < 11 && ![catch {sysctl hw.cpu64bit_capable} result] && $result == 0} {
</span>                 set universal_archs_supported [ldelete ${universal_archs_supported} "x86_64"]
             }
         } else {
             set universal_archs_supported [ldelete ${universal_archs_supported} "i386"]
             set universal_archs_supported [ldelete ${universal_archs_supported} "x86_64"]
             set universal_archs_supported [ldelete ${universal_archs_supported} "arm64"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {${os.major} >= 9 && ![catch {sysctl hw.cpu64bit_capable} result] && $result == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {![catch {sysctl hw.cpu64bit_capable} result] && $result == 0} {
</span>                 set universal_archs_supported [ldelete ${universal_archs_supported} "ppc64"]
             }
         }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.1.tcl b/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 309ea77a545..91d942b8557 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,7 +222,10 @@ proc muniversal::cpu64bit_capable {} {
</span>         # Doesn't really matter what we return here.
         return 1
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[option os.major] >= 9 && ![catch {sysctl hw.cpu64bit_capable} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[option os.major] >= 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # 10.7 and later only support 64-bit hardware
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[option os.major] >= 9 && ![catch {sysctl hw.cpu64bit_capable} result]} {
</span>         return $result
     } elseif {(![catch {sysctl hw.optional.x86_64} is_x86_64] && ${is_x86_64})
               || (![catch {sysctl hw.optional.64bitops} is_ppc64] && ${is_ppc64})} {
</pre><pre style='margin:0'>

</pre>