<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/1662978731af4b56a2f79f7dda252f6feac47a08">https://github.com/macports/macports-ports/commit/1662978731af4b56a2f79f7dda252f6feac47a08</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1662978731af4b56a2f79f7dda252f6feac47a08
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun May 29 12:35:00 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> makefile PG: add support for muniversal PG 1.1
</span>---
_resources/port1.0/group/makefile-1.0.tcl | 48 +++++++++++++++++++++++++++++--
1 file changed, 45 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/makefile-1.0.tcl b/_resources/port1.0/group/makefile-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e4626159a5c..f2f7e65aa1f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/makefile-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/makefile-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,8 +120,50 @@ proc makefile_pg::setup_phase {phase} {
</span> configure.ldflags-append "-Wl,-syslibroot,[option configure.sdkroot]"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![exists universal_archs_supported] || ![variant_exists universal] || ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # muniversal PG is *not* being used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[exists muniversal.architectures]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal 1.1 PG is being used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch [option muniversal.architectures] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach tool {cc cxx objc objcxx ld} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set env_var [makefile_pg::map_tool_to_environment_variable $tool]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} ${env_var}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Portfile requests that variable be set in the environment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # append arch flag to compiler name instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set env_var [string toupper ${tool}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args.${arch}-append ${env_var}+="[muniversal::get_archflag ${tool} ${arch}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach tool {f77 f90 fc} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set env_var [makefile_pg::map_tool_to_environment_variable $tool]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} ${env_var}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Portfile requests that variable be set in the environment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # append arch flag to compiler name instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set env_var [string toupper ${tool}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args.${arch}-append ${env_var}+="[muniversal::get_archflag ${tool} ${arch}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach tool [option muniversal.arch_tools] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[regexp {f90|F90|f77|F77|fort|FORT} ${tool}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_tool fc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_tool cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args.${arch}-append ${tool}+="[muniversal::get_archflag ${arch_tool} ${arch}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach tool {cc f77 cxx objc objcxx cpp f90 fc ld} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set env_var [makefile_pg::map_tool_to_environment_variable $tool]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lenv_var [string tolower ${env_var}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} ${env_var}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Portfile requests that variable be set in the environment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # append flag to compiler name instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set env_var [string toupper ${tool}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.${lenv_var}.${arch}] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args.${arch}-append ${env_var}+="[option configure.${lenv_var}.${arch}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {![exists universal_archs_supported] || ![variant_exists universal] || ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal PG 1.x is *not* being used
</span> foreach tool {cc f77 cxx objc objcxx cpp f90 fc ld} {
if {[catch {get_canonical_archflags $tool} flags]} {
continue
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +172,7 @@ proc makefile_pg::setup_phase {phase} {
</span> configure.[string tolower ${env_var}]-append {*}${flags}
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # muniversal PG is being used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal PG 1.0 is being used
</span> global merger_${phase}_args
foreach arch [option configure.universal_archs] {
foreach tool {cc cxx objc objcxx ld} {
</pre><pre style='margin:0'>
</pre>