<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/6ede9c11e47eafa8178559c80af1a6f5be5eb4bb">https://github.com/macports/macports-ports/commit/6ede9c11e47eafa8178559c80af1a6f5be5eb4bb</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 6ede9c11e47 java PG: Automatically adjust to the zulu openjdk fallbacks on arm
</span>6ede9c11e47 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6ede9c11e47eafa8178559c80af1a6f5be5eb4bb
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat May 15 13:09:26 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> java PG: Automatically adjust to the zulu openjdk fallbacks on arm
</span>---
_resources/port1.0/group/java-1.0.tcl | 11 +++++++++++
1 file changed, 11 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/java-1.0.tcl b/_resources/port1.0/group/java-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1181565d195..21be5a039c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/java-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/java-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +59,17 @@ proc find_java_home {} {
</span> global java.version java.fallback
if { ${java.version} ne "" } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If on arm automatically adjust to the *-zulu fallback versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # as required, as currently these are the only ones supporting arm.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To be reviewed as support for arm comes for the other versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Following regex matches openjdk<version> only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option configure.build_arch] eq "arm64" &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [regexp {openjdk(\d{1,2}$)} ${java.fallback}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set newjdk ${java.fallback}-zulu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Redefining java fallback ${java.fallback} to ${newjdk} for arm compatibility"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java.fallback ${newjdk}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # /usr/libexec/java_home on Big Sur appears to have a bug where it won't
# honor the -f flag if the JAVA_HOME envar is set. See
# https://stackoverflow.com/a/64917842/448068
</pre><pre style='margin:0'>
</pre>