<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/1380b7c19d5845445f1f4dee9403d5f9355aa871">https://github.com/macports/macports-ports/commit/1380b7c19d5845445f1f4dee9403d5f9355aa871</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 1380b7c root6: add macports clang 7.0 support + OpenBLAS dependency.
</span>1380b7c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1380b7c19d5845445f1f4dee9403d5f9355aa871
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Oct 2 22:00:18 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: add macports clang 7.0 support + OpenBLAS dependency.
</span>---
science/root6/Portfile | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 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 18b9e7f..95d689e 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;'>@@ -12,7 +12,7 @@ PortGroup cxx11 1.1
</span>
github.setup root-project root 6-14-04 v
version [string map {- .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> livecheck.version ${github.version}
# Use git commit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,8 @@ depends_lib port:expat \
</span> port:gl2ps \
port:tbb \
port:lz4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vdt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vdt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:OpenBLAS
</span> # port:freetype
# Not working yet with macOS 10.14
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +80,7 @@ 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.7 macports-clang-4.0 macports-clang-3.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.whitelist clang macports-clang-6.0 macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.whitelist clang 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;'>@@ -627,7 +628,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 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_versions { 5.0 6.0 7.0 }
</span>
# Define the available variants
foreach clang_ver ${clang_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -645,11 +646,14 @@ 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)
if { ![variant_isset clang50] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang60] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang60] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang70] } {
</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
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-7.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang70
</span> }
}
</pre><pre style='margin:0'>
</pre>