<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5e2cc7916113eb2a60fd04b964e6f8bd0ece7df1">https://github.com/macports/macports-ports/commit/5e2cc7916113eb2a60fd04b964e6f8bd0ece7df1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5e2cc7916113eb2a60fd04b964e6f8bd0ece7df1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 4 11:34:32 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> muniversal PG: allow control over FLAGS_FOR_BUILD
</span>---
_resources/port1.0/group/muniversal-1.1.tcl | 55 +++++++++++++++++++++++------
1 file changed, 44 insertions(+), 11 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 a1704da1212..795b19d7605 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;'>@@ -174,6 +174,29 @@ foreach arch {arm64 x86_64 i386 ppc ppc64} {
</span> }
unset arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+##########################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# for cross-compiling, some configure scripts recognize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CPPFLAGS_FOR_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CFLAGS_FOR_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CXXFLAGS_FOR_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# LDFLAGS_FOR_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+##########################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options configure.cppflags_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.cppflags_for_build {${configure.cppflags}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options configure.cflags_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.cflags_for_build {${configure.cflags}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options configure.cxxflags_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.cxxflags_for_build {${configure.cxxflags}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options configure.ldflags_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.ldflags_for_build {${configure.ldflags}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this is a seldom needed feature where XFLAGS_FOR_BUILD are appended to the X compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options configure.append_build_flags_to_compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.append_build_flags_to_compiler {no}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> namespace eval muniversal {}
####################################################################################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -696,22 +719,32 @@ proc parse_environment {command} {
</span> if { ${command} eq "configure" } {
append_to_environment_value ${command} CPP_FOR_BUILD {*}"[portconfigure::configure_get_compiler cpp]"
append_to_environment_value ${command} CXXCPP_FOR_BUILD {*}"[portconfigure::configure_get_compiler cpp]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} CPPFLAGS_FOR_BUILD {*}[option configure.cppflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CPPFLAGS_FOR_BUILD {*}[option configure.cppflags_for_build]
</span>
if { [option muniversal.arch_compiler] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} CC_FOR_BUILD {*}"[portconfigure::configure_get_compiler cc] [portconfigure::configure_get_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} CXX_FOR_BUILD {*}"[portconfigure::configure_get_compiler cxx] [portconfigure::configure_get_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option configure.append_build_flags_to_compiler] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CC_FOR_BUILD {*}"[portconfigure::configure_get_compiler cc] [portconfigure::configure_get_archflags cc] [option configure.cflags_for_build]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CXX_FOR_BUILD {*}"[portconfigure::configure_get_compiler cxx] [portconfigure::configure_get_archflags cxx] [option configure.cxxflags_for_build]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CC_FOR_BUILD {*}"[portconfigure::configure_get_compiler cc] [portconfigure::configure_get_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CXX_FOR_BUILD {*}"[portconfigure::configure_get_compiler cxx] [portconfigure::configure_get_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} CFLAGS_FOR_BUILD {*}[option configure.cflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} CXXFLAGS_FOR_BUILD {*}[option configure.cxxflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} LDFLAGS_FOR_BUILD {*}[option configure.ldflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CFLAGS_FOR_BUILD {*}"[option configure.cflags_for_build]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CXXFLAGS_FOR_BUILD {*}[option configure.cxxflags_for_build]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} LDFLAGS_FOR_BUILD {*}[option configure.ldflags_for_build]
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} CC_FOR_BUILD {*}[portconfigure::configure_get_compiler cc]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} CXX_FOR_BUILD {*}[portconfigure::configure_get_compiler cxx]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option configure.append_build_flags_to_compiler] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CC_FOR_BUILD {*}"[portconfigure::configure_get_compiler cc] [option configure.cflags_for_build]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CXX_FOR_BUILD {*}"[portconfigure::configure_get_compiler cxx] [option configure.cxxflags_for_build]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CC_FOR_BUILD {*}"[portconfigure::configure_get_compiler cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CXX_FOR_BUILD {*}"[portconfigure::configure_get_compiler cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} CFLAGS_FOR_BUILD {*}"[option configure.cflags] [portconfigure::configure_get_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} CXXFLAGS_FOR_BUILD {*}"[option configure.cxxflags] [portconfigure::configure_get_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append_to_environment_value ${command} LDFLAGS_FOR_BUILD {*}"[option configure.ldflags] [portconfigure::configure_get_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CFLAGS_FOR_BUILD {*}"[option configure.cflags_for_build] [portconfigure::configure_get_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CXXFLAGS_FOR_BUILD {*}"[option configure.cxxflags_for_build] [portconfigure::configure_get_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} LDFLAGS_FOR_BUILD {*}"[option configure.ldflags_for_build] [portconfigure::configure_get_archflags ld]"
</span> }
}
</pre><pre style='margin:0'>
</pre>