<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.4
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/60fdc382c94d2559dcfa08d5b49c98878db3f107">https://github.com/macports/macports-base/commit/60fdc382c94d2559dcfa08d5b49c98878db3f107</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/release-2.4 by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 60fdc38 Use old ABI if building ports with MP g++ on 10.4 & 10.5
</span>60fdc38 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 60fdc382c94d2559dcfa08d5b49c98878db3f107
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Apr 11 08:39:03 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> Use old ABI if building ports with MP g++ on 10.4 & 10.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This maintains compatibility with the system libstdc++ on these
</span><span style='display:block; white-space:pre;color:#404040;'> platforms.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit fb72047770987adea88599a7a69bd70e6c61d214)
</span>---
src/port1.0/portconfigure.tcl | 7 +++++++
1 file changed, 7 insertions(+)
<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 a182578..57537aa 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;'>@@ -76,9 +76,16 @@ proc portconfigure::should_add_stdlib {} {
</span> set is_clang [string match *clang* [option configure.cxx]]
return [expr {$has_stdlib && $is_clang}]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc portconfigure::should_add_cxx_abi {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set is_oldos [expr {[option os.platform] eq "darwin" && [option os.major] < 10}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set is_mp_gcc [string match *g++-mp-* [option configure.cxx]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [expr {$is_oldos && $is_mp_gcc}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> proc portconfigure::construct_cxxflags {flags} {
if {[portconfigure::should_add_stdlib]} {
lappend flags -stdlib=[option configure.cxx_stdlib]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[portconfigure::should_add_cxx_abi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend flags -D_GLIBCXX_USE_CXX11_ABI=0
</span> }
return $flags
}
</pre><pre style='margin:0'>
</pre>