<pre style='margin:0'>
Nils Breunese (breun) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ac5d8b93df1e56562c2322f8e3b2008e04a1bec0">https://github.com/macports/macports-ports/commit/ac5d8b93df1e56562c2322f8e3b2008e04a1bec0</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 ac5d8b93df1 openjdk21: fix build for clang 16 (#25879)
</span>ac5d8b93df1 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ac5d8b93df1e56562c2322f8e3b2008e04a1bec0
</span>Author: Nils Breunese <breun@macports.org>
AuthorDate: Mon Sep 23 01:07:19 2024 +0200

<span style='display:block; white-space:pre;color:#404040;'>    openjdk21: fix build for clang 16 (#25879)
</span>---
 java/openjdk21/Portfile                            | 24 +++++++++++++---------
 .../files/JDK-8340341-clang-16-workaround.patch    | 14 +++++++++++++
 2 files changed, 28 insertions(+), 10 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk21/Portfile b/java/openjdk21/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4afe1da166c..f7cfbb7407b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk21/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk21/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,20 +2,21 @@
</span> 
 PortSystem          1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name                openjdk21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set feature 21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name                openjdk${feature}
</span> # See https://openjdk-sources.osci.io/openjdk21/ for the version and build number that matches the latest '-ga' version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             21.0.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             ${feature}.0.4
</span> set build 7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          java devel
 supported_archs     x86_64 arm64
 license             GPL-2+
 maintainers         {breun.nl:nils @breun} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description         OpenJDK 21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description    JDK 21 builds of OpenJDK, the Open-Source implementation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description         OpenJDK ${feature} (Long Term Support)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description    JDK ${feature} builds of OpenJDK, the Open-Source implementation \
</span>                     of the Java Platform, Standard Edition, and related projects.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            https://openjdk.org/projects/jdk/21/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        https://openjdk-sources.osci.io/openjdk21/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://openjdk.org/projects/jdk/${feature}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites        https://openjdk-sources.osci.io/openjdk${feature}/
</span> distname            openjdk-${version}-ga
 use_xz              yes
 worksrcdir          jdk-${version}+${build}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +42,9 @@ pre-patch {
</span>     reinplace "s|xmacosx|xwindows|g" ${worksrcpath}/make/autoconf/lib-freetype.m4
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Temporary workaround for clang 16: https://trac.macports.org/ticket/70819
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          JDK-8340341-clang-16-workaround.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set tpath ${prefix}/Library/Java
 use_xcode           yes
 use_configure    yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +150,7 @@ test.cmd            ${bundle_dir}/Home/bin/java
</span> test.target         --version
 
 set jvms /Library/Java/JavaVirtualMachines
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set jdk ${jvms}/jdk-21-macports.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jdk ${jvms}/jdk-${feature}-macports.jdk
</span> 
 destroot {
     xinstall -m 755 -d ${destroot}${prefix}${jdk}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,5 +174,5 @@ export JAVA_HOME=${jdk}/Contents/Home
</span> "
     
 livecheck.type      regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url       https://openjdk-sources.osci.io/openjdk21/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex     openjdk-(21\.\[0-9.\]+)-ga
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url       ${master_sites}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex     openjdk-(${feature}\.\[0-9.\]+)-ga
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk21/files/JDK-8340341-clang-16-workaround.patch b/java/openjdk21/files/JDK-8340341-clang-16-workaround.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2138a539541
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk21/files/JDK-8340341-clang-16-workaround.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- make/hotspot/lib/JvmOverrideFiles.gmk.orig     2024-06-04 18:47:50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ make/hotspot/lib/JvmOverrideFiles.gmk  2024-09-22 23:45:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,6 +89,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # for the clang bug was still needed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     BUILD_LIBJVM_loopTransform.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    # See JDK-8340341
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ifeq "$(firstword $(subst ., ,$(CXX_VERSION_NUMBER)))" "16"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      BUILD_LIBJVM_stackMapTable.cpp_CXXFLAGS := "-O1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # The following files are compiled at various optimization
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # levels due to optimization issues encountered at the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # default level. The Clang compiler issues a compile
</span></pre><pre style='margin:0'>

</pre>