<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a3112f523f2aa33758d5ec0da4291cb19d31e502">https://github.com/macports/macports-ports/commit/a3112f523f2aa33758d5ec0da4291cb19d31e502</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a3112f523f2aa33758d5ec0da4291cb19d31e502
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat May 21 09:12:03 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> muniversal 1.1 PG: increase compatibility with 1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add `muniversal.current_arch` variable to make it easier to update
</span><span style='display:block; white-space:pre;color:#404040;'> Portfiles to new version of muniversal PG.
</span>---
_resources/port1.0/group/muniversal-1.1.tcl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
<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 5a8fe90944e..e4d0b816181 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;'>@@ -792,7 +792,7 @@ foreach phase {patch configure build destroot test} {
</span> }
rename ${proc_name} ${proc_name}_orig
proc ${proc_name} {{args ""}} "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global worksrcpath UI_PREFIX subport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global worksrcpath UI_PREFIX subport muniversal.current_arch
</span>
foreach arch \"\[option configure.universal_archs\]\" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -801,6 +801,7 @@ foreach phase {patch configure build destroot test} {
</span> ui_info \"\$UI_PREFIX \[format \[msgcat::mc \"Running ${part} ${phase} %1\\\$s for architecture %2\\\$s\"\] \${subport} \${arch}\]\"
muniversal.build_arch \${arch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set muniversal.current_arch \${arch}
</span>
foreach dir {test.dir destroot.dir destroot build.dir autoreconf.dir autoconf.dir configure.dir} {
set save-\${dir} \[option \${dir}\]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -838,6 +839,7 @@ foreach phase {patch configure build destroot test} {
</span> option \${phase_map}.cmd \[set save-\${phase_map}.cmd\]
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset muniversal.current_arch
</span> muniversal.build_arch
"
}
</pre><pre style='margin:0'>
</pre>