<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/f68a2d46ee0ece9a1131d11381392e1db11a12b5">https://github.com/macports/macports-ports/commit/f68a2d46ee0ece9a1131d11381392e1db11a12b5</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 f68a2d4 bazel: Add subport for 2.0.0 (tensorflow dep), remove unused old versions, clean up naming scheme
</span>f68a2d4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f68a2d46ee0ece9a1131d11381392e1db11a12b5
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu May 7 14:30:23 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> bazel: Add subport for 2.0.0 (tensorflow dep), remove unused old versions, clean up naming scheme
</span>---
devel/bazel/Portfile | 168 ++++++++++++---------------------------------------
1 file changed, 39 insertions(+), 129 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 49667f0..f6b13d1 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;'>@@ -12,140 +12,48 @@ PortGroup compiler_blacklist_versions 1.0
</span> # Now resolved, but epoch must NOT be removed though now.
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name bazel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport bazel25 { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport bazel26 { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport bazel27 { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport bazel28 { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport bazel29 { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# List of all bazel sub-ports ( e.g. as required by tensorflow )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bazel_subports {bazel-0.25 bazel-2.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set all_bazels ${bazel_subports}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lappend all_bazels bazel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# define ports and sub-ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name bazel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach b ${bazel_subports} { subport $b {} }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set the conflicts list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach b [lsearch -inline -all -not -exact $all_bazels ${subport}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append $b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# Java PG settings. Potentially changed in sub-port specifics below.
set java_v 12+
set java_f openjdk13
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Min supported Darin version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set min_darwin 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${name} eq ${subport} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Main port
github.setup bazelbuild ${name} 3.1.0
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts bazel25 bazel26 bazel27 bazel28 bazel29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> checksums rmd160 b3238d0539e757a2a7b07f2e4475f1cefdc6307c \
sha256 d7f40d0cac95a06cea6cb5b7f7769085257caebc3ee84269dd9298da760d5615 \
size 269384742
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 16 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/58518
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires macOS10.12 or newer."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif { "bazel29" eq ${subport} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note this port is the current build dependency for py-tensorflow, and as such
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the version here is *specifically* the one required. Do not update....
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bazelbuild ${name} 0.29.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # livecheck none is correct here, see above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts bazel bazel25 bazel26 bazel27 bazel28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e83da6d224b5888da300082fd07a7f0457f2d07a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 872a52cff208676e1169b3e1cae71b1fe572c4109cbd66eab107d8607c378de5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 265744999
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/58518
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires macOS10.10 or newer."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif { "bazel28" eq ${subport} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note this port is the current build dependency for py-tensorflow, and as such
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the version here is *specifically* the one required. Do not update....
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bazelbuild ${name} 0.28.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # livecheck none is correct here, see above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts bazel bazel25 bazel26 bazel27 bazel29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 16aa4e271f47a425e39adc9469c670cdacde118b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2cea463d611f5255d2f3d41c8de5dcc0961adccb39cf0ac036f07070ba720314 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 256641169
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/58518
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires macOS10.10 or newer."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif { "bazel27" eq ${subport} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note this port is the current build dependency for py-tensorflow, and as such
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the version here is *specifically* the one required. Do not update....
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bazelbuild ${name} 0.27.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # livecheck none is correct here, see above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts bazel bazel25 bazel26 bazel28 bazel29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c2c3e7115eab58b43391e02245060213422f2b6e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8051d77da4ec338acd91770f853e4c25f4407115ed86fd35a6de25921673e779 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 247947232
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/58518
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires macOS10.10 or newer."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif { "bazel26" eq ${subport} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note this port is the current build dependency for py-tensorflow, and as such
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the version here is *specifically* the one required. Do not update....
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bazelbuild ${name} 0.26.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif { "bazel-2.0" eq ${subport} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Main port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup bazelbuild ${name} 2.0.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # livecheck none is correct here, see above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts bazel bazel25 bazel27 bazel28 bazel29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 a430c264af30bb9e0e89199e3efe11d6a31bc3b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c0e94f8f818759f3f67af798c38683520c540f469cb41aea8f5e5a0e43f11600 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 244633948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 acf9b886d2ec69f2c7019037e3aeba6de48cb011 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 724da3c656f68e787a86ebb9844773aa1c2e3a873cc39462a8f1b336153d6cbb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 259625808
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/58518
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires macOS10.10 or newer."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif { "bazel25" eq ${subport} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif { "bazel-0.25" eq ${subport} } {
</span>
github.setup bazelbuild ${name} 0.25.2
revision 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,27 +61,29 @@ if { ${name} eq ${subport} } {
</span> # livecheck none is correct here, see above.
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts bazel bazel26 bazel27 bazel28 bazel29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> checksums rmd160 cfff49a4be85f7693ae615c293b13d0a447b80d7 \
sha256 7456032199852c043e6c5b3e4c71dd8089c1158f72ec554e6ec1c77007f0ab51 \
size 275804130
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/58518
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires macOS10.10 or newer."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
# Required java version.
set java_v 12
set java_f openjdk12
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # min OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_dawin 14
</span>
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Check OS support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < ${min_darwin} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/58518
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} ${version} requires Darwin ${min_darwin} or newer"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Required java version.
java.version ${java_v}
# JDK port to install if required java not found
</pre><pre style='margin:0'>
</pre>