<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/a8b8426d769aea7e2a99e188ee8d8bf30e0d5b82">https://github.com/macports/macports-ports/commit/a8b8426d769aea7e2a99e188ee8d8bf30e0d5b82</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 a8b8426d769 muniversal-1.0: be less eager to avoid universal variant
</span>a8b8426d769 is described below

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

<span style='display:block; white-space:pre;color:#404040;'>    muniversal-1.0: be less eager to avoid universal variant
</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/68685
</span>---
 _resources/port1.0/group/muniversal-1.0.tcl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

<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 0a3aebdadbc..0f816ee02e7 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;'>@@ -185,10 +185,14 @@ proc universal_setup {args} {
</span>         }
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Err on the side of creating the variant, as the environment can change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # between the port being indexed and being built.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://trac.macports.org/ticket/68685
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set orig_num_archs [llength ${configure.universal_archs}]
</span>     # ensure correct archs are recorded in the registry, archive name, etc
     configure.universal_archs {*}${universal_archs_to_use}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[llength ${configure.universal_archs}] < 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {$orig_num_archs < 2} {
</span>         ui_debug "muniversal: < 2 archs supported, not adding universal variant"
     } else {
 
</pre><pre style='margin:0'>

</pre>