Ticket #43917: root6-libc++.diff

dports/science/root6/Portfile

@@ -37 +37 @@
 configure.dir       ${workpath}/build
 build.dir           ${configure.dir}
 
-# (copied from llvm-3.5)
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
-    # Note that we are forcing this choice.  This means that anything linking
-    # against llvm-3.5 needs to also be using libc++.  This is possibly
-    # problematic, but luckily there is just a limited set of such dependents.
-
-    if {[info exists configure.cxx_stdlib]} {
-        configure.cxx_stdlib libc++
-    }
-
-    depends_lib-append port:libcxx
-}
 pre-fetch {
     if {(${os.major} < 13 && ! [info exists configure.cxx_stdlib]) ||
         (! [file exists /usr/lib/libc++.dylib])} {
@@ -125 +112 @@
                     -Dbonjour=OFF \
                     -Dgviz=OFF \
                     -Dsoversion=OFF \
-                    -Dc++11=OFF \
-                    -Dlibcxx=OFF \
+                    -Dc++11=ON \
+                    -Dlibcxx=ON \
                     -Dxrootd=OFF \
                     -Dbuiltin_ftgl=ON \
                     -Dmathmore=ON \
@@ -133 +120 @@
                     -Dgenvector=ON \
                     -Dmemstat=ON \
                     -Dunuran=ON \
-                    -Dreflex=ON \
                     -Dtable=ON \
                     -Dgdml=ON \
                     -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
@@ -145 +131 @@
 configure.args-append       -DCMAKE_INCLUDE_PATH=${prefix}/include
 configure.cppflags-delete   -I${prefix}/include
 
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
 platform darwin {
-    set cxxstdlib {}
-
-    if {[info exists configure.cxx_stdlib] &&
-        ${configure.cxx_stdlib} ne {} &&
-        [string match *clang* ${configure.cxx}]} {
-        set cxxstdlib ${configure.cxx_stdlib}
-    } elseif {[string match *clang* ${configure.cxx}] && ${os.major} >= 13} {
-        set cxxstdlib libc++
-    } else {
-        set cxxstdlib libstdc++
+    if { ${configure.cxx_stdlib} ne "libc++" } {
+        if { [info exists configure.cxx_stdlib] } {
+            configure.cxx_stdlib libc++
+            depends_lib-append port:libcxx
+        } else {
+            configure.args-replace -Dc++11=ON -Dc++11=OFF
+            configure.args-replace -Dlibcxx=ON -Dlibcxx=OFF
+        }
     }
-
-    if {${cxxstdlib} eq "libc++"} {
-        configure.args-replace -Dc++11=OFF -Dc++11=ON
-    }
 }
 
 post-destroot {