<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/a3f4f848305100e5b975545f2e7b384d0027c791">https://github.com/macports/macports-ports/commit/a3f4f848305100e5b975545f2e7b384d0027c791</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 a3f4f84 root6: Disable c++17 on 10.11 and older. Remove c++14/c++17 variants. Use macports TBB unconditionally.
</span>a3f4f84 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a3f4f848305100e5b975545f2e7b384d0027c791
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Jan 16 19:37:26 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> root6: Disable c++17 on 10.11 and older. Remove c++14/c++17 variants. Use macports TBB unconditionally.
</span>---
science/root6/Portfile | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 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 8d57e79..98f5efa 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,6 +61,7 @@ depends_lib port:expat \
</span> port:gl2ps \
port:lz4 \
port:vdt \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tbb \
</span> path:lib/libopenblas.dylib:OpenBLAS
# port:freetype
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +99,7 @@ configure.args-append \
</span> -Dbuiltin_pcre=OFF \
-Dbuiltin_zlib=OFF \
-Dbuiltin_lzma=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dbuiltin_tbb=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuiltin_tbb=OFF \
</span> -Dbuiltin_afterimage=ON \
-Dfftw3=OFF \
-Dkrb5=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,7 +130,7 @@ configure.args-append \
</span> -Dgviz=OFF \
-Dsoversion=OFF \
-Dcxx11=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcxx14=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcxx14=ON \
</span> -Dcxx17=OFF \
-Dlibcxx=ON \
-Dxrootd=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,10 +192,10 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use macports TBB for 10.12 (Darwin16) and newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable C++17 on 10.12 (Darwin16) and newer
</span> if { ${os.major} > 15 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dbuiltin_tbb=ON -Dbuiltin_tbb=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dcxx14=ON -Dcxx14=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dcxx17=OFF -Dcxx17=ON
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,7 +277,7 @@ post-activate {
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +xrootd +cxx17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +xrootd
</span>
variant root7 description {Enable ROOT7 preview} {
configure.args-replace -Droot7=OFF -Droot7=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -287,14 +288,6 @@ variant qt4 description {Enable QT4 support} {
</span> PortGroup qt4 1.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant cxx14 description {Enable c++14 compiler support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dcxx14=OFF -Dcxx14=ON
</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:#ffe0e0;'>-variant cxx17 description {Enable c++17 compiler support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dcxx17=OFF -Dcxx17=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant veccore description {Enable VecCore support} {
configure.args-replace -Dbuiltin_veccore=OFF -Dbuiltin_veccore=ON
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -672,13 +665,6 @@ if { ${active_clang_variant} != "" } {
</span> depends_run-append port:clang-${active_clang_variant}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Enable variants that only seem to work when not using macports clang...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if [expr ![string match macports-clang-* ${configure.compiler}] ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# default_variants-append +veccore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#} else {
</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:#ffe0e0;'>-
</span> # ========================================================================================
# Following is for fortran support
# Might eventually move to a portgroup, or similar, so could be simplified.
</pre><pre style='margin:0'>
</pre>