<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5bd95a8bcf1f5e6b2790ac3e97d2b3f2ff478e10">https://github.com/macports/macports-ports/commit/5bd95a8bcf1f5e6b2790ac3e97d2b3f2ff478e10</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 5bd95a8bcf1 makefile PG: Delay makefile_step until pre-fetch
</span>5bd95a8bcf1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5bd95a8bcf1f5e6b2790ac3e97d2b3f2ff478e10
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue May 4 18:17:29 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> makefile PG: Delay makefile_step until pre-fetch
</span>---
_resources/port1.0/group/makefile-1.0.tcl | 267 +++++++++++++++---------------
1 file changed, 134 insertions(+), 133 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 05144e978dd..6ffb63131d3 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;'>@@ -90,159 +90,160 @@ proc makefile_pg::makefile_setup {} {
</span> os.major \
prefix \
destroot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach phase {build destroot test} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #########################################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in base code, variables are set in the procedure command_exec in portutil.tcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-base/blob/master/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #########################################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} MACOSX_DEPLOYMENT_TARGET] != -1 && [option macosx_deployment_target] ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append MACOSX_DEPLOYMENT_TARGET=[option macosx_deployment_target]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option compiler.log_verbose_output]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} CC_PRINT_OPTIONS] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append CC_PRINT_OPTIONS=YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach phase {build destroot test} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #########################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in base code, variables are set in the procedure command_exec in portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-base/blob/master/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #########################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} MACOSX_DEPLOYMENT_TARGET] != -1 && [option macosx_deployment_target] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args-append MACOSX_DEPLOYMENT_TARGET=[option macosx_deployment_target]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} CC_PRINT_OPTIONS_FILE] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append CC_PRINT_OPTIONS_FILE=[file join [option workpath] ".CC_PRINT_OPTIONS"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option compiler.log_verbose_output]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} CC_PRINT_OPTIONS] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args-append CC_PRINT_OPTIONS=YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} CC_PRINT_OPTIONS_FILE] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args-append CC_PRINT_OPTIONS_FILE=[file join [option workpath] ".CC_PRINT_OPTIONS"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} CPATH] != -1 && [option compiler.cpath] ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append CPATH=[join [option compiler.cpath] :]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} LIBRARY_PATH] != -1 && [option compiler.library_path] ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append LIBRARY_PATH=[join [option compiler.library_path] :]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} DEVELOPER_DIR] != -1 && [option configure.developer_dir] ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append DEVELOPER_DIR=[option configure.developer_dir]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} SDKROOT] != -1 && [option configure.sdkroot] ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append SDKROOT=[option configure.sdkroot]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #########################################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # attempt to set PREFIX variable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #########################################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${phase} ne "destroot" || [option makefile.has_destdir]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set makefile_prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use \$(DESTDIR) instead of ${destroot} in case muniversal PG is being used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set makefile_prefix \$(DESTDIR)${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} PREFIX] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append [option makefile.prefix_name]=[shellescape ${makefile_prefix}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.env-append [option makefile.prefix_name]=${makefile_prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #########################################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # replicate behavior in procedure portconfigure::configure_main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-base/blob/master/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://lists.macports.org/pipermail/macports-dev/2018-November/thread.html#39694
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #########################################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.sdkroot] ne "" && ![option compiler.limit_flags]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach env_var {CPPFLAGS CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.[string tolower ${env_var}]-append "-isysroot[option configure.sdkroot]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} CPATH] != -1 && [option compiler.cpath] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args-append CPATH=[join [option compiler.cpath] :]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append "-Wl,-syslibroot,[option configure.sdkroot]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#ffe0e0;'>- foreach tool {cc f77 cxx objc objcxx cpp f90 fc ld} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {get_canonical_archflags $tool} flags]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} LIBRARY_PATH] != -1 && [option compiler.library_path] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args-append LIBRARY_PATH=[join [option compiler.library_path] :]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} DEVELOPER_DIR] != -1 && [option configure.developer_dir] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args-append DEVELOPER_DIR=[option configure.developer_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} SDKROOT] != -1 && [option configure.sdkroot] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args-append SDKROOT=[option configure.sdkroot]
</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;'>+ # attempt to set PREFIX variable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #########################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${phase} ne "destroot" || [option makefile.has_destdir]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set makefile_prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use \$(DESTDIR) instead of ${destroot} in case muniversal PG is being used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set makefile_prefix \$(DESTDIR)${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} PREFIX] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args-append [option makefile.prefix_name]=[shellescape ${makefile_prefix}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.env-append [option makefile.prefix_name]=${makefile_prefix}
</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;'>+ # replicate behavior in procedure portconfigure::configure_main
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-base/blob/master/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://lists.macports.org/pipermail/macports-dev/2018-November/thread.html#39694
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #########################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.sdkroot] ne "" && ![option compiler.limit_flags]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach env_var {CPPFLAGS CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.[string tolower ${env_var}]-append "-isysroot[option configure.sdkroot]"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set env_var [makefile_pg::map_tool_to_environment_variable $tool]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.[string tolower ${env_var}]-append {*}${flags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append "-Wl,-syslibroot,[option configure.sdkroot]"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # muniversal PG is being used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global merger_${phase}_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch [option configure.universal_archs] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach tool {cc cxx objc objcxx ld} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set env_var [makefile_pg::map_tool_to_environment_variable $tool]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} ${env_var}] == -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Portfile requests that variable be set in the environment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # append arch flag to compiler name instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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 {![exists universal_archs_supported] || ![variant_exists universal] || ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal PG is *not* being used
</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;'>+ if {[catch {get_canonical_archflags $tool} flags]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_${phase}_args(${arch}) ${env_var}+="[muniversal_get_arch_flag ${arch}]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach tool {f77 f90 fc} {
</span> set env_var [makefile_pg::map_tool_to_environment_variable $tool]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} ${env_var}] == -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Portfile requests that variable be set in the environment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # append arch flag to compiler name instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set env_var [string toupper ${tool}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.[string tolower ${env_var}]-append {*}${flags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal PG is being used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global merger_${phase}_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch [option configure.universal_archs] {
</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;'>+ lappend merger_${phase}_args(${arch}) ${env_var}+="[muniversal_get_arch_flag ${arch}]"
</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> lappend merger_${phase}_args(${arch}) ${env_var}+="[muniversal_get_arch_flag ${arch} 'fortran']"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach tool [option muniversal.arch_tools] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[regexp {f90|F90|f77|F77|fort|FORT} ${tool}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set is_fortran "fortran"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set is_fortran ""
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_${phase}_args(${arch}) ${tool}+="[muniversal_get_arch_flag ${arch} ${is_fortran}]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach tool {cc f77 cxx objc objcxx cpp f90 fc ld} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set env_var [makefile_pg::map_tool_to_environment_variable $tool]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set lenv_var [string tolower ${env_var}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} ${env_var}] == -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Portfile requests that variable be set in the environment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # append arch flag to compiler name instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set env_var [string toupper ${tool}]
</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 is_fortran "fortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set is_fortran ""
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global merger_configure_${lenv_var}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists merger_configure_${lenv_var}(${arch})]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_${phase}_args(${arch}) ${env_var}+="[set merger_configure_${lenv_var}(${arch})]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_${phase}_args(${arch}) ${tool}+="[muniversal_get_arch_flag ${arch} ${is_fortran}]"
</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 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;'>+ global merger_configure_${lenv_var}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists merger_configure_${lenv_var}(${arch})]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_${phase}_args(${arch}) ${env_var}+="[set merger_configure_${lenv_var}(${arch})]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_exists universal] || ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach env_var {CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS FFLAGS F90FLAGS FCFLAGS LDFLAGS} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.march] ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.[string tolower ${env_var}]-append -march=[option configure.march]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.mtune] ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.[string tolower ${env_var}]-append -mtune=[option configure.mtune]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_exists universal] || ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach env_var {CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS FFLAGS F90FLAGS FCFLAGS LDFLAGS} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.march] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.[string tolower ${env_var}]-append -march=[option configure.march]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.mtune] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.[string tolower ${env_var}]-append -mtune=[option configure.mtune]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach env_var { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC CXX OBJC OBJCXX FC F77 F90 JAVAC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS CPPFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS F90FLAGS FCFLAGS LDFLAGS LIBS CLASSPATH \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PERL PYTHON RUBY INSTALL AWK BISON PKG_CONFIG \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set value [compwrap::create_wrapper [string tolower $env_var]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$value ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.env-append "$env_var=$value"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} ${env_var}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append $env_var="$value"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach env_var { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC CXX OBJC OBJCXX FC F77 F90 JAVAC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS CPPFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFLAGS F90FLAGS FCFLAGS LDFLAGS LIBS CLASSPATH \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PERL PYTHON RUBY INSTALL AWK BISON PKG_CONFIG \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set value [compwrap::create_wrapper [string tolower $env_var]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$value ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.env-append "$env_var=$value"
</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;'>+ ${phase}.args-append $env_var="$value"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach env_var { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CONFIG_PATH \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set value [option configure.[string tolower $env_var]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$value ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.env-append "$env_var=[join $value :]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} ${env_var}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append $env_var="[join $value :]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach env_var { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_PATH \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set value [option configure.[string tolower $env_var]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$value ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.env-append "$env_var=[join $value :]"
</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;'>+ ${phase}.args-append $env_var="[join $value :]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} == 12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.env-append __CFPREFERENCES_AVOID_DAEMON=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact ${makefile.override} __CFPREFERENCES_AVOID_DAEMON] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.args-append __CFPREFERENCES_AVOID_DAEMON=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} == 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.env-append __CFPREFERENCES_AVOID_DAEMON=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -exact ${makefile.override} __CFPREFERENCES_AVOID_DAEMON] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.args-append __CFPREFERENCES_AVOID_DAEMON=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
</pre><pre style='margin:0'>
</pre>