<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/37113757db02bfd6ead44d14a56b3f2a46ae87dc">https://github.com/macports/macports-ports/commit/37113757db02bfd6ead44d14a56b3f2a46ae87dc</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 37113757db0 java PG: fix detection of arm
</span>37113757db0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 37113757db02bfd6ead44d14a56b3f2a46ae87dc
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Thu Sep 8 23:43:14 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> java PG: fix detection of arm
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> `${configure.build_arch}` and `[option configure.build_arch]` both
</span><span style='display:block; white-space:pre;color:#404040;'> return an empty string here.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This lead to using default fallback on clean system which is `openjdkXY`
</span><span style='display:block; white-space:pre;color:#404040;'> which probably won't be build on arm64.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> To fix it I've migrated to `${os.arch}` which is available and which has
</span><span style='display:block; white-space:pre;color:#404040;'> value `arm` instead of `arm64`.
</span>---
_resources/port1.0/group/java-1.0.tcl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
<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 ce14a9320db..ca2ba9daea7 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,7 +59,9 @@ namespace eval java {
</span> # as required, as currently these are the only ones supporting arm.
# To be reviewed as support for arm comes for the other versions.
# Following regex matches openjdk<version> only.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [option configure.build_arch] eq "arm64" &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Keep in mind that configure.build_arch isn't available here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.arch} eq "arm" &&
</span> [regexp {openjdk(\d{1,2}$)} ${java.fallback}] } {
set newjdk ${java.fallback}-zulu
ui_debug "Redefining java fallback ${java.fallback} to ${newjdk} for arm compatibility"
</pre><pre style='margin:0'>
</pre>