<pre style='margin:0'>
cjones051073 pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/188e202a41fcad26621d866e2230eaa62709c526">https://github.com/macports/macports-ports/commit/188e202a41fcad26621d866e2230eaa62709c526</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 188e202 ROOT6 - Update compiler blacklist and fallback to force use of macports clang 3.9 on OSX 10.7 to 10.9. Make c++14 the default.
</span>188e202 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 188e202a41fcad26621d866e2230eaa62709c526
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Dec 7 20:11:16 2016 +0000
<span style='display:block; white-space:pre;color:#404040;'> ROOT6 - Update compiler blacklist and fallback to force use of macports clang 3.9 on OSX 10.7 to 10.9. Make c++14 the default.
</span>---
science/root6/Portfile | 35 +++++++++++------------------------
1 file changed, 11 insertions(+), 24 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 6f636ff..8f9e90f 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;'>@@ -61,8 +61,8 @@ select.group root
</span> select.file ${filespath}/${name}
# Force a compatible compiler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append *gcc* {clang < 500} macports-clang-3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.fallback-append macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc* {clang < 602} macports-clang-3.3 macports-clang-3.4 macports-clang-3.5 macports-clang-3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.fallback macports-clang-3.9 macports-clang-3.8 macports-clang-3.7
</span>
# port specific location
set install_prefix ${prefix}/libexec/root${version_major}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,14 +226,9 @@ post-activate {
</span> ui_msg "======================================================================================"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Enable C++14 by default when Xcode allows (Xcode 6.3 onwards)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { [vercmp $xcodeversion "6.3"] >= 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +cxx14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +cxx14
</span>
variant qt4 description {Enable QT4 support} {
configure.args-replace -Dqt=OFF -Dqt=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,8 +237,6 @@ variant qt4 description {Enable QT4 support} {
</span>
variant cxx14 description {Enable c++14 compiler support} {
configure.args-replace -Dcxx14=OFF -Dcxx14=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Update compiler blacklist to force use of MP's Clang 3.7 when required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 602} macports-clang-3.4
</span> }
variant valgrind description {Build internal LLVM library with valgrind support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -548,7 +541,7 @@ variant x11 conflicts cocoa description {Enables X11 graphical backend} {
</span> # ========================================================================================
# List of possible clang versions that work
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set clang_versions { 3.4 3.5 3.6 3.7 3.8 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_versions { 3.7 3.8 3.9 }
</span>
# Define the available variants
foreach clang_ver ${clang_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -565,21 +558,15 @@ 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 clang34] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang35] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang36] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang37] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang38] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.compiler} eq "macports-clang-3.4" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-3.5" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-3.6" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-3.7" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ![variant_isset clang37] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang38] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang39] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.compiler} eq "macports-clang-3.7" } {
</span> default_variants-append +clang37
} elseif { ${configure.compiler} eq "macports-clang-3.8" } {
default_variants-append +clang38
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-3.9" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang39
</span> }
}
</pre><pre style='margin:0'>
</pre>