From f7852c91e998bf67d277a751af149db05311352f Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sun, 20 Apr 2025 08:12:31 -0700 Subject: [PATCH] java/openjdk11: Update to 11.0.27 --- java/openjdk11/Makefile | 5 ++-- java/openjdk11/distinfo | 6 ++-- .../patch-make_hotspot_lib_CompileJvm.gmk | 11 ------- ...otspot_os__cpu_bsd__zero_os__bsd__zero.cpp | 21 ------------- ...patch-src_hotspot_os_bsd_os__perf__bsd.cpp | 30 ------------------- ...tspot.agent_bsd_native_libsaproc_libproc.h | 25 ---------------- ...ack_share_native_common-unpack_constants.h | 11 ------- 7 files changed, 5 insertions(+), 104 deletions(-) delete mode 100644 java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk delete mode 100644 java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp delete mode 100644 java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp delete mode 100644 java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h delete mode 100644 java/openjdk11/files/patch-src_jdk.pack_share_native_common-unpack_constants.h diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index b001e09e4d68..25c3ae414590 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -1,7 +1,6 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -64,8 +63,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 26 -JDK_BUILD_NUMBER= 4 +JDK_PATCH_VERSION= 27 +JDK_BUILD_NUMBER= 6 BSD_JDK_VERSION= 1 JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo index 9364fcc1531a..b91fc199405c 100644 --- a/java/openjdk11/distinfo +++ b/java/openjdk11/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1739510711 +TIMESTAMP = 1745123589 SHA256 (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682 SIZE (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 8173207 -SHA256 (battleblow-jdk11u-jdk-11.0.26+4-1_GH0.tar.gz) = d9afdf9ad1ccab4262fcb64a2578d28b4e5e39fa5f0bbd7903542115c49fb7f3 -SIZE (battleblow-jdk11u-jdk-11.0.26+4-1_GH0.tar.gz) = 116707932 +SHA256 (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 64afcb0ad19c6a03591757d906355d0f263f8a529dea5654ba518e9399f13b1f +SIZE (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 116708083 diff --git a/java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk b/java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk deleted file mode 100644 index 65490ededb9d..000000000000 --- a/java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk +++ /dev/null @@ -1,11 +0,0 @@ ---- make/hotspot/lib/CompileJvm.gmk.orig 2024-10-04 16:07:55.502680000 +0200 -+++ make/hotspot/lib/CompileJvm.gmk 2024-10-04 16:07:03.672629000 +0200 -@@ -109,7 +109,7 @@ ifeq ($(call And, $(call isTargetOs, linux) $(call isT - ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, arm)), true) - JVM_EXCLUDE_PATTERNS += arm_64 - --else ifeq ($(call And, $(call isTargetOs, bsd) $(call isTargetCpu, bsd-arm)), true) -+else ifeq ($(call And, $(call isTargetOs, bsd) $(call isTargetCpu, arm)), true) - JVM_EXCLUDE_PATTERNS += arm_64 - - else ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), true) diff --git a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp deleted file mode 100644 index d05e5b4ab266..000000000000 --- a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp.orig 2025-01-10 18:09:55 UTC -+++ src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp -@@ -432,18 +432,6 @@ extern "C" { - // Implementations of atomic operations not supported by processors. - // -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html - --#ifndef _LP64 --extern "C" { -- long long unsigned int __sync_val_compare_and_swap_8( -- volatile void *ptr, -- long long unsigned int oldval, -- long long unsigned int newval) { -- ShouldNotCallThis(); -- return 0; // silence compiler warnings -- } --}; --#endif // !_LP64 -- - #ifndef PRODUCT - void os::verify_stack_alignment() { - } diff --git a/java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp b/java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp deleted file mode 100644 index f6c770aee32b..000000000000 --- a/java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp +++ /dev/null @@ -1,30 +0,0 @@ -This patch fixes the following error: - -In file included from jdk11u-jdk-11.0.24-8-1/src/hotspot/os/bsd/os_perf_bsd.cpp:47: -In file included from /usr/include/sys/user.h:51: -In file included from /usr/include/vm/pmap.h:88: -In file included from /usr/include/machine/pmap.h:48: -In file included from /usr/include/sys/systm.h:46: -/usr/include/machine/cpufunc.h:185:1: error: static declaration of 'breakpoint' follows non-static declaration - 185 | breakpoint(void) - | ^ -/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/hotspot/share/utilities/breakpoint.hpp:31:17: note: previous declaration is here - 31 | extern "C" void breakpoint(); - - - ---- src/hotspot/os/bsd/os_perf_bsd.cpp.orig 2024-11-08 11:24:38 UTC -+++ src/hotspot/os/bsd/os_perf_bsd.cpp -@@ -43,6 +43,12 @@ - * with the same name. - */ - #define _MACHINE_PCB_H_ -+ /* -+ * do not redefine breakpoint on armv7 -+ */ -+ #ifdef __arm__ -+ #define _MACHINE_CPUFUNC_H_ -+ #endif - #endif - #include - #endif diff --git a/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h b/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h deleted file mode 100644 index d05cdfd57db2..000000000000 --- a/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h +++ /dev/null @@ -1,25 +0,0 @@ -This patch fixes the following error: - -In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c:40: -In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc_impl.h:30: -/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h:79:13: error: cannot combine with previous 'int' declaration specifier - 79 | typedef int bool; - | ^ -/usr/include/stdbool.h:37:14: note: expanded from macro 'bool' - 37 | #define bool _Bool - - ---- src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h.orig 2024-10-07 16:02:52.117023000 +0200 -+++ src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h 2024-10-07 16:02:15.020023000 +0200 -@@ -76,9 +76,11 @@ typedef int bool; - - // This C bool type must be int for compatibility with BSD calls and - // it would be a mistake to equivalence it to C++ bool on many platforms -+#if defined(__FreeBSD__) && !defined(__bool_true_false_are_defined) - typedef int bool; - #define true 1 - #define false 0 -+#endif // __FreeBSD__ && !__bool_true_false_are_defined - - #endif // __APPLE__ - diff --git a/java/openjdk11/files/patch-src_jdk.pack_share_native_common-unpack_constants.h b/java/openjdk11/files/patch-src_jdk.pack_share_native_common-unpack_constants.h deleted file mode 100644 index b9e766070817..000000000000 --- a/java/openjdk11/files/patch-src_jdk.pack_share_native_common-unpack_constants.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/jdk.pack/share/native/common-unpack/constants.h.orig 2024-07-27 15:11:22 UTC -+++ src/jdk.pack/share/native/common-unpack/constants.h -@@ -203,7 +203,7 @@ enum { - AO_HAVE_FIELD_FLAGS_HI = 1<<10, - AO_HAVE_METHOD_FLAGS_HI = 1<<11, - AO_HAVE_CODE_FLAGS_HI = 1<<12, -- AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. -+ AO_UNUSED_MBZ = (~0u)<<13, // options bits reserved for future use. - - #define ARCHIVE_BIT_DO(F) \ - F(AO_HAVE_SPECIAL_FORMATS) \