Merge pull request #3413 from hadfl/openjdk

OpenJDK package updates
omniosorg · Dec 8, 2023 · 1e5e29b · 1e5e29b
2 parents 8eea26b + ef01c82
commit 1e5e29b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 5 deletions.
diff --git a/build/openjdk11/build.sh b/build/openjdk11/build.sh
@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=openjdk
-VER=11.0.20.1+1
+VER=11.0.21+9
 PKG=runtime/java/openjdk11
 SUMMARY="openjdk ${VER%%.*}"
 DESC="Open-source implementation of the eleventh edition of the "

diff --git a/build/openjdk11/patches/series b/build/openjdk11/patches/series
@@ -36,6 +36,7 @@ tribblix-flags-ldflags2.patch
 tribblix-flags-ldflags3.patch
 tribblix-Launcher-jdk.patch
 tribblix-LauncherCommon.patch
+tribblix-thrstat001.patch
 omnios-headless.patch
 security-pkcs11.patch
 fontpath.patch

diff --git a/build/openjdk11/patches/tribblix-thrstat001.patch b/build/openjdk11/patches/tribblix-thrstat001.patch
@@ -0,0 +1,22 @@
+Local definition of wait() conflicts with wait(3C).
+
+--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp	Fri Oct  6 06:33:33 2023
++++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp	Thu Oct 19 09:25:58 2023
+@@ -70,7 +70,7 @@
+ }
+
+ static void
+-wait(const char* func_name, jrawMonitorID lock, jint millis) {
++thrstat001wait(const char* func_name, jrawMonitorID lock, jint millis) {
+     jvmtiError err = jvmti->RawMonitorWait(lock, (jlong)millis);
+     if (err != JVMTI_ERROR_NONE) {
+         printf("%s: unexpected error in RawMonitorWait: %s (%d)\n",
+@@ -229,7 +229,7 @@
+             break;
+         }
+         lock("checkStatus", wait_lock);
+-        wait("checkStatus", wait_lock, millis);
++        thrstat001wait("checkStatus", wait_lock, millis);
+         unlock("checkStatus", wait_lock);
+     }
+
diff --git a/build/openjdk8/build.sh b/build/openjdk8/build.sh
@@ -18,8 +18,8 @@
 
 PROG=openjdk
 VER=1.8
-UPDATE=382
-BUILD=05
+UPDATE=392
+BUILD=08
 PKG=openjdk    ##IGNORE## - filled in later
 SUMMARY="tbc"; DESC="tbc"
 

diff --git a/doc/packages.md b/doc/packages.md
@@ -75,9 +75,9 @@
 | network/socat				| 1.8.0.0		| http://www.dest-unreach.org/socat/download/
 | network/test/iperf			| 3.1.3			| https://iperf.fr/iperf-download.php#source
 | network/test/netperf			| 2.7.0			| https://github.com/HewlettPackard/netperf/tags
-| runtime/java/openjdk11		| 11.0.20.1+1		| https://github.com/openjdk/jdk11u/tags
+| runtime/java/openjdk11		| 11.0.21+9		| https://github.com/openjdk/jdk11u/tags
 | runtime/java/openjdk17		| 17.0.9+9		| https://github.com/openjdk/jdk17u/tags
-| runtime/java/openjdk8			| 1.8.382-05		| https://github.com/openjdk/jdk8u/tags
+| runtime/java/openjdk8			| 1.8.392-08		| https://github.com/openjdk/jdk8u/tags
 | runtime/perl				| 5.38.2		| https://www.cpan.org/src/README.html
 | runtime/python-39			| 3.9.18		| https://www.python.org/downloads/source/
 | runtime/python-310			| 3.10.13		| https://www.python.org/downloads/source/