<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/acf1253dd55ceb5a7f6a4bbec09c3abe44df6640">https://github.com/macports/macports-ports/commit/acf1253dd55ceb5a7f6a4bbec09c3abe44df6640</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit acf1253dd55ceb5a7f6a4bbec09c3abe44df6640
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Apr 21 08:46:18 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> languages PG: use proc names from portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/macports/macports-base/commit/fb72047770987adea88599a7a69bd70e6c61d214
</span>---
_resources/port1.0/group/languages-1.0.tcl | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/languages-1.0.tcl b/_resources/port1.0/group/languages-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a81228c..3adca4e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/languages-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/languages-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -726,7 +726,8 @@ proc portconfigure::configure_cxx_stdlib {} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc portconfigure::should_add_libstdlib_abi {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replacement for portconfigure.tcl version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc portconfigure::should_add_cxx_abi {} {
</span> global os.major cxx_stdlib
# prior to OS X Mavericks, libstdc++ was the default C++ runtime, so
# assume MacPorts libstdc++ must be ABI compatible with system libstdc++
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -737,17 +738,6 @@ proc portconfigure::should_add_libstdlib_abi {} {
</span> }
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc portconfigure::construct_cxxflags {flags} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[portconfigure::should_add_stdlib]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend flags -stdlib=[option configure.cxx_stdlib]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[portconfigure::should_add_libstdlib_abi]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend flags -D_GLIBCXX_USE_CXX11_ABI=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# replacement for portconfigure.tcl version
</span> proc portconfigure::stdlib_trace {opt action args} {
foreach flag [lsearch -all -inline [option $opt] -stdlib=*] {
$opt-delete $flag
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -758,7 +748,7 @@ proc portconfigure::stdlib_trace {opt action args} {
</span> foreach flag [lsearch -all -inline [option $opt] -D_GLIBCXX_USE_CXX11_ABI=0] {
$opt-delete $flag
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$action eq "read" && [portconfigure::should_add_libstdlib_abi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action eq "read" && [portconfigure::should_add_cxx_abi]} {
</span> $opt-append -D_GLIBCXX_USE_CXX11_ABI=0
}
}
</pre><pre style='margin:0'>
</pre>