<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/52a4fcde256d481b6dc587ab561a29c10dd18e95">https://github.com/macports/macports-ports/commit/52a4fcde256d481b6dc587ab561a29c10dd18e95</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 52a4fcde256d481b6dc587ab561a29c10dd18e95
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jun 11 08:34:41 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> muniversal PG: properly handle spaces in flags
</span>---
_resources/port1.0/group/muniversal-1.1.tcl | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 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 5acd2b9e78c..a4efdfaed89 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;'>@@ -669,24 +669,24 @@ proc parse_environment {command} {
</span> ${command}.env_array
if { ${command} eq "configure" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(CPP_FOR_BUILD) "[portconfigure::configure_get_compiler cpp]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(CXXCPP_FOR_BUILD) "[portconfigure::configure_get_compiler cpp]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(CPPFLAGS_FOR_BUILD) [option configure.cppflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CPP_FOR_BUILD {*}"[portconfigure::configure_get_compiler cpp]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CXXCPP_FOR_BUILD {*}"[portconfigure::configure_get_compiler cpp]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CPPFLAGS_FOR_BUILD {*}[option configure.cppflags]
</span>
if { [option muniversal.arch_compiler] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(CC_FOR_BUILD) "[portconfigure::configure_get_compiler cc] [portconfigure::configure_get_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(CXX_FOR_BUILD) "[portconfigure::configure_get_compiler cxx] [portconfigure::configure_get_archflags cxx]"
</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:#ffe0e0;'>- set ${command}.env_array(CFLAGS_FOR_BUILD) [option configure.cflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(CXXFLAGS_FOR_BUILD) [option configure.cxxflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(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]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} CXXFLAGS_FOR_BUILD {*}[option configure.cxxflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_environment_value ${command} LDFLAGS_FOR_BUILD {*}[option configure.ldflags]
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(CC_FOR_BUILD) "[portconfigure::configure_get_compiler cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(CXX_FOR_BUILD) "[portconfigure::configure_get_compiler cxx]"
</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:#ffe0e0;'>- set ${command}.env_array(CFLAGS_FOR_BUILD) "[option configure.cflags] [portconfigure::configure_get_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(CXXFLAGS_FOR_BUILD) "[option configure.cxxflags] [portconfigure::configure_get_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ${command}.env_array(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] [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] [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] [portconfigure::configure_get_archflags ld]"
</span> }
}
</pre><pre style='margin:0'>
</pre>