root6: Fallback from c++17 to c++14 for macports clang builds. Use ne…

…w VDT port.
macports · Jun 15, 2018 · c1ffc92 · c1ffc92
1 parent 7ffc491
commit c1ffc92
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/science/root6/Portfile b/science/root6/Portfile
@@ -20,6 +20,7 @@ PortGroup           cxx11 1.1
 github.setup        cjones051073 root 6e90aef0c646668a513fd2e291500c0c31fa1af2
 version             6.14.00
 livecheck.version   6-14-00
+revision            1
 
 set version_major   [lindex [split ${version} .] 0]
 
@@ -57,7 +58,8 @@ depends_lib         port:expat \
                     port:xz \
                     port:gl2ps \
                     port:tbb \
-                    port:lz4
+                    port:lz4 \
+                    port:vdt
                   # port:freetype
 
 depends_run         port:root_select
@@ -271,7 +273,7 @@ post-activate {
 
 universal_variant no
 
-default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +cxx17 +xrootd
+default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +xrootd
 
 variant root7 description {Enable ROOT7 preview} {
     configure.args-replace  -Droot7=OFF -Droot7=ON
@@ -672,8 +674,10 @@ if { ${active_clang_variant} != "" } {
 
 # Enable variants that only seem to work when not using macports clang...
 if [expr ![string match macports-clang-* ${configure.compiler}] ] {
-    default_variants-append +veccore
+    default_variants-append +veccore +cxx17
     #default_variants-append +davix
+} else {
+    default_variants-append +cxx14
 }
 
 # ========================================================================================