<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/17eecc1e7d239a10ce193114bdcd6136ea111b00">https://github.com/macports/macports-ports/commit/17eecc1e7d239a10ce193114bdcd6136ea111b00</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 17eecc1e7d239a10ce193114bdcd6136ea111b00
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Apr 13 13:48:46 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> bazel{-X}: Allow {sub}ports to be installed at the same time
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62691
</span>---
devel/bazel/Portfile | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 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 87e6fbef24f..9cd1017258b 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;'>@@ -16,11 +16,6 @@ lappend all_bazels bazel
</span> name bazel
foreach b ${bazel_subports} { subport $b {} }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Set the conflicts list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach b [lsearch -inline -all -not -exact $all_bazels ${subport}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append $b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Min supported Darwin version
set min_darwin 16
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +29,7 @@ if { ${name} eq ${subport} } {
</span>
# Main port
github.setup bazelbuild ${name} 4.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
checksums rmd160 38aeaae4a1f6a5970fe72e892928f5842b9ba29a \
sha256 d350f80e70654932db252db380d2ec0144a00e86f8d9f2b4c799ffdb48e9cdd1 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +43,7 @@ if { ${name} eq ${subport} } {
</span>
# Specific version for py-tensorflow - DO NOT CHANGE
github.setup bazelbuild ${name} 3.7.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
# livecheck none is correct here, see above.
livecheck.type none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +59,7 @@ if { ${name} eq ${subport} } {
</span>
# Specific version for py-tensorflow - DO NOT CHANGE
github.setup bazelbuild ${name} 3.5.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
# livecheck none is correct here, see above.
livecheck.type none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +75,7 @@ if { ${name} eq ${subport} } {
</span>
# Specific version for py-tensorflow - DO NOT CHANGE
github.setup bazelbuild ${name} 3.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
# livecheck none is correct here, see above.
livecheck.type none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +94,7 @@ if { ${name} eq ${subport} } {
</span>
# Specific version for py-tensorflow - DO NOT CHANGE
github.setup bazelbuild ${name} 2.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
# livecheck none is correct here, see above.
livecheck.type none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,7 +110,7 @@ if { ${name} eq ${subport} } {
</span>
# Specific version for py-tensorflow1 - DO NOT CHANGE
github.setup bazelbuild ${name} 0.25.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
# livecheck none is correct here, see above.
livecheck.type none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -294,17 +289,20 @@ build {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Installation prefix. Specific to each bazel version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set myprefix ${prefix}/libexec/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
# Copy compiled binary
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set bindir ${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bindir ${myprefix}/bin
</span> xinstall -d ${destroot}${bindir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -W ${worksrcpath}/output ${name} ${destroot}${bindir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -W ${worksrcpath}/output ${name} ${destroot}${bindir}/
</span> # Copy bash and zsh completion scripts to designated area for on-demand usage
if { [variant_isset bash_completion]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set bcompldir ${prefix}/share/bash-completion/completions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bcompldir ${myprefix}/share/bash-completion/completions
</span> xinstall -d ${destroot}${bcompldir}
xinstall -m 755 ${worksrcpath}/${name}-bin/scripts/${name}-complete.bash ${destroot}${bcompldir}/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set zcompldir ${prefix}/share/zsh/site-functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set zcompldir ${myprefix}/share/zsh/site-functions
</span> xinstall -d ${destroot}${zcompldir}
xinstall -m 755 ${worksrcpath}/scripts/zsh_completion/_${name} ${destroot}${zcompldir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,9 +310,10 @@ destroot {
</span>
post-destroot {
# Mark documentation, source, and example directories
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set srcdir ${prefix}/src/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set expdir ${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${myprefix}/share/doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set srcdir ${myprefix}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set expdir ${myprefix}/share/examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bindir ${myprefix}/bin
</span>
# Copy documentation files
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -334,6 +333,9 @@ post-destroot {
</span> # Copy example files
xinstall -d ${destroot}${expdir}
file copy -force {*}[glob ${worksrcpath}/examples/*] ${destroot}${expdir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Link to binary in main prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${bindir}/${name} ${destroot}${prefix}/bin/${subport}
</span> }
notes "
</pre><pre style='margin:0'>
</pre>