<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/2b77ac6557b5631c90a47ca6de47138f67c5a748">https://github.com/macports/macports-ports/commit/2b77ac6557b5631c90a47ca6de47138f67c5a748</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 2b77ac6557b bazel PG: Fix issue with declaring bazel dep when build command is set to null Closes: https://trac.macports.org/ticket/62725
</span>2b77ac6557b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 2b77ac6557b5631c90a47ca6de47138f67c5a748
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Apr 22 00:54:13 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    bazel PG: Fix issue with declaring bazel dep when build command is set to null
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/62725
</span>---
 _resources/port1.0/group/bazel-1.0.tcl | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 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 97f7371fc1b..396e54f760a 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;'>@@ -15,7 +15,7 @@ options bazel.min_xcode
</span> default bazel.min_xcode 12.2
 
 options bazel.build_cmd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default bazel.build_cmd {[bazel::get_build_cmd]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default bazel.build_cmd {[bazel::get_bazel_executable_name]}
</span> 
 options bazel.build_cmd_opts
 default bazel.build_cmd_opts {[bazel::get_cmd_opts]}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,7 @@ if { [bazel::use_mp_clang] } {
</span>     compiler.blacklist-append {clang}
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc bazel::get_build_cmd { } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc bazel::get_bazel_executable_name { } {
</span>     if { [option bazel.version] eq "latest" } {
         return bazel
     } else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,11 +99,9 @@ proc bazel::get_build_cmd { } {
</span> }
 
 proc bazel::set_dep { } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set bz_dep [option bazel.build_cmd]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if { ${bz_dep} ne "" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_debug "Defining bazel dependency port:${bz_dep}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_build-append port:${bz_dep}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set bz_dep [bazel::get_bazel_executable_name]
</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> }
 port::register_callback bazel::set_dep
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,13 +143,11 @@ 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;'>-    if { [option bazel.build_cmd] ne "" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set newpath "PATH=${prefix}/libexec/[option bazel.build_cmd]/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.env-append ${newpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        build.env-append     ${newpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        destroot.env-append  ${newpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_debug "Prepended ${newpath}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set newpath "PATH=${prefix}/libexec/[bazel::get_bazel_executable_name]/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env-append ${newpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.env-append     ${newpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.env-append  ${newpath}
</span><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>