<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/196dcfe81fb4e083444eedeb1c68820c6eb18f01">https://github.com/macports/macports-ports/commit/196dcfe81fb4e083444eedeb1c68820c6eb18f01</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 196dcfe root6: Switch to MP clang 6.0 as default fallback and reenable c++17 for all builds. Remove obsolete gcc and clang variants.
</span>196dcfe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 196dcfe81fb4e083444eedeb1c68820c6eb18f01
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Jun 18 23:15:04 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: Switch to MP clang 6.0 as default fallback and reenable c++17 for all builds. Remove obsolete gcc and clang variants.
</span>---
science/root6/Portfile | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 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 5bb9ce1..bfbfc73 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;'>@@ -73,8 +73,8 @@ select.file ${filespath}/${name}
</span> # Force a compatible compiler
compiler.blacklist-append *gcc* {clang < 900} macports-clang-3.3 macports-clang-3.4 \
macports-clang-3.5 macports-clang-3.6 macports-clang-3.7 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-clang-3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.whitelist clang macports-clang-5.0 macports-clang-4.0 macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-clang-3.8 macports-clang-4.0 macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.whitelist clang 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;'>@@ -273,7 +273,7 @@ post-activate {
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +xrootd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +xrootd +cxx17
</span>
variant root7 description {Enable ROOT7 preview} {
configure.args-replace -Droot7=OFF -Droot7=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -623,7 +623,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 { 3.9 4.0 5.0 6.0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_versions { 5.0 6.0 }
</span>
# Define the available variants
foreach clang_ver ${clang_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -640,15 +640,9 @@ foreach clang_ver ${clang_versions} {
</span>
# make sure that the proper variant is automatically selected
# (ROOT crashes if the compiler it was built with doesn't exist)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ![variant_isset clang39] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang40] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang50] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ![variant_isset clang50] &&
</span> ![variant_isset clang60] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.compiler} eq "macports-clang-3.9" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-4.0" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang40
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-5.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.compiler} eq "macports-clang-5.0" } {
</span> default_variants-append +clang50
} elseif { ${configure.compiler} eq "macports-clang-6.0" } {
default_variants-append +clang60
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -674,10 +668,10 @@ if { ${active_clang_variant} != "" } {
</span>
# Enable variants that only seem to work when not using macports clang...
if [expr ![string match macports-clang-* ${configure.compiler}] ] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +veccore +cxx17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +veccore
</span> #default_variants-append +davix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +cxx14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# default_variants-append +cxx14
</span> }
# ========================================================================================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -687,7 +681,7 @@ if [expr ![string match macports-clang-* ${configure.compiler}] ] {
</span> # Note that g95 does not work here, so that variant is removed
# ========================================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set gcc_versions { 4.9 5 6 7 8 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gcc_versions { 6 7 8 }
</span> set default_fortran_variant +gcc7
foreach gcc_ver ${gcc_versions} {
</pre><pre style='margin:0'>
</pre>