<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/1cf2f9354e4581e0b34036267e2f4cae24d47dfd">https://github.com/macports/macports-ports/commit/1cf2f9354e4581e0b34036267e2f4cae24d47dfd</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 1cf2f93 bazel: Allow license exception with openjdk from Java PG, as only used at build time
</span>1cf2f93 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1cf2f9354e4581e0b34036267e2f4cae24d47dfd
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Feb 11 09:27:47 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> bazel: Allow license exception with openjdk from Java PG, as only used at build time
</span>---
devel/bazel/Portfile | 42 ++++++++++++++----------------------------
1 file changed, 14 insertions(+), 28 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 2fe6a4e..5c36807 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;'>@@ -20,6 +20,10 @@ subport bazel27 { }
</span> subport bazel28 { }
subport bazel29 { }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Java PG settings. Potentially changed in sub-port specifics below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set java_v 12+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set java_f openjdk13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${name} eq ${subport} } {
# Main port
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +45,6 @@ if { ${name} eq ${subport} } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Required java version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.version 12+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # JDK port to install if required java not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.fallback openjdk13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> } elseif { "bazel29" eq ${subport} } {
# Note this port is the current build dependency for py-tensorflaw, and as such
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,11 +69,6 @@ if { ${name} eq ${subport} } {
</span> return -code error "incompatible macOS version"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Required java version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.version 12+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # JDK port to install if required java not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.fallback openjdk13
</span>
} elseif { "bazel28" eq ${subport} } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,11 +95,6 @@ if { ${name} eq ${subport} } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Required java version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.version 12+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # JDK port to install if required java not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.fallback openjdk13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> } elseif { "bazel27" eq ${subport} } {
# Note this port is the current build dependency for py-tensorflaw, and as such
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,11 +120,6 @@ if { ${name} eq ${subport} } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Required java version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.version 12+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # JDK port to install if required java not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.fallback openjdk13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> } elseif { "bazel26" eq ${subport} } {
# Note this port is the current build dependency for py-tensorflow, and as such
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,11 +144,6 @@ if { ${name} eq ${subport} } {
</span> return -code error "incompatible macOS version"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Required java version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.version 12+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # JDK port to install if required java not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.fallback openjdk13
</span>
} elseif { "bazel25" eq ${subport} } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,12 +169,19 @@ if { ${name} eq ${subport} } {
</span> }
# Required java version.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- java.version 12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # JDK port to install if required java not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.fallback openjdk12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set java_v 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set java_f openjdk12
</span>
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Required java version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version ${java_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# JDK port to install if required java not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.fallback ${java_f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# JDK only needed at build time, but java PG sets lib dependency so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# declare no conflict to allow redistribution of binaries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict ${java_f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.tarball_from releases
categories devel
</pre><pre style='margin:0'>
</pre>