openjdk-11: update to 11.0.22

Andreas Wacknitz

2024-01-27 7ca16014ce832927600598c6ecf4ac9d4f208524

openjdk-11: update to 11.0.22

 components/runtime/openjdk-11/Makefile

@@ -13,7 +13,7 @@
# Copyright 2016 Alexander Pyhalov
# Copyright 2019 Michal Nowak
# Copyright 2021 Andreas Grueninger, Grueninger GmbH, (grueni). All rights reserved.
# Copyright 2023 Niklas Poslovski
# Copyright 2023-2024 Niklas Poslovski
# Copyright 2023 Franklin Ronald <franklin@wiselabs.com.br>
#

@@ -21,16 +21,15 @@

OPENJDK_VERSION=    11
OPENJDK_UPDATE=    0
OPENJDK_BUILD=    20
OPENJDK_BUILD=    22
COMPONENT_NAME=        openjdk
COMPONENT_VERSION=    $(OPENJDK_VERSION).$(OPENJDK_UPDATE).$(OPENJDK_BUILD)
COMPONENT_REVISION = 1
COMPONENT_FMRI=    runtime/java/$(COMPONENT_NAME)$(OPENJDK_VERSION)
COMPONENT_SUMMARY=    Open-source implementation of the Java Platform, Standard Edition
COMPONENT_SRC=    jdk$(OPENJDK_VERSION)u-jdk-$(COMPONENT_VERSION)-ga
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
    sha256:a277b89ff5ade85d3b5885ad7bffb3f2d9c80df47363fedb9110b62c45dbec37
    sha256:5ed47173679cdfefa0cb9fc92d443413e05ab2e157a29bb86e829d7f6a80913a
COMPONENT_ARCHIVE_URL= \
    https://github.com/$(COMPONENT_NAME)/jdk$(OPENJDK_VERSION)u/archive/refs/tags/jdk-$(COMPONENT_VERSION)-ga.tar.gz
COMPONENT_PROJECT_URL=    https://openjdk.java.net/

 components/runtime/openjdk-11/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2023 <contributor>
# Copyright 2024 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

 components/runtime/openjdk-11/patches/make_lib_Awt2dLibraries.gmk.patch

@@ -12,7 +12,7 @@
     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
     EXTRA_HEADER_DIRS := \
         common/awt/debug \
@@ -554,7 +553,11 @@ ifneq (, $(findstring $(OPENJDK_TARGET_O
@@ -557,7 +556,11 @@ ifneq (, $(findstring $(OPENJDK_TARGET_O
     HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY
   endif
   ifeq ($(call isTargetOs, solaris), true)

 components/runtime/openjdk-11/patches/tribblix-thrstat001.patch

New file
@@ -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);
     }
 

 components/runtime/openjdk-11/pkg5

@@ -10,8 +10,8 @@
        "system/library",
        "system/library/c++/sunpro",
        "system/library/freetype-2",
        "system/library/g++-10-runtime",
        "system/library/gcc-10-runtime",
        "system/library/g++-13-runtime",
        "system/library/gcc-13-runtime",
        "system/library/math",
        "x11/library/libx11",
        "x11/library/libxext",
@@ -24,4 +24,4 @@
        "runtime/java/openjdk11"
    ],
    "name": "openjdk"
}
}