<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/2dc866dc3fe920d14dc4cf0d45df61b50f5076da">https://github.com/macports/macports-ports/commit/2dc866dc3fe920d14dc4cf0d45df61b50f5076da</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 2dc866d ROOT6: use macports libstdc++ to fix build on older OSX releases
</span>2dc866d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2dc866dc3fe920d14dc4cf0d45df61b50f5076da
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Sep 28 23:30:47 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> ROOT6: use macports libstdc++ to fix build on older OSX releases
</span>---
science/root6/Portfile | 59 ++++++++++++++++++++++++++++++--------------------
1 file changed, 36 insertions(+), 23 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 63c0d1c..7d00760 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;'>@@ -8,6 +8,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup github 1.0
PortGroup select 1.0
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
#github.setup root-project root 6-10-06 v
#version [string map {- .} ${github.version}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,14 +17,14 @@ PortGroup xcodeversion 1.0
</span> #livecheck.version ${github.version}
# Use git commit to work around Xcode 9 issue
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup root-project root 07c9d8d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.10.06.01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup root-project root 1191a6eb35bb22453b354be8e754224f38672891
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.10.06.02
</span> livecheck.version 6-10-06
set version_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 46c2c8b0860c89c23f16bbd67592d5b6690d05c6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 08f452f1b0b9251e12766e1e683fd3ccfd05e35141276f45c2ce45b676c58777
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 131ce39d0199cc86bd2ac50ea31604ed2bb2743f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 15e5ca53281d14e2c6140e6b3cb80c285314e06930158e98ad9863db5f597603
</span>
name root${version_major}
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +55,8 @@ depends_lib port:expat \
</span> port:zlib \
port:xz \
port:gl2ps \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tbb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lz4
</span> # port:freetype
depends_run port:root_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,8 +73,12 @@ select.file ${filespath}/${name}
</span> #compiler.whitelist clang macports-clang-3.9 macports-clang-3.8
compiler.blacklist-append *gcc* {clang < 900} macports-clang-3.3 macports-clang-3.4 \
macports-clang-3.5 macports-clang-3.6 macports-clang-3.7 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-clang-3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-clang-3.8 macports-clang-4.0
</span> compiler.whitelist clang macports-clang-3.9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#compiler.blacklist-append *gcc* {clang < 900} macports-clang-3.3 macports-clang-3.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# macports-clang-3.5 macports-clang-3.6 macports-clang-3.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# macports-clang-3.8 macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#compiler.whitelist clang macports-clang-4.0
</span>
# port specific location
set install_prefix ${prefix}/libexec/root${version_major}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,24 +153,36 @@ configure.args-append \
</span>
platform darwin {
<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 { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants clang-3.9 libstdcxx
</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;'>+ default_variants-append +libstdcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</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=macports-libstdc++|g" $f
</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;'>+
</span> # No longer compiles on OSX10.6, due to update to internal LLVM version.
# Disable build on this platform.
<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;'>+ #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>
# Note that we are forcing this choice. This means that anything linking
# against root6 needs to also be using libc++. This is possibly
# problematic, but luckily there is just a limited set of such dependents.
# Another problem is that all dependencies might need to be built-in
# to make sure that they all use libc++.
<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:#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>
pre-configure {
# replace
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,13 +268,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 +veccore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Enable by default C++17 on macOS10.13 and newer. Otherwise C++14.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 16 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +cxx17
</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:#e0ffe0;'>+default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +veccore +cxx17
</span>
variant qt4 description {Enable QT4 support} {
configure.args-replace -Dqt=OFF -Dqt=ON
</pre><pre style='margin:0'>
</pre>