<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/ba96dcc5e5d2ea7999e6350829dbbc57cb09ee4f">https://github.com/macports/macports-ports/commit/ba96dcc5e5d2ea7999e6350829dbbc57cb09ee4f</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 ba96dcc5e5d muniversal pg: catch sysctl errors
</span>ba96dcc5e5d is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ba96dcc5e5d2ea7999e6350829dbbc57cb09ee4f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Mar 7 10:18:36 2022 +1100

<span style='display:block; white-space:pre;color:#404040;'>    muniversal pg: catch sysctl errors
</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/62753
</span>---
 _resources/port1.0/group/muniversal-1.0.tcl | 6 +++---
 1 file changed, 3 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 196bf7bda98..b184691afe6 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 && [sysctl hw.cpu64bit_capable] == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {${os.major} >= 9 && ![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 && [sysctl hw.cpu64bit_capable] == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {${os.major} >= 9 && ![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;background:#e0e0e0;'>@@ -290,7 +290,7 @@ variant universal {
</span>                 # check if building for a word length we can't run
                 set bits_differ 0
                 if {${arch} in [list ppc64 x86_64] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    (${os.major} < 9 || [sysctl hw.cpu64bit_capable] == 0)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    (${os.major} < 9 || (![catch {sysctl hw.cpu64bit_capable} result] && $result == 0))} {
</span>                     set bits_differ 1
                 }
 
</pre><pre style='margin:0'>

</pre>