<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/860533a375264caf4b3bf3b553cb558788b690c3">https://github.com/macports/macports-ports/commit/860533a375264caf4b3bf3b553cb558788b690c3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 860533a375264caf4b3bf3b553cb558788b690c3
</span>Author: usersxx <97012123+usersxx@users.noreply.github.com>
AuthorDate: Sat Apr 9 21:26:01 2022 +0530
<span style='display:block; white-space:pre;color:#404040;'> openjdk17: make builds more specific
</span>---
java/openjdk17/Portfile | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk17/Portfile b/java/openjdk17/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e67d62aa119..38310072d7b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk17/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk17/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortSystem 1.0
</span> name openjdk17
# https://github.com/openjdk/jdk17u/tags
version 17.0.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories java devel
platforms darwin
supported_archs x86_64 arm64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,14 +22,9 @@ depends_build port:autoconf \
</span> port:gmake \
port:bash \
port:openjdk17-bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 21} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-openjdk17-build1.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-8280476-macOS-hotspot-arm64-bug-exposed-by-latest-cl.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-openjdk17-build1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-8280476-macOS-hotspot-arm64-bug-exposed-by-latest-cl.patch
</span>
default_variants +server +release
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +39,7 @@ set extraldflags "-Wl,-syslibroot,`xcrun --sdk macosx --show-sdk-path` -arch ${c
</span> set jchflags "-Wno-implicit-function-declaration -Wno-unused-parameter"
set jcxxflags "-Wno-implicit-function-declaration -Wno-unused-parameter"
set jldflags "-L`xcrun --sdk macosx --show-sdk-path`/usr/lib -L`xcrun --sdk macosx --show-sdk-path`/usr/lib/system"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set bug_url "https://trac.macports.org/newticket?port=${name}"
</span> # default configure args
configure.args --with-debug-level=release \
--with-native-debug-symbols=none \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +52,13 @@ configure.args --with-debug-level=release \
</span> --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk17-bootstrap/Contents/Home \
--disable-precompiled-headers \
--disable-warnings-as-errors \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-conf-name=openjdk${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-vendor-name="OpenJDK Porters Group" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-vendor-url="${homepage}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-vendor-bug-url="${bug_url}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-vendor-vm-bug-url="${bug_url}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-version-opt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-version-pre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-conf-name=release
</span>
variant server \
description {JVM with normal interpreter, and a tiered C1/C2 compiler} {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +97,7 @@ build.type gnu
</span> build.target images
use_parallel_build no
set jdkn jdk-${version}.jdk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set bundle_dir build/openjdk${version}/images/jdk-bundle/${jdkn}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bundle_dir build/release/images/jdk-bundle/${jdkn}/Contents
</span>
test.run yes
test.cmd ${bundle_dir}/Home/bin/java
</pre><pre style='margin:0'>
</pre>