<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/760205bca0358a31ea365972d0a7d53e0a6ab145">https://github.com/macports/macports-ports/commit/760205bca0358a31ea365972d0a7d53e0a6ab145</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 760205bca03 muniversal-1.1: fix error with unsupported build_arch
</span>760205bca03 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 760205bca0358a31ea365972d0a7d53e0a6ab145
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Oct 25 18:31:04 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> muniversal-1.1: fix error with unsupported build_arch
</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/70195
</span>---
_resources/port1.0/group/muniversal-1.1.tcl | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
<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 1a11e800547..e85bd0427d5 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;'>@@ -1074,10 +1074,14 @@ proc portdestroot::destroot_finish {args} {
</span>
# if base code not modified (i.e. not a universal build), append architecture flag to compiler name if requested
proc muniversal::add_compiler_flags {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { (![option universal_possible] || ![variant_isset universal]) && [option muniversal.arch_compiler]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.build_arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.build_arch} ne {} &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (![option universal_possible] || ![variant_isset universal]) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [option muniversal.arch_compiler]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } then {
</span> # configure.cpp is intentionally left out
foreach tool {cxx objcxx cc objc fc f90 f77} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.${tool}-append {*}[option configure.${tool}_archflags.[option configure.build_arch]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.${tool}-append {*}[option configure.${tool}_archflags.${configure.build_arch}]
</span> }
}
</pre><pre style='margin:0'>
</pre>