<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/e5d5dbdeb34f5f499784b95424d740efc88f2a6a">https://github.com/macports/macports-ports/commit/e5d5dbdeb34f5f499784b95424d740efc88f2a6a</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 e5d5dbdeb34 qmake5 PG: Respect CPP flags
</span>e5d5dbdeb34 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e5d5dbdeb34f5f499784b95424d740efc88f2a6a
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Apr 21 18:37:41 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> qmake5 PG: Respect CPP flags
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 9 +++++++++
1 file changed, 9 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake5-1.0.tcl b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d8423d14631..cdecc790a9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,18 +127,24 @@ pre-configure {
</span> # save certain configure flags
set qmake5_cxx11_flags ""
set qmake5_cxx_flags ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qmake5_c_flags ""
</span> set qmake5_l_flags ""
foreach flag ${configure.cxxflags} {
if { ${flag} eq "-D_GLIBCXX_USE_CXX11_ABI=0" } {
lappend qmake5_cxx11_flags ${flag}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach flag ${configure.cppflags} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend qmake5_c_flags ${flag}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend qmake5_cxx_flags ${flag}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> # Need to respect ldflags as needed for legacysupport linking
foreach flag ${configure.ldflags} {
lappend qmake5_l_flags ${flag}
}
set qmake5_cxx11_flags [join ${qmake5_cxx11_flags} " "]
set qmake5_cxx_flags [join ${qmake5_cxx_flags} " "]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qmake5_c_flags [join ${qmake5_c_flags} " "]
</span> set qmake5_l_flags [join ${qmake5_l_flags} " "]
if { [vercmp ${qt5.version} 5.6] >= 0 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,6 +190,9 @@ pre-configure {
</span> if {${qmake5_cxx_flags} ne "" } {
puts ${cache} QMAKE_CXXFLAGS+="${qmake5_cxx_flags}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qmake5_c_flags} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} QMAKE_CFLAGS+="${qmake5_c_flags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {${qmake5_l_flags} ne "" } {
puts ${cache} QMAKE_LFLAGS+="${qmake5_l_flags}"
}
</pre><pre style='margin:0'>
</pre>