<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/fa2732a159f7405984dfb3d487f189a2363f66f6">https://github.com/macports/macports-ports/commit/fa2732a159f7405984dfb3d487f189a2363f66f6</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 fa2732a root6: update default compiler variants
</span>fa2732a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fa2732a159f7405984dfb3d487f189a2363f66f6
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue May 1 18:52:15 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: update default compiler variants
</span>---
science/root6/Portfile | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 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 976ea4c..b368991 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-12-06 v
version [string map {- .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> livecheck.version ${github.version}
# Use git commit to work around Xcode 9 issue
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ select.file ${filespath}/${name}
</span> 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 \
macports-clang-3.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.whitelist clang macports-clang-4.0 macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.whitelist clang macports-clang-5.0 macports-clang-4.0 macports-clang-3.9
</span>
# port specific location
set install_prefix ${prefix}/libexec/root${version_major}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@ configure.args-append \
</span> -DCMAKE_INSTALL_SYSCONFDIR="${install_prefix}/etc/root" \
-DCMAKE_INSTALL_NAME_DIR="${install_prefix}/lib/root" \
-Dfortran=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dbuiltin_davix=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuiltin_davix=OFF \
</span> -Dbuiltin_freetype=ON \
-Dbuiltin_glew=OFF \
-Dbuiltin_pcre=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,11 +184,6 @@ platform darwin {
</span> return -code error "Unsupported OSX version"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable veccore variant by default on macOS 10.13 or newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} > 16 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +veccore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
pre-configure {
# replace
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -504,6 +499,10 @@ foreach py_ver ${python_versions} {
</span>
# ========================================================================================
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant davix description {Enable Davix support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dbuiltin_davix=OFF -Dbuiltin_davix=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant ssl description {Build with ssl support} {
configure.args-replace -Dssl=OFF -Dssl=ON
depends_lib-append path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -620,7 +619,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 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_versions { 3.9 4.0 5.0 6.0 }
</span>
# Define the available variants
foreach clang_ver ${clang_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -639,13 +638,16 @@ foreach clang_ver ${clang_versions} {
</span> # (ROOT crashes if the compiler it was built with doesn't exist)
if { ![variant_isset clang39] &&
![variant_isset clang40] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang50] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang50] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang60] } {
</span> if { ${configure.compiler} eq "macports-clang-3.9" } {
default_variants-append +clang39
} elseif { ${configure.compiler} eq "macports-clang-4.0" } {
default_variants-append +clang40
} elseif { ${configure.compiler} eq "macports-clang-5.0" } {
default_variants-append +clang50
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-6.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang60
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -666,6 +668,11 @@ if { ${active_clang_variant} != "" } {
</span> depends_run-append port:clang-${active_clang_variant}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Enable variants that only seem to work when not using macports clang...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [expr ![string match macports-clang-* ${configure.compiler}] ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +veccore +davix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # ========================================================================================
# Following is for fortran support
# Might eventually move to a portgroup, or similar, so could be simplified.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -673,7 +680,7 @@ if { ${active_clang_variant} != "" } {
</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 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gcc_versions { 4.9 5 6 7 8 }
</span> set default_fortran_variant +gcc7
foreach gcc_ver ${gcc_versions} {
</pre><pre style='margin:0'>
</pre>