<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/08d846eec363a24e2c80d94ac7caf51f8aa81f09">https://github.com/macports/macports-ports/commit/08d846eec363a24e2c80d94ac7caf51f8aa81f09</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 08d846eec36 openjdk22: fix build for clang 16 (#25878)
</span>08d846eec36 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 08d846eec363a24e2c80d94ac7caf51f8aa81f09
</span>Author: Nils Breunese <breun@macports.org>
AuthorDate: Mon Sep 23 00:21:24 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> openjdk22: fix build for clang 16 (#25878)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/70819
</span>---
java/openjdk22/Portfile | 7 +++++--
java/openjdk22/files/JDK-8340341-clang-16-workaround.patch | 14 ++++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk22/Portfile b/java/openjdk22/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14c82c87ffa..09f220648f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,12 +6,12 @@ name openjdk22
</span> # See https://github.com/openjdk/jdk22u/tags for the version and build number that matches the latest tag that ends with '-ga'
version 22.0.2
set build 9
<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 22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description OpenJDK 22 (Short Term Support until September 2024)
</span> long_description JDK 22 builds of OpenJDK, the Open-Source implementation \
of the Java Platform, Standard Edition, and related projects.
homepage https://openjdk.org/projects/jdk/22/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,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;color:#808080;'>diff --git a/java/openjdk22/files/JDK-8340341-clang-16-workaround.patch b/java/openjdk22/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/openjdk22/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>