<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/ed4144dff51f4fc8ad3587440feeff05e0cb8a3f">https://github.com/macports/macports-ports/commit/ed4144dff51f4fc8ad3587440feeff05e0cb8a3f</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 ed4144dff51 bazel{-X}: Disable external toolchain flag
</span>ed4144dff51 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ed4144dff51f4fc8ad3587440feeff05e0cb8a3f
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon May 3 21:01:15 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> bazel{-X}: Disable external toolchain flag
</span>---
devel/bazel/Portfile | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bazel/Portfile b/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 526bd7d1edb..71a9f4c8efc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -283,11 +283,15 @@ build.env-append CC=${wrapdir}/cc \
</span> JAVA_HOME=${java.home}
proc use_external_toolchain {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global configure.compiler xcodeversion bazel_min_xcode os.major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set is_mp_clang [ expr { [ string match macports-clang-* ${configure.compiler} ] } ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set xcode_not_ok [ expr { ${xcodeversion} eq "none" || [ vercmp ${xcodeversion} ${bazel_min_xcode} ] < 0 } ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set use_legacy_s [ expr ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [ expr ${is_mp_clang} || ${xcode_not_ok} || ${use_legacy_s} ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # global configure.compiler xcodeversion bazel_min_xcode os.major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set is_mp_clang [ expr { [ string match macports-clang-* ${configure.compiler} ] } ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set xcode_not_ok [ expr { ${xcodeversion} eq "none" || [ vercmp ${xcodeversion} ${bazel_min_xcode} ] < 0 } ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set use_legacy_s [ expr ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # return [ expr ${is_mp_clang} || ${xcode_not_ok} || ${use_legacy_s} ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not use above as seems to cause compilation failures. To be investigated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # src/main/native/unix_jni_darwin.cc:22:10: fatal error: 'os/log.h' file not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # #include <os/log.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return no
</span> }
# Disable Xcode detection on older OSes, as we want the
</pre><pre style='margin:0'>
</pre>