<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/0eed96c03bbddc2aa51302d3858d35b615f98315">https://github.com/macports/macports-ports/commit/0eed96c03bbddc2aa51302d3858d35b615f98315</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0eed96c03bbddc2aa51302d3858d35b615f98315
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Jan 24 21:46:48 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> root6: Update to 6.16.00. Reduce number of default variants, removing some unneccessary ones. Clean up support for old systems a bit.
</span>---
science/root6/Portfile | 168 ++++++++++++----------
science/root6/files/G__Core_Dict_cxxheaders.patch | 15 ++
2 files changed, 104 insertions(+), 79 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 98f5efa..e7505d6 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;'>@@ -11,7 +11,7 @@ PortGroup xcodeversion 1.0
</span> PortGroup cxx11 1.1
PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup root-project root 6-14-08 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup root-project root 6-16-00 v
</span> version [string map {- .} ${github.version}]
revision 0
livecheck.version ${github.version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,9 @@ livecheck.regex {v(6[-.]\d[02468][-.]\d{2}).tar.gz}
</span>
set version_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bc0244cb71e84e9f62168e1d460edda0afaebda1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ce26979f06f7e325180cc20db27fcfef429ee7f30b6ea0c6e7ba3f6ab89787b2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 162495374
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2f0a7290099087f29ca4808ad3ed6c3c04729075 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fe60cde3f3f909c6840781c4c46f3f040014bd1e65cc56634eccd820f9dbd7bf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 164845858
</span>
name root${version_major}
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +48,8 @@ platforms darwin
</span>
dist_subdir root/${version}_1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:expat \
port:gmp \
port:giflib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,14 +64,11 @@ depends_lib port:expat \
</span> port:lz4 \
port:vdt \
port:tbb \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libopenblas.dylib:OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:git \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libopenblas.dylib:OpenBLAS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl
</span> # port:freetype
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Not working yet with macOS 10.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:ocaml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:ocaml-ctypes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:ocaml-findlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_run port:root_select
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,6 +85,8 @@ compiler.whitelist clang macports-clang-7.0 macports-clang-6.0 macports-clang-5.
</span> # port specific location
set install_prefix ${prefix}/libexec/root${version_major}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-Dgnuinstall=ON \
-Drpath=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +112,7 @@ configure.args-append \
</span> -Dpythia6=OFF \
-Dpythia8=OFF \
-Droofit=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dssl=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dssl=ON \
</span> -Dxml=OFF \
-Dpython=OFF \
-Dfitsio=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,9 +129,9 @@ configure.args-append \
</span> -Dqtgsi=OFF \
-Dbonjour=OFF \
-Dgviz=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dsoversion=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsoversion=ON \
</span> -Dcxx11=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcxx14=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcxx14=OFF \
</span> -Dcxx17=OFF \
-Dlibcxx=ON \
-Dxrootd=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +142,7 @@ configure.args-append \
</span> -Dunuran=ON \
-Dtable=ON \
-Dgdml=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dhttp=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dhttp=ON \
</span> -Dvc=OFF \
-Dastiff=ON \
-Dgeocad=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,63 +152,84 @@ configure.args-append \
</span> -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
-DPNG_PNG_INCLUDE_DIR=${prefix}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Setup the C++ runtime (not needed/working yet but kept for reference)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use macports stdc++ on older systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.compiler} eq "macports-clang-3.9" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants clang-3.9 libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-4.0" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants clang-4.0 libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${configure.compiler} eq "macports-clang-5.0" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants clang-5.0 libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dlibcxx=ON -Dlibcxx=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [ exec find ${worksrcpath} -name "*.cmake" -or -name "*.in" -or -name "Makefile.*" ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|stdlib=libc++|stdlib=macports-libstdc++|g" $f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|std=c++11|std=c++1z|g" $f
</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;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that we are forcing this choice. This means that anything linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # against root6 needs to also be using libc++. This is possibly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # problematic, but luckily there is just a limited set of such dependents.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Another problem is that all dependencies might need to be built-in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to make sure that they all use libc++.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libcxx
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # No longer compiles on OSX10.6, due to update to internal LLVM version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable build on this platform.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</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 this OSX release."
</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;'>+# clad cling plugin fails to build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://root-forum.cern.ch/t/build-failure-with-6-16-00/32434
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -Dclad=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Enable C++17 on 10.12 (Darwin16)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# C++14 on 10.9 (Darwin13)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} > 15 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dcxx17=OFF -Dcxx17=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif { ${os.major} > 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dcxx14=OFF -Dcxx14=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append G__Core_Dict_cxxheaders.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable C++17 on 10.12 (Darwin16) and newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} > 15 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dcxx14=ON -Dcxx14=OFF
</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:#e0ffe0;'>+# Setup the C++ runtime on OSX10.8 (Darwin 12) and older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 13 && ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use macports stdc++ on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${configure.compiler} eq "macports-clang-5.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants clang-5.0 libstdcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-6.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants clang-6.0 libstdcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.compiler} eq "macports-clang-7.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants clang-7.0 libstdcxx
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +libstdcxx
</span> pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Force use of system python in build scripts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Find command finds text files containing the string to be replaced.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # shtest-encoding.py intentionally includes an unreadable character, so have to skip it ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pystringtoreplace "/usr/bin/env python"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [ exec find ${worksrcpath} -type f -and -not -name "shtest-encoding.py" -and -name "*.py" ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|${pystringtoreplace}|/usr/bin/python|g" $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [ exec find ${worksrcpath} -name "*.cmake" -or -name "*.in" -or -name "Makefile.*" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|stdlib=libc++|stdlib=${configure.cxx_stdlib}|g" $f
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # Note that we are forcing this choice. This means that anything linking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # against root6 needs to also be using libc++. This is possibly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # problematic, but luckily there is just a limited set of such dependents.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # Another problem is that all dependencies might need to be built-in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # to make sure that they all use libc++.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# if { ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.cxx_stdlib libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depends_lib-append port:libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Configure the C++ runtime to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dlibcxx=ON -Dlibcxx=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Configure the graphics backend. cocoa on OSX10.8 and newer. X11 otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} > 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Enable xrootd support by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} > 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +xrootd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# No longer compiles on OSX10.6, due to update to internal LLVM version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable build on this platform.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 11 } {
</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 this OSX release."
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Force use of system python in build scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find command finds text files containing the string to be replaced.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # shtest-encoding.py intentionally includes an unreadable character, so have to skip it ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pystringtoreplace "/usr/bin/env python"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [ exec find ${worksrcpath} -type f -and -not -name "shtest-encoding.py" -and -name "*.py" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|${pystringtoreplace}|/usr/bin/python|g" $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -277,7 +299,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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl
</span>
variant root7 description {Enable ROOT7 preview} {
configure.args-replace -Droot7=OFF -Droot7=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,10 +318,6 @@ variant valgrind description {Build internal LLVM library with valgrind support}
</span> depends_lib-append port:valgrind
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant http description {Build with HTTP Server library support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dhttp=OFF -Dhttp=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant vc description {Build with Vc library support} {
depends_lib-append port:Vc
configure.args-replace -Dvc=OFF -Dvc=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -316,10 +334,6 @@ variant xrootd description {Build with XRootD support} {
</span> depends_lib-append port:xrootd
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant soversion description {Build with soversion support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dsoversion=OFF -Dsoversion=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant graphviz description {Build with graphviz support} {
configure.args-replace -Dgviz=OFF -Dgviz=ON
configure.args-append -DGRAPHVIZ_INCLUDE_DIR="${prefix}/include"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -503,15 +517,11 @@ variant davix description {Enable Davix support} {
</span> configure.args-replace -Dbuiltin_davix=OFF -Dbuiltin_davix=ON
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ssl description {Build with ssl support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dssl=OFF -Dssl=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant xml description {Build with xml support} {
configure.args-replace -Dxml=OFF -Dxml=ON
configure.args-append -DLIBXML2_INCLUDE_DIR="${prefix}/include/libxml2" \
-DLIBXML2_LIBRARIES="${prefix}/lib/libxml2.dylib" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBXML2_LIBRARY="${prefix}/lib/libxml2.dylib" \
</span> -DLIBXML2_XMLLINT_EXECUTABLE="${prefix}/bin/xmllint"
depends_lib-append port:libxml2
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/files/G__Core_Dict_cxxheaders.patch b/science/root6/files/G__Core_Dict_cxxheaders.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6223a5d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/files/G__Core_Dict_cxxheaders.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 52e3ac9b50..415e179ac3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/core/base/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/core/base/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +73,10 @@ ROOT_GENERATE_DICTIONARY(G__Core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is needed becuase LinkDef.h includes other LinkDef starting from ${CMAKE_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET G__Core PROPERTY INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# make sure compiler include dir is passed to build command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#set_property(TARGET G__Core APPEND PROPERTY INCLUDE_DIRECTORIES ${CLING_CXX_HEADERS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_property(TARGET G__Core APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(REMOVE_ITEM sources TROOT.cxx roota.cxx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ROOT_OBJECT_LIBRARY(Base G__Core.cxx ${sources} BUILTINS PCRE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>