<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/8c0bd91205487930883d7bc8c8fa866ec569964c">https://github.com/macports/macports-ports/commit/8c0bd91205487930883d7bc8c8fa866ec569964c</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 8c0bd912054 bazel PG: Check for null build cmd before using
</span>8c0bd912054 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8c0bd91205487930883d7bc8c8fa866ec569964c
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Apr 13 16:36:41 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> bazel PG: Check for null build cmd before using
</span>---
_resources/port1.0/group/bazel-1.0.tcl | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/bazel-1.0.tcl b/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 75ddf77c01a..97f7371fc1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,8 +99,11 @@ proc bazel::get_build_cmd { } {
</span> }
proc bazel::set_dep { } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Defining bazel port dependency"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:[option bazel.build_cmd]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bz_dep [option bazel.build_cmd]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${bz_dep} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Defining bazel dependency port:${bz_dep}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:${bz_dep}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
port::register_callback bazel::set_dep
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,6 +133,7 @@ if {![variant_isset native]} {
</span> }
proc bazel::set_env {} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix env
</span> ui_debug "Setting Bazel Env"
if { [bazel::use_mp_clang] } {
configure.env-append BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,12 +145,12 @@ proc bazel::set_env {} {
</span> build.env-append BAZEL_SH=/bin/bash
destroot.env-append BAZEL_SH=/bin/bash
# patch PATH to find correct 'bazel' version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option bazel.build_cmd] ne "" } {
</span> set newpath "PATH=${prefix}/libexec/[option bazel.build_cmd]/bin:$env(PATH)"
configure.env-append ${newpath}
build.env-append ${newpath}
destroot.env-append ${newpath}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Prepended ${newpath}"
</span> }
}
port::register_callback bazel::set_env
</pre><pre style='margin:0'>
</pre>