<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0325c436ef778ae26b67bd6eef98ad9f8871abfa">https://github.com/macports/macports-ports/commit/0325c436ef778ae26b67bd6eef98ad9f8871abfa</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0325c436ef778ae26b67bd6eef98ad9f8871abfa
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Dec 21 22:26:40 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    java PG: fix for powerpc
</span>---
 _resources/port1.0/group/java-1.0.tcl | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 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 fe27d515f2e..6e7eb225109 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;'>@@ -72,10 +72,17 @@ namespace eval java {
</span>             # 1.8+, 9* works, 1.7.35+ won't.
             #
             # See https://trac.macports.org/ticket/61445
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            global os.platform os.major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            global os.platform os.major os.arch
</span> 
             set big_sur_workaround [expr {${os.platform} eq "darwin" && ${os.major} >= 20}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { ${big_sur_workaround} && [catch {set val [get_jvm_bigsur ${java.version}] } ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if { ${os.platform} eq "darwin" && ${os.arch} eq "powerpc" && ${java.fallback} eq "openjdk8" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                foreach loc { "/Library/Java/JavaVirtualMachines/openjdk8/Contents/Home" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if { [file isdirectory $loc] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set home_value $loc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ui_debug "Discovered JAVA_HOME via search path: $home_value"
</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;'>+            } elseif { ${big_sur_workaround} && [catch {set val [get_jvm_bigsur ${java.version}] } ]
</span>             || !${big_sur_workaround} && [catch {set val [exec "/usr/libexec/java_home" "-f" "-v" ${java.version}] } ] } {
                 # Don't return an error because that would prevent the port from
                 # even being indexed when the required Java is missing. Instead, set
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,13 +138,14 @@ namespace eval java {
</span>     }
 
     proc java_get_default_fallback {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        global os.major java.version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        global os.arch os.major java.version
</span>         if {[option os.platform] eq "darwin"} {
             if {${os.major} >= 18 && [vercmp ${java.version} < 18]} {
                 return openjdk17
             } elseif {${os.major} >= 15 && [vercmp ${java.version} < 12]} {
                 return openjdk11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            } elseif {${os.major} >= 11 && [vercmp ${java.version} < 9]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } elseif {(${os.major} >= 11 && [vercmp ${java.version} < 9]) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${os.arch} eq "powerpc"} {
</span>                 return openjdk8
             }
         }
</pre><pre style='margin:0'>

</pre>