<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/5a18919f945784e3259c596d8fa1799f546a74ab">https://github.com/macports/macports-ports/commit/5a18919f945784e3259c596d8fa1799f546a74ab</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5a18919f945784e3259c596d8fa1799f546a74ab
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Apr 13 14:00:06 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> bazel PG: Adapt to changes on bazel {sub}ports to allow them to be installed at the same time
</span>---
_resources/port1.0/group/bazel-1.0.tcl | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 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 3064e0816a0..049f513723a 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;'>@@ -8,11 +8,14 @@ PortGroup compiler_blacklist_versions 1.0
</span>
namespace eval bazel { }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options bazel.version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default bazel.version "latest"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> options bazel.min_xcode
default bazel.min_xcode 12.2
options bazel.build_cmd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default bazel.build_cmd bazel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default bazel.build_cmd {[bazel::get_build_cmd]}
</span>
options bazel.build_cmd_opts
default bazel.build_cmd_opts {[bazel::get_cmd_opts]}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +29,6 @@ default bazel.build_target ""
</span> options bazel.post_build_cmd
default bazel.post_build_cmd ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options bazel.version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default bazel.version "latest"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> options bazel.max_idle_secs
default bazel.max_idle_secs 30
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,14 +90,18 @@ if { [bazel::use_mp_clang] } {
</span> compiler.blacklist-append {clang}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc bazel::set_dep { } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Defining bazel port dependency"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc bazel::get_build_cmd { } {
</span> if { [option bazel.version] eq "latest" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:bazel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return bazel
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:bazel-[option bazel.version]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return bazel-[option bazel.version]
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc bazel::set_dep { } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Defining bazel port dependency"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:[option bazel.build_cmd]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> port::register_callback bazel::set_dep
variant native description {Build from source for best native platform support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,6 +140,15 @@ proc bazel::set_env {} {
</span> configure.env-append BAZEL_SH=/bin/bash
build.env-append BAZEL_SH=/bin/bash
destroot.env-append BAZEL_SH=/bin/bash
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch PATH to find correct 'bazel' version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global workpath prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${workpath}/bazel_bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/[option bazel.build_cmd] ${workpath}/bazel_bin/bazel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "PATH=${workpath}/bazel_bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "PATH=${workpath}/bazel_bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "PATH=${workpath}/bazel_bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
port::register_callback bazel::set_env
</pre><pre style='margin:0'>
</pre>