<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/4a1642de8701ab0bd14cc6aa12108de2c6f87072">https://github.com/macports/macports-ports/commit/4a1642de8701ab0bd14cc6aa12108de2c6f87072</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 4a1642d root6: add MP clang 8.0 to supported compilers list
</span>4a1642d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4a1642de8701ab0bd14cc6aa12108de2c6f87072
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Mar 29 15:12:25 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> root6: add MP clang 8.0 to supported compilers list
</span>---
science/root6/Portfile | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 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 176717a..cc5d399 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;'>@@ -80,7 +80,7 @@ select.file ${filespath}/${name}
</span> # Force a compatible compiler
compiler.blacklist-append *gcc* {clang < 920} macports-clang-3.3 macports-clang-3.4 \
macports-clang-3.7 macports-clang-4.0 macports-clang-3.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.whitelist clang macports-clang-7.0 macports-clang-6.0 macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.whitelist clang macports-clang-8.0 macports-clang-7.0 macports-clang-6.0 macports-clang-5.0
</span>
# port specific location
set install_prefix ${prefix}/libexec/root${version_major}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,10 +163,10 @@ if { ${os.major} >= 18 } {
</span> configure.args-replace -Dcxx17=OFF -Dcxx17=ON
} elseif { ${os.major} >= 13 } {
configure.args-replace -Dcxx14=OFF -Dcxx14=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang70
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang50
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #patchfiles-append G__Core_Dict_cxxheaders.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force use of MP clang 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append macports-clang-8.0 macports-clang-7.0 macports-clang-6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist macports-clang-5.0
</span> }
# Setup the C++ runtime on OSX10.8 (Darwin 12) and older
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,6 +178,8 @@ if { ${os.major} <= 12 && ${configure.cxx_stdlib} ne "libc++" } {
</span> require_active_variants clang-6.0 libstdcxx
} elseif { ${configure.compiler} eq "macports-clang-7.0" } {
require_active_variants clang-7.0 libstdcxx
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-8.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants clang-8.0 libstdcxx
</span> }
default_variants-append +libstdcxx
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -632,7 +634,7 @@ variant x11 conflicts cocoa description {Enables X11 graphical backend} {
</span>
# List of possible clang versions that work
# REMEMBER - Update the logic below when changing this list ...
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set clang_versions { 5.0 6.0 7.0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_versions { 5.0 6.0 7.0 8.0 }
</span>
# Define the available variants
foreach clang_ver ${clang_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -651,13 +653,16 @@ foreach clang_ver ${clang_versions} {
</span> # (ROOT crashes if the compiler it was built with doesn't exist)
if { ![variant_isset clang50] &&
![variant_isset clang60] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang70] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang70] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang80] } {
</span> if { ${configure.compiler} eq "macports-clang-5.0" } {
default_variants-append +clang50
} elseif { ${configure.compiler} eq "macports-clang-6.0" } {
default_variants-append +clang60
} elseif { ${configure.compiler} eq "macports-clang-7.0" } {
default_variants-append +clang70
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-8.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang80
</span> }
}
</pre><pre style='margin:0'>
</pre>