<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/e746dd7d9fc441c9f52cd5ec373df186a75da16a">https://github.com/macports/macports-ports/commit/e746dd7d9fc441c9f52cd5ec373df186a75da16a</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 e746dd7 root5: Prefer MPs clang 5.0 compiler. remove old clang variants.
</span>e746dd7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e746dd7d9fc441c9f52cd5ec373df186a75da16a
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Apr 30 16:56:46 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> root5: Prefer MPs clang 5.0 compiler. remove old clang variants.
</span>---
science/root5/Portfile | 56 +++++++++++++++++++++-----------------------------
1 file changed, 23 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root5/Portfile b/science/root5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 36af1f9..69cfbd5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ PortGroup github 1.0
</span> #github.setup root-mirror root 5-34-36 v
github.setup root-mirror root c06fdea
version 5.34.37
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
set version_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,8 +51,9 @@ 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} {clang > 890} macports-clang-3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.fallback-append macports-clang-3.8 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 macports-clang-3.3 macports-clang-3.4 macports-clang-3.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-clang-3.6 macports-clang-3.5 macports-clang-3.8
</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>
post-patch {
# reinplace "s|-lfreetype| \`freetype-config --libs\`|g" ${worksrcpath}/config/root-config.in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,12 +203,13 @@ if {${os.major} > 10} {
</span> }
# ROOT5 is no longer support from macOS 10.13.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} > 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} is not supported on macOS 10.13 or newer. Please migrate to ROOT6."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Unsupported OSX version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Not needed any longer with MPs clang 5.0, but keep for future reference...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if {${os.major} > 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ui_error "${name} is not supported on macOS 10.13 or newer. Please migrate to ROOT6."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# return -code error "Unsupported OSX version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#}
</span>
variant http description {Build with HTTP Server library support} {
configure.args-replace --disable-http --enable-http
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -318,7 +320,7 @@ variant opengl description {Build with opengl support} {
</span> # ========================================================================================
# List of possible python versions
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_versions { 2.6 2.7 3.3 3.4 3.5 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_versions { 2.7 3.5 3.6 }
</span>
# Define the available variants
foreach ver ${python_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -500,7 +502,7 @@ if { ![variant_isset cocoa] && ![variant_isset x11] } {
</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 3.9 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_versions { 3.9 4.0 5.0 }
</span>
# Define the available variants
foreach ver ${clang_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -517,27 +519,15 @@ foreach 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 clang33] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![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;'>- ![variant_isset clang39] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.compiler} eq "macports-clang-3.3" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${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:#ffe0e0;'>- default_variants-append +clang37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-3.8" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-3.9" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ![variant_isset clang39] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang40] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang50] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.compiler} eq "macports-clang-3.9" } {
</span> default_variants-append +clang39
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-4.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-5.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang50
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -601,8 +591,8 @@ if {[variant_isset qt_mac]} {
</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.7 4.8 4.9 5 6 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set default_fortran_variant +gcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gcc_versions { 4.9 5 6 7 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_fortran_variant +gcc7
</span>
foreach ver ${gcc_versions} {
set ver_no_dot [join [split ${ver} "."] ""]
</pre><pre style='margin:0'>
</pre>