<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/374c885abfcd84eef916ab55371378e5d8fe9d03">https://github.com/macports/macports-ports/commit/374c885abfcd84eef916ab55371378e5d8fe9d03</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 374c885abfc bazel: Bugfix
</span>374c885abfc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 374c885abfcd84eef916ab55371378e5d8fe9d03
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Wed Mar 24 21:14:21 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> bazel: Bugfix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/62551
</span>---
devel/bazel/Portfile | 7 +++++--
1 file changed, 5 insertions(+), 2 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 c66618cce62..3de1ac1173a 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;'>@@ -90,6 +90,9 @@ if { ${name} eq ${subport} } {
</span> compiler.blacklist-append {clang < 710}
compiler.blacklist-append {macports-clang-[7-9].0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/62551
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif { "bazel-2.0" eq ${subport} } {
# Specific version for py-tensorflow - DO NOT CHANGE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,7 +264,7 @@ build {
</span> set bazel_cmd "PATH=${workpath}/bin:\$PATH JAVA_HOME=${java.home} VERBOSE=yes BAZEL_WRKDIR=${workpath} ./compile.sh"
# If using MP toolchain pass options to enforce this
if { ${use_mp_clang} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set bazel_cmd "EXTRA_BAZEL_ARGS='--action_env=CC=${configure.cc} --action_env=CXX=${configure.cxx}' ${bazel_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bazel_cmd "EXTRA_BAZEL_ARGS='\${EXTRA_BAZEL_ARGS} --action_env=CC=${configure.cc} --action_env=CXX=${configure.cxx}' ${bazel_cmd}"
</span> set bazel_cmd "BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 ${bazel_cmd}"
}
system -W ${worksrcpath} "${bazel_cmd}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,7 +279,7 @@ build {
</span> file delete -force /var/tmp/_${name}_root
# Build the bash completion script
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "./${name} --max_idle_secs=60 --output_user_root=${workpath} build -s //scripts:${name}-complete.bash"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "./${name} --max_idle_secs=30 --output_user_root=${workpath} build -s //scripts:${name}-complete.bash"
</span>
}
}
</pre><pre style='margin:0'>
</pre>