<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c6b1b394d4f75408afb7653f73b5a46bff1d9bba">https://github.com/macports/macports-ports/commit/c6b1b394d4f75408afb7653f73b5a46bff1d9bba</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 c6b1b39 libcxx: force emulated_tls variant to build with a compatible clang
</span>c6b1b39 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c6b1b394d4f75408afb7653f73b5a46bff1d9bba
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Jan 9 17:45:04 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> libcxx: force emulated_tls variant to build with a compatible clang
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> only the whitelisted clang versions are capable of building this variant
</span><span style='display:block; white-space:pre;color:#404040;'> and only if they have emulated_tls enabled
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> covers the case where a user has an older clang-5.0 version installed
</span><span style='display:block; white-space:pre;color:#404040;'> or does not have the emulated_tls variant enabled on clang
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/57883
</span>---
lang/libcxx/Portfile | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 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 cd0ef97..76d2ec2 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,5 +1,7 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
name libcxx
epoch 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,11 +76,16 @@ if {${os.major} < 11 || [variant_isset replacemnt_libcxx]} {
</span>
if {${os.major} < 11} {
variant emulated_tls description {build libcxxabi and libcxx with support for emulated thread_local storage} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # only selected clang versions support emulated-tls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach ver {5.0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${prefix}/bin/clang-mp-${ver}] && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +emulated_tls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # only selected clang versions support emulated_tls, and the emulated_tls variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # needs to be enabled to build libcxx with emulated_tls support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach ver {5.0 6.0 7.0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/bin/clang-mp-${ver}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[active_variants clang-${ver} emulated_tls]} {
</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 macports-clang-${ver}
</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>