<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/18526e8937f4423a6793db23cb5ed10155ccaddc">https://github.com/macports/macports-ports/commit/18526e8937f4423a6793db23cb5ed10155ccaddc</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 18526e8 ROOT6: Another fix, adding back missing libc++ settings
</span>18526e8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 18526e8937f4423a6793db23cb5ed10155ccaddc
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Sep 29 01:41:55 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> ROOT6: Another fix, adding back missing libc++ settings
</span>---
science/root6/Portfile | 48 +++++++++++++++++++++++++-----------------------
1 file changed, 25 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 95ddfbc..b6981b7 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;'>@@ -71,14 +71,10 @@ select.file ${filespath}/${name}
</span> #compiler.blacklist-append *gcc* {clang < 602} macports-clang-3.3 macports-clang-3.4 \
# macports-clang-3.5 macports-clang-3.6 macports-clang-3.7
#compiler.whitelist clang macports-clang-3.9 macports-clang-3.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append *gcc* {clang < 900} macports-clang-3.3 macports-clang-3.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc* {clang < 700} macports-clang-3.3 macports-clang-3.4 \
</span> macports-clang-3.5 macports-clang-3.6 macports-clang-3.7 \
macports-clang-3.8 macports-clang-4.0
compiler.whitelist clang macports-clang-3.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#compiler.blacklist-append *gcc* {clang < 900} macports-clang-3.3 macports-clang-3.4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# macports-clang-3.5 macports-clang-3.6 macports-clang-3.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# macports-clang-3.8 macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#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;'>@@ -155,7 +151,13 @@ platform darwin {
</span>
# Use macports stdc++ on older systems
if { ${os.major} < 13 } {
<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:#e0ffe0;'>+ if { ${configure.compiler} eq "macports-clang-3.9" } {
</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;'>+ } elseif { ${configure.compiler} eq "macports-clang-4.0" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants clang-4.0 libstdcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${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;'>+ }
</span> configure.args-replace -Dlibcxx=ON -Dlibcxx=OFF
default_variants-append +libstdcxx
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,26 +165,26 @@ platform darwin {
</span> reinplace "s|stdlib=libc++|stdlib=macports-libstdc++|g" $f
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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>
# 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:#ffe0e0;'>-
</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:#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>
pre-configure {
# replace
</pre><pre style='margin:0'>
</pre>