<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a89d6aa30a0cc5ff3f68f151a89dba0b0f2c4ce4">https://github.com/macports/macports-ports/commit/a89d6aa30a0cc5ff3f68f151a89dba0b0f2c4ce4</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 a89d6aa30a0 zulu-jdk: fix parse failure on non-x86_64/arm64
</span>a89d6aa30a0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a89d6aa30a0cc5ff3f68f151a89dba0b0f2c4ce4
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Feb 20 19:14:11 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> zulu-jdk: fix parse failure on non-x86_64/arm64
</span>---
java/zulu-jdk/Portfile | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/zulu-jdk/Portfile b/java/zulu-jdk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e03fa3fcbbf..5787ee94730 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/zulu-jdk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/zulu-jdk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -244,8 +244,8 @@ if {![info exists zulu_arch(${build_arch})]} {
</span> set zulu_name(arm64) macosx
set zulu_name(x86_64) macosx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists zulu_arch(${build_arch})]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set zulu_arch(${build_arch}) macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![info exists zulu_name(${build_arch})]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set zulu_name(${build_arch}) macosx
</span> }
if {[info exists zulu_use_rosetta]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,7 +253,15 @@ if {[info exists zulu_use_rosetta]} {
</span> set zulu_name(arm64) $zulu_name(x86_64)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version $zulu_version($zulu_arch($build_arch))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![info exists zulu_version($zulu_arch($build_arch))]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set zulu_version($zulu_arch($build_arch)) $major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![info exists jdk_version($zulu_arch($build_arch))]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jdk_version($zulu_arch($build_arch)) $major
</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;'>+version $zulu_version($zulu_arch($build_arch))
</span>
if {${subport} eq "zulu-jdk"} {
PortGroup obsolete 1.0
</pre><pre style='margin:0'>
</pre>