<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/96325101c3df34d74f1c73e9d4f281daf71633aa">https://github.com/macports/macports-ports/commit/96325101c3df34d74f1c73e9d4f281daf71633aa</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 96325101c3d java PortGroup: only use Azul Zulu port for openjdk8 on arm
</span>96325101c3d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 96325101c3df34d74f1c73e9d4f281daf71633aa
</span>Author: Nils Breunese <nils@breun.nl>
AuthorDate: Sun Oct 22 23:39:52 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> java PortGroup: only use Azul Zulu port for openjdk8 on arm
</span>---
_resources/port1.0/group/java-1.0.tcl | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
<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 8e5112b6f6d..fe27d515f2e 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;'>@@ -56,15 +56,11 @@ namespace eval java {
</span> if { ${java.version} ne "" } {
ui_debug "java-portgroup: Trying to find JVM version: ${java.version}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If on arm automatically adjust to the *-zulu fallback versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # as required, as currently these are the only ones supporting arm.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # To be reviewed as support for arm comes for the other versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Following regex matches openjdk<version> only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If on arm automatically adjust openjdk8 to openjdk8-zulu, because openjdk8 doesn't support arm yet
</span> # Keep in mind that configure.build_arch isn't available here
global os.arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.arch} eq "arm" &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [regexp {openjdk(\d{1,2}$)} ${java.fallback}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set newjdk ${java.fallback}-zulu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.arch} eq "arm" && ${java.fallback} eq "openjdk8" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set newjdk openjdk8-zulu
</span> ui_debug "Redefining java fallback ${java.fallback} to ${newjdk} for arm compatibility"
java.fallback ${newjdk}
}
</pre><pre style='margin:0'>
</pre>