<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/6c7e20407ccc5f48c8a89b6cfef7561fea0002b0">https://github.com/macports/macports-ports/commit/6c7e20407ccc5f48c8a89b6cfef7561fea0002b0</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 6c7e20407cc compilers PG: Correctly propagate stdlib flags to build when needed
</span>6c7e20407cc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6c7e20407ccc5f48c8a89b6cfef7561fea0002b0
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Nov 10 14:30:40 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> compilers PG: Correctly propagate stdlib flags to build when needed
</span>---
_resources/port1.0/group/compilers-1.0.tcl | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b9c0a576128..84178794657 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -334,9 +334,29 @@ proc compilers.setup_variants {variants} {
</span> # see https://trac.macports.org/ticket/59199 for setting configure.cxx_stdlib
# see https://trac.macports.org/ticket/59329 for compilers.is_fortran_only
if {![compilers.is_fortran_only] && $cdb($variant,cxx_stdlib) ne ""} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mystdlib $cdb($variant,cxx_stdlib)
</span> append body "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib $cdb($variant,cxx_stdlib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_stdlib ${mystdlib}
</span> "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set set_stdlib no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If variant is gcc10+ pass -stdlib option to correctly handle libc++ versus libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match gcc* $variant]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [regexp {gcc(.*)} ${variant} -> gcc_v] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${gcc_v} >= 10 || ${gcc_v} == "devel" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set set_stdlib yes
</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;'>+ # Always set with clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match clang* $variant]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set set_stdlib yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${set_stdlib} eq "yes" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append body "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -stdlib=${mystdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -stdlib=${mystdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant ${variant} description \
</pre><pre style='margin:0'>
</pre>