<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/f860918e323f6ad020e0dcb85c668501535ecb53">https://github.com/macports/macports-ports/commit/f860918e323f6ad020e0dcb85c668501535ecb53</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 f860918 gnutls: move compiler.whitelist before variants test
</span>f860918 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f860918e323f6ad020e0dcb85c668501535ecb53
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Jan 13 21:44:01 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> gnutls: move compiler.whitelist before variants test
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> this is a bit tricky. We need to whitelist clang-5.0, but
</span><span style='display:block; white-space:pre;color:#404040;'> can only test for the emulated_tls variant on the second pass through
</span><span style='display:block; white-space:pre;color:#404040;'> this code, after it has been installed. So we do a file test for
</span><span style='display:block; white-space:pre;color:#404040;'> it to see if clang-5.0 is installed before testing the variant.
</span>---
devel/gnutls/Portfile | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gnutls/Portfile b/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e705a12..d50441e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,18 +157,19 @@ platform darwin i386 {
</span> compiler.whitelist macports-gcc-6
universal_variant no
} elseif {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants clang-5.0 emulated_tls]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # needs to use a newer NM version to handle clang-5.0's objects on leopard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:cctools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append NM=${prefix}/bin/nm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append lt_cv_path_NM=${prefix}/bin/nm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/bin/clang-mp-5.0]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[active_variants clang-5.0 emulated_tls]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # needs to use a newer NM version to handle clang-5.0's objects on leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:cctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append NM=${prefix}/bin/nm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append lt_cv_path_NM=${prefix}/bin/nm
</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;'>+ ui_error "Please install clang-5.0 first, with the emulated_tls variant enabled."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "unsupported configuration"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Please install clang-5.0 first, with the emulated_tls variant enabled."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "unsupported configuration"
</span> }
}
}
</pre><pre style='margin:0'>
</pre>