<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/429e86449b06c8d42f4f69b53dbceb572e433199">https://github.com/macports/macports-ports/commit/429e86449b06c8d42f4f69b53dbceb572e433199</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 429e864 root6: remove redundant c++ stdlib checking block
</span>429e864 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 429e86449b06c8d42f4f69b53dbceb572e433199
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Nov 12 11:36:58 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> root6: remove redundant c++ stdlib checking block
</span>---
science/root6/Portfile | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/Portfile b/science/root6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e2db81..a511db8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,30 +185,10 @@ if { ${os.major} >= 18 } {
</span> compiler.blacklist-append macports-clang-5.0
} else {
# force use of MP clang 5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append clang macports-clang-8.0 macports-clang-7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append clang {macports-clang-[7-8].0}
</span> compiler.cxx_standard 2011
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Setup the C++ runtime on OSX10.8 (Darwin 12) and older
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} <= 12 && ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use macports stdc++ on older systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.compiler} eq "macports-clang-5.0" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants clang-5.0 libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-6.0" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants clang-6.0 libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-7.0" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants clang-7.0 libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-8.0" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants clang-8.0 libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [ exec find ${worksrcpath} -name "*.cmake" -or -name "*.in" -or -name "Makefile.*" ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|stdlib=libc++|stdlib=${configure.cxx_stdlib}|g" $f
</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;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Configure the C++ runtime to use
if { ${configure.cxx_stdlib} ne "libc++" } {
configure.args-replace -Dlibcxx=ON -Dlibcxx=OFF
</pre><pre style='margin:0'>
</pre>