<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/887b2fb974c8363413cdbdee65a4962e0cf02dd6">https://github.com/macports/macports-base/commit/887b2fb974c8363413cdbdee65a4962e0cf02dd6</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 887b2fb97 Do not pass -stdlib=macports-libstdc++ to gcc10+ as it does not understand it. Instead pass nothing which means gcc will use its default which is to link against its own libstdc++, which is what we anyway want with this setting.
</span>887b2fb97 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 887b2fb974c8363413cdbdee65a4962e0cf02dd6
</span>Author: Chris Jones <cjones051073@icloud.com>
AuthorDate: Wed Nov 16 23:41:10 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> Do not pass -stdlib=macports-libstdc++ to gcc10+ as it does not understand it.
</span><span style='display:block; white-space:pre;color:#404040;'> Instead pass nothing which means gcc will use its default which is to
</span><span style='display:block; white-space:pre;color:#404040;'> link against its own libstdc++, which is what we anyway want with this setting.
</span>---
src/port1.0/portconfigure.tcl | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7137869bd..2b1171abe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,10 +82,16 @@ proc portconfigure::should_add_stdlib {} {
</span> if { [string match *g*-mp-* [option configure.cxx]] } {
# -stdlib is not available with PPC builds
if { [option configure.build_arch] ni [list ppc ppc64] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Extract gcc version from value after last -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_ver [lindex [split [option configure.cxx] "-"] end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${gcc_ver} eq "devel" || ${gcc_ver} >= 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set is_gcc_with_stdlib yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not pass stdlib to gcc if it is MacPorts custom macports-libstdc++ setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # as gcc does not uderstand this. Instead do nothing, which means gcc will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # default to using its own libstdc++, which is in fact what we mean by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure.cxx_stdlib=macports-libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option configure.cxx_stdlib] ne "macports-libstdc++" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract gcc version from value after last -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_ver [lindex [split [option configure.cxx] "-"] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${gcc_ver} eq "devel" || ${gcc_ver} >= 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set is_gcc_with_stdlib yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
</pre><pre style='margin:0'>
</pre>