<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/1f0a2cc30f1a233d5f7c99a054d8c6c4df375909">https://github.com/macports/macports-ports/commit/1f0a2cc30f1a233d5f7c99a054d8c6c4df375909</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 1f0a2cc30f1 bazel: Clean up setting extra bazel args
</span>1f0a2cc30f1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1f0a2cc30f1a233d5f7c99a054d8c6c4df375909
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Mar 25 09:58:30 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> bazel: Clean up setting extra bazel args
</span>---
devel/bazel/Portfile | 14 ++++++++++++--
1 file changed, 12 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 3de1ac1173a..af47932defe 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;'>@@ -28,6 +28,9 @@ set min_darwin 16
</span> # Note setting here should be in sync with that in py-tensorflow
set bazel_min_xcode 9.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Extra args for bazel command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set extra_args ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${name} eq ${subport} } {
# Main port
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +94,7 @@ if { ${name} eq ${subport} } {
</span> compiler.blacklist-append {macports-clang-[7-9].0}
# https://trac.macports.org/ticket/62551
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set extra_args "--host_javabase=@local_jdk//:jdk"
</span>
} elseif { "bazel-2.0" eq ${subport} } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,10 +242,15 @@ set use_mp_clang [ expr ( [ string match macports-clang-* ${configure.compiler}
</span> # Disable Xcode detection on older OSes, as we want the
# MP provided commandline utilities to be used instead.
if { ${use_mp_clang} } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set extra_args "--action_env=CC=${configure.cc} --action_env=CXX=${configure.cxx} ${extra_args}"
</span> build.env-append BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
configure.env-append BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${extra_args} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append EXTRA_BAZEL_ARGS="'${extra_args}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant bash_completion {
depends_build-append bin:bash:bash
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -264,9 +272,11 @@ 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='\${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}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${extra_args} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bazel_cmd "EXTRA_BAZEL_ARGS='${extra_args}' ${bazel_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> system -W ${worksrcpath} "${bazel_cmd}"
# Put executable in main working folder
</pre><pre style='margin:0'>
</pre>