<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/a74261ff6d27538470653802614ee5517c9a366b">https://github.com/macports/macports-ports/commit/a74261ff6d27538470653802614ee5517c9a366b</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 a74261f root6: Update compiler blacklist to use MP clang 7 on 10.13
</span>a74261f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a74261ff6d27538470653802614ee5517c9a366b
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Jan 25 12:11:10 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> root6: Update compiler blacklist to use MP clang 7 on 10.13
</span>---
science/root6/Portfile | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 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 deb757b..e590f79 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;'>@@ -78,7 +78,7 @@ 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 < 900} macports-clang-3.3 macports-clang-3.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc* {clang < 920} macports-clang-3.3 macports-clang-3.4 \
</span> macports-clang-3.7 macports-clang-4.0 macports-clang-3.9
compiler.whitelist clang macports-clang-7.0 macports-clang-6.0 macports-clang-5.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,20 +156,20 @@ configure.args-append \
</span> # https://root-forum.cern.ch/t/build-failure-with-6-16-00/32434
configure.args-append -Dclad=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Enable C++17 on 10.12 (Darwin16)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Enable C++17 on 10.14 (Darwin18)
</span> # C++14 on 10.9 (Darwin13)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 15 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} >= 18 } {
</span> configure.args-replace -Dcxx17=OFF -Dcxx17=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif { ${os.major} > 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif { ${os.major} >= 13 } {
</span> configure.args-replace -Dcxx14=OFF -Dcxx14=ON
default_variants-append +clang70
} else {
default_variants-append +clang50
<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;'>+ #patchfiles-append G__Core_Dict_cxxheaders.patch
</span> }
# Setup the C++ runtime on OSX10.8 (Darwin 12) and older
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 13 && ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} <= 12 && ${configure.cxx_stdlib} ne "libc++" } {
</span> # Use macports stdc++ on older systems
if { ${configure.compiler} eq "macports-clang-5.0" } {
require_active_variants clang-5.0 libstdcxx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,20 +202,20 @@ if { ${configure.cxx_stdlib} ne "libc++" } {
</span> }
# Configure the graphics backend. cocoa on OSX10.8 and newer. X11 otherwise
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} >= 12 } {
</span> default_variants-append +cocoa
} else {
default_variants-append +x11
}
# Enable xrootd support by default
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} >= 12 } {
</span> default_variants-append +xrootd
}
# No longer compiles on OSX10.6, due to update to internal LLVM version.
# Disable build on this platform.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} <= 10 } {
</span> pre-fetch {
ui_error "${name} is not supported on this OSX release."
return -code error "Unsupported OSX version"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -418,7 +418,7 @@ set python_versions { 2.7 3.5 3.6 3.7 }
</span> # Disabled on older systems due to an issue fetching the source for
# the various python dependencies due to these systems having out of
# date SSL versions that are rejected by the upstream server.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} >= 13 } {
</span> set default_python_variant +python36
} else {
set default_python_variant ""
</pre><pre style='margin:0'>
</pre>