<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/0493515fa7029cabc1dc8145a81b9dbd260752ac">https://github.com/macports/macports-ports/commit/0493515fa7029cabc1dc8145a81b9dbd260752ac</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 0493515 libcxx: Avoid hardcoded list of clang compiler versions
</span>0493515 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0493515fa7029cabc1dc8145a81b9dbd260752ac
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Oct 30 11:36:03 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> libcxx: Avoid hardcoded list of clang compiler versions
</span>---
lang/libcxx/Portfile | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/libcxx/Portfile b/lang/libcxx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bba2f19..a5879b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/libcxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/libcxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> name libcxx
epoch 1
version 5.0.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,11 +90,18 @@ if {${os.major} < 11 || [variant_isset replacemnt_libcxx]} {
</span>
# only selected clang versions support emulated_tls, and the emulated_tls variant
# needs to be enabled to build libcxx with emulated_tls support
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach ver {5.0 6.0 7.0 8.0 9.0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${prefix}/bin/clang-mp-${ver}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants clang-${ver} emulated_tls]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +emulated_tls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist-prepend macports-clang-${ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach clang_c ${compiler.fallback} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match macports-clang-* $clang_c]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract version number from macports clang compiler name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clang_v [lindex [split $clang_c -] 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${clang_v} >= 5.0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/bin/clang-mp-${clang_v}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[active_variants clang-${clang_v} emulated_tls]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Adding ${clang_c} to compiler whitelist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +emulated_tls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist-prepend ${clang_c}
</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:#e0e0e0;'>@@ -102,9 +110,16 @@ if {${os.major} < 11 || [variant_isset replacemnt_libcxx]} {
</span> compiler.blacklist *gcc* {clang < 500}
# clang 3.5 and newer are conditionally blacklisted to prevent dependency cycles
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach ver {3.5 3.6 3.7 3.8 3.9 4.0 5.0 6.0 7.0 8.0 9.0 devel} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/bin/clang-mp-${ver}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append macports-clang-${ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach clang_c ${compiler.fallback} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match macports-clang-* $clang_c]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract version number from macports clang compiler name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clang_v [lindex [split $clang_c -] 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${clang_v} >= 3.5 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/bin/clang-mp-${clang_v}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Adding ${clang_c} to compiler blacklist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append ${clang_c}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>