diff options
| author | spz <spz@pkgsrc.org> | 2022-08-28 13:58:00 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2022-08-28 13:58:00 +0000 |
| commit | 3c1fcd488f19a918c0f01496c30ec06aa5a08124 (patch) | |
| tree | b4c1632d986504377ba4e42932cbab97a5c007f0 | |
| parent | f3f6980b542630908ff6fbffe1e923caa8b0dac7 (diff) | |
| download | pkgsrc-3c1fcd488f19a918c0f01496c30ec06aa5a08124.tar.gz | |
Pullup ticket #6668 - requested by khorben
lang/openjdk8: security update
lang/openjdk11: security update
Revisions pulled up:
- lang/openjdk11/Makefile 1.45
- lang/openjdk11/distinfo 1.35
- lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk deleted
- lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk deleted
- lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp deleted
- lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp deleted
- lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp deleted
- lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp deleted
- lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc deleted
- lang/openjdk8/Makefile 1.111-1.112
- lang/openjdk8/distinfo 1.89-1.91
- lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 1.22
- lang/openjdk8/patches/patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp deleted
- lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp 1.2-1.3
- lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp deleted
- lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp deleted
- lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp deleted
- lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp deleted
- lang/openjdk8/patches/patch-make_common_MakeBase.gmk deleted
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: ryoon
Date: Sun Jul 10 14:47:25 UTC 2022
Modified Files:
pkgsrc/lang/openjdk8: Makefile distinfo
pkgsrc/lang/openjdk8/patches:
patch-common_autoconf_generated-configure.sh
patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
Added Files:
pkgsrc/lang/openjdk8/patches: patch-make_common_MakeBase.gmk
Removed Files:
pkgsrc/lang/openjdk8/patches:
patch-hotspot_src_share_vm_classfile_symbolTable.cpp
patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
patch-hotspot_src_share_vm_memory_metaspace.cpp
Log Message:
openjdk8: Update to 1.8.332
CHangelog:
Follow OpenJDK 8u332 GA.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.21 -r1.22 \
pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp
cvs rdiff -u -r0 -r1.3 \
pkgsrc/lang/openjdk8/patches/patch-make_common_MakeBase.gmk
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tnn
Date: Sun Jul 17 03:03:41 UTC 2022
Modified Files:
pkgsrc/lang/openjdk8: distinfo
pkgsrc/lang/openjdk8/patches:
patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
Added Files:
pkgsrc/lang/openjdk8/patches:
patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
Log Message:
openjdk8: fix NetBSD/evbarm-aarch64 build; PAC is only supported on Linux
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tnn
Date: Mon Aug 15 12:23:06 UTC 2022
Modified Files:
pkgsrc/lang/openjdk11: Makefile distinfo
pkgsrc/lang/openjdk8: Makefile distinfo
Removed Files:
pkgsrc/lang/openjdk11/patches: patch-make_common_NativeCompilation.gmk
patch-make_lib_Awt2dLibraries.gmk
patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp
patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp
patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp
patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
pkgsrc/lang/openjdk8/patches:
patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
patch-make_common_MakeBase.gmk
Log Message:
openjdk*: Security & bugfix update for the long term support branches
Upstream kindly merged many of the NetBSD-specific patches. Thanks! <3
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk \
pkgsrc/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk \
pkgsrc/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp \
pkgsrc/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp \
pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp \
pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
cvs rdiff -u -r1.2 -r0 \
pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
cvs rdiff -u -r1.111 -r1.112 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
cvs rdiff -u -r1.3 -r0 \
pkgsrc/lang/openjdk8/patches/patch-make_common_MakeBase.gmk
17 files changed, 68 insertions, 323 deletions
diff --git a/lang/openjdk11/Makefile b/lang/openjdk11/Makefile index b5f7ef961e5..87ad5d9eab6 100644 --- a/lang/openjdk11/Makefile +++ b/lang/openjdk11/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.44 2022/05/14 12:02:56 tnn Exp $ +# $NetBSD: Makefile,v 1.44.2.1 2022/08/28 13:58:00 spz Exp $ DISTNAME= jdk11u-${GITHUB_TAG:C/\+/-/} PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/} -PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} GITHUB_PROJECT= jdk11u -GITHUB_TAG= jdk-11.0.15+10-1 +GITHUB_TAG= jdk-11.0.16+8-1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://openjdk.java.net/ diff --git a/lang/openjdk11/distinfo b/lang/openjdk11/distinfo index 4e49b06b758..f0b25725475 100644 --- a/lang/openjdk11/distinfo +++ b/lang/openjdk11/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.34 2022/05/25 19:53:26 tnn Exp $ +$NetBSD: distinfo,v 1.34.2.1 2022/08/28 13:58:00 spz Exp $ BLAKE2s (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = f93572f551f242344e5d6d5e46b9812e5b426772842b5fa06fea4422e327c871 SHA512 (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = c4030c99e4c1bb209f0c1ca6c10665c3f4c906f9d7dc13b912c3fbb8031f3dbb6f8d2e5e966cbbc452c307ba5d6de816c0f000b5b7c5d4e3fe8511baf12aab49 @@ -12,9 +12,9 @@ Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes BLAKE2s (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 5aac0ec747ac714032dfcb4cc4f093ee3f9ddeb070301856727a8597cedd65cf SHA512 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 735f47d7398a48f0963c5d629c6c319dfe22d84bacd45f84a34f4784433c8cf6bfe6b356363a4591f035bec4a32e2e38d0a9c6be361aa57e5f0170ad4e16a1ad Size (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 99673444 bytes -BLAKE2s (jdk11u-jdk-11.0.15-10-1.tar.gz) = 1ead16eff10210e68cd9c1407a9d729e248bb1ff075606d7fe3e5e62e4cde42d -SHA512 (jdk11u-jdk-11.0.15-10-1.tar.gz) = f2d3b5cea79d737c7f4c5cdd2924aa7fd69fa6fb02fc8672f21060452f7483dc09157a7828642b3e43b033c26eaba0507ddd50491daceb6cf176cea47333857a -Size (jdk11u-jdk-11.0.15-10-1.tar.gz) = 123036045 bytes +BLAKE2s (jdk11u-jdk-11.0.16-8-1.tar.gz) = 335896a9a7c173f9e6d69b7e2bd2b98e773cfe5dc997bfb2ec367d13fe39be58 +SHA512 (jdk11u-jdk-11.0.16-8-1.tar.gz) = 33954a05fa8e2a2f0fb97db311569a6b6b9133450d143c78bf01fabee0435b245a9c2318b2c49b8b3023168ba171019e08d5dce5116b6b7c94dad8dd7d047b61 +Size (jdk11u-jdk-11.0.16-8-1.tar.gz) = 123280743 bytes SHA1 (patch-make_autoconf_buildjdk-spec.gmk.in) = d0b600237853c17ecc2864604f0bd847ba6b0149 SHA1 (patch-make_autoconf_flags-cflags.m4) = 3b37853298805e2ffb92d3babd700d0048f24d8d SHA1 (patch-make_autoconf_hotspot.m4) = 437c8b09114933cca22c4a847a90a415cd113e5a @@ -22,17 +22,10 @@ SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c38 SHA1 (patch-make_autoconf_lib-bundled.m4) = 8720c3f674955e8a51b2ab7dba80c36d34ba8594 SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54 SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f -SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07 -SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d -SHA1 (patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp) = 97c6a06d6e957e267969cae3c9ad09c7ab9d0e56 -SHA1 (patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp) = cfaace9741b0b30daf827119127478a195f8374f SHA1 (patch-src_hotspot_os__cpu_bsd__arm_bsd__arm__32.s) = 474a66abfb25030d4e32134816c14b157d1ebe6a -SHA1 (patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp) = 8a99417711c4826490954d43f142afc0a0c68e9f -SHA1 (patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp) = 384214d554db82dc9092ee8f975aa5a73aae67ab SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 6322cbdda03dee528e89ac8b725f3df5e2165797 SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2 SHA1 (patch-src_hotspot_share_libadt_dict.cpp) = a5c62973f563742d4ccc7db341b33366d14e2a01 -SHA1 (patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc) = 6635bba71373f65107f5324f68de41d1320bcad8 SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b diff --git a/lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk b/lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk deleted file mode 100644 index 10cdf5c0b94..00000000000 --- a/lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-make_common_NativeCompilation.gmk,v 1.1 2019/10/01 12:36:34 tnn Exp $ - -Disable PaX mprotect. - ---- make/common/NativeCompilation.gmk.orig 2019-09-19 12:22:38.000000000 +0000 -+++ make/common/NativeCompilation.gmk -@@ -1012,6 +1012,9 @@ define SetupNativeCompilationBody - $$($1_MT) -nologo -manifest $$($1_MANIFEST) -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" -outputresource:$$@;#1 - endif - endif -+ ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.netbsd) -+ /usr/sbin/paxctl +m $$@ -+ endif - # This only works if the openjdk_codesign identity is present on the system. Let - # silently fail otherwise. - ifneq ($(CODESIGN), ) diff --git a/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk b/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk deleted file mode 100644 index 318504c7626..00000000000 --- a/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-make_lib_Awt2dLibraries.gmk,v 1.1 2019/10/03 16:57:20 tnn Exp $ - -bundled harfbuzz code needs to use -std=c++11 for static_assert(). -But we can't add it to USE_LANGUAGES because the rest of the JDK -contains legacy code that requires -std=gnu++98. - ---- make/lib/Awt2dLibraries.gmk.orig 2019-09-19 12:22:38.000000000 +0000 -+++ make/lib/Awt2dLibraries.gmk -@@ -612,7 +612,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB - AccelGlyphCache.c, \ - TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ - CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ -- CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ -+ CXXFLAGS := $(CXXFLAGS_JDKLIB) -std=c++11 $(LIBFONTMANAGER_CFLAGS), \ - OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ - CFLAGS_windows = -DCC_NOEX, \ - EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \ diff --git a/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp b/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp deleted file mode 100644 index 90480babc25..00000000000 --- a/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp,v 1.1 2021/06/28 22:53:05 tnn Exp $ - -error: call of overloaded 'log2_intptr(int&)' is ambiguous -note: candidate: int log2_intptr(uintptr_t) - inline int log2_intptr(uintptr_t x) { -note: candidate: int log2_intptr(intptr_t) - inline int log2_intptr(intptr_t x) { - ---- src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp.orig 2021-04-24 02:47:22.000000000 +0000 -+++ src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp -@@ -1062,7 +1062,7 @@ void LIR_Assembler::emit_op3(LIR_Op3* op - __ add_32(dest, left, AsmOperand(left, lsr, 31)); - __ asr_32(dest, dest, 1); - } else if (c != (int) 0x80000000) { -- int power = log2_intptr(c); -+ int power = log2_intptr((intptr_t)c); - __ asr_32(Rtemp, left, 31); - __ add_32(dest, left, AsmOperand(Rtemp, lsr, 32-power)); // dest = left + (left < 0 ? 2^power - 1 : 0); - __ asr_32(dest, dest, power); // dest = dest >>> power; diff --git a/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp b/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp deleted file mode 100644 index caef0ad6ff4..00000000000 --- a/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp,v 1.1 2021/06/28 22:53:05 tnn Exp $ - -error: call of overloaded 'log2_intptr(int)' is ambiguous - LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c + 1); -note: candidate: int log2_intptr(uintptr_t) - inline int log2_intptr(uintptr_t x) { -note: candidate: int log2_intptr(intptr_t) - inline int log2_intptr(intptr_t x) { - ---- src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp.orig 2021-04-24 02:47:22.000000000 +0000 -+++ src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp -@@ -443,13 +443,13 @@ bool LIRGenerator::strength_reduce_multi - __ shift_left(left, log2_intptr(c + 1), result); - __ sub(result, left, result); - #else -- LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c + 1); -+ LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr((intptr_t)(c + 1)); - LIR_Address* addr = new LIR_Address(left, left, scale, 0, T_INT); - __ sub(LIR_OprFact::address(addr), left, result); // rsb with shifted register - #endif // AARCH64 - return true; - } else if (is_power_of_2(c - 1)) { -- LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c - 1); -+ LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr((intptr_t)(c - 1)); - LIR_Address* addr = new LIR_Address(left, left, scale, 0, T_INT); - __ add(left, LIR_OprFact::address(addr), result); // add with shifted register - return true; diff --git a/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp b/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp deleted file mode 100644 index c19d4dee84f..00000000000 --- a/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp,v 1.1 2021/06/28 22:53:05 tnn Exp $ - -fix arch detection of NetBSD 32-bit ARM targets - ---- src/hotspot/os_cpu/bsd_arm/vm_version_bsd_arm_32.cpp.orig 2021-04-24 02:47:22.000000000 +0000 -+++ src/hotspot/os_cpu/bsd_arm/vm_version_bsd_arm_32.cpp -@@ -35,7 +35,7 @@ void VM_Version::get_os_cpu_info() { - - int mib[2]; - size_t len; -- char machine[8]; // 8 chars max : "arm" + "v6|v7" + "|eb" + '\0' -+ char machine[11]; // 11 chars max : "earm" + "v6|v7" + "|hf" + "|eb" + '\0' - - // Support for multiple calls in the init phase - if (done) return; -@@ -55,6 +55,9 @@ void VM_Version::get_os_cpu_info() { - } else if (strncmp(machine, "armv", 4) == 0 && - machine[4] >= '5' && machine[4] <= '9') { - _arm_arch = (int)(machine[4] - '0'); -+ } else if (strncmp(machine, "earmv", 5) == 0 && -+ machine[5] >= '5' && machine[5] <= '9') { -+ _arm_arch = (int)(machine[5] - '0'); - } - } - diff --git a/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp b/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp deleted file mode 100644 index fe1de2eb3ae..00000000000 --- a/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp,v 1.1 2022/05/25 06:05:34 tnn Exp $ - -#if 0 functions already defined in os_bsd.cpp - ---- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp.orig 2022-05-03 03:11:37.000000000 +0000 -+++ src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp -@@ -340,13 +340,16 @@ static void current_stack_region(address - *size = stack_top - stack_bottom; - } - -+#if 0 - address os::current_stack_base() { - address bottom; - size_t size; - current_stack_region(&bottom, &size); - return bottom + size; - } -+#endif - -+#if 0 - size_t os::current_stack_size() { - // stack size includes normal stack and HotSpot guard pages - address bottom; -@@ -354,6 +357,7 @@ size_t os::current_stack_size() { - current_stack_region(&bottom, &size); - return size; - } -+#endif - - ///////////////////////////////////////////////////////////////////////////// - // helper functions for fatal error handler diff --git a/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc b/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc deleted file mode 100644 index 8efaed47409..00000000000 --- a/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc,v 1.2 2021/02/01 15:51:55 ryoon Exp $ - -Completely remove _POSIX_C_SOURCE; with g++7 it causes errors about undeclared -symbols such as - -In file included from /usr/pkg/gcc7/include/c++/math.h:36:0, - from /pkg_comp/obj/pkgsrc/lang/openjdk11/default/openjdk-jdk11u-jdk-11.0.5-10-1/src/java.desktop/share/native/libfontmanager/harfbuzz/hb.hh:171, - from /pkg_comp/obj/pkgsrc/lang/openjdk11/default/openjdk-jdk11u-jdk-11.0.5-10-1/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc:40: -/usr/pkg/gcc7/include/c++/cmath:1084:11: error: '::acosh' has not been declared - using ::acosh; - ^~~~~ - -Very briefly: defining _POSIX_C_SOURCE only removes features, and therefore is -almost never the correct thing to do. - -Filed upstream report to harfbuzz to patch this the same way: -https://github.com/harfbuzz/harfbuzz/issues/2084 - - ---- src/java.desktop/share/native/libharfbuzz/hb-blob.cc.orig 2019-10-16 18:31:09.000000000 +0000 -+++ src/java.desktop/share/native/libharfbuzz/hb-blob.cc -@@ -30,12 +30,6 @@ - * http://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html - * https://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html - */ --#ifndef _POSIX_C_SOURCE --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Wunused-macros" --#define _POSIX_C_SOURCE 200809L --#pragma GCC diagnostic pop --#endif - - #include "hb.hh" - #include "hb-blob.hh" diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile index 079cb988d32..328a198ca97 100644 --- a/lang/openjdk8/Makefile +++ b/lang/openjdk8/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.110 2021/12/08 16:05:22 adam Exp $ +# $NetBSD: Makefile,v 1.110.6.1 2022/08/28 13:58:00 spz Exp $ -DISTNAME= openjdk-jdk8u-${GITHUB_TAG} +DISTNAME= jdk8u-${GITHUB_TAG} PKGNAME= openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/} -PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} MASTER_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} # for bootstrap kits -GITHUB_PROJECT= openjdk-jdk8u -GITHUB_TAG= jdk8u292-b10.2 +GITHUB_PROJECT= jdk8u +GITHUB_TAG= jdk8u342-b07.1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://openjdk.java.net/ diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo index 8e7766a00ff..c9907f7a985 100644 --- a/lang/openjdk8/distinfo +++ b/lang/openjdk8/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.88 2022/05/24 21:32:43 tnn Exp $ +$NetBSD: distinfo,v 1.88.2.1 2022/08/28 13:58:00 spz Exp $ BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 8745b980e290e509c0dd09706398b89afce85fee1405b9367b6684c83d56b96a SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4 @@ -24,9 +24,9 @@ Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 379 BLAKE2s (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 98777d4ff1f864a9ff5a42870b30319abd39488be2abfdc5e7d3d59b016c5807 SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes -BLAKE2s (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = e0f2a86f4b2f07229023bd9f18046bd490ecd98752cec47a1dfba66369b2d269 -SHA512 (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = 3614ef9ee4327242c62cdf80bee746c648a91e515e5611dcc8a2576fc6aaf073351132d910fcb16366302d59e615142ce9948be38eccbf236f250e9b15e6d752 -Size (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = 88568471 bytes +BLAKE2s (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = d6fab9676f8823b787cab9a818b4dfda9899e7a38f5d5c7cfeaafd172c64f05a +SHA512 (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = 8e3055a680d640879035246c1a0c612dd09f59f3b58d44c035c32fb7351e32d353c7b79a6cf784b432a533f98d462355da6456c6508175f7a15bb7297d138304 +Size (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = 88770755 bytes SHA1 (patch-aa) = 8810cfed600ee3bf36a408cc77e497ac7b3e6838 SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178 @@ -38,7 +38,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63 SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462 -SHA1 (patch-common_autoconf_generated-configure.sh) = 6fb73788e7b1e98966f7005a10b7957745700ec9 +SHA1 (patch-common_autoconf_generated-configure.sh) = e28eec3e1e6de016d4f9356d781d925d3660547d SHA1 (patch-common_autoconf_spec.gmk.in) = 5fbf47f2241b5c898a75fb1741873043f1c983f0 SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928 @@ -62,7 +62,7 @@ SHA1 (patch-hotspot_src_cpu_aarch64_vm_vm__version__aarch64.hpp) = 6a766abe3c53e SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088 SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = 446b96a91a2e4fa76f43ac653d1608f037c64af9 SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_bytes__bsd__aarch64.inline.hpp) = acc0b870113ffc279d089da385e564f3ffd87f89 -SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp) = 10cab6ac79e57d6a36b9183ea62ff8b3965d68bb +SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp) = 461717b25728884add18a8c68221ccea4ef81bbe SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_vm__version__bsd__aarch64.cpp) = d6762bb2a9fe6e158ccf23f7d04aa0cba588e78e SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = f46713855507654be42707b1f80a779796929069 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6 @@ -77,10 +77,6 @@ SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = e4321382dc95fe9e363abc8c8 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = c8840633681c01d4a911e32e8d79060fbbdc506e SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 589bf0707023b9f799caf2cafe5aeba89af46b05 -SHA1 (patch-hotspot_src_share_vm_classfile_symbolTable.cpp) = c0077a7691ce2ba698f46d9fc8c81bf974aef68c -SHA1 (patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp) = b2bb8e74e43099fa9d1e157400bbb78386281235 -SHA1 (patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp) = 9e9347f9695cce3599fe12448445bb20d9b36f08 -SHA1 (patch-hotspot_src_share_vm_memory_metaspace.cpp) = 260005e002e0926447952850bbc1150e50a05509 SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329 SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 35484c16c7ff1ce57b78c1c0fafa0dfcc7f0072a SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293 diff --git a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh index f2e13e27d08..877f9bc5d14 100644 --- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh +++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh @@ -1,12 +1,8 @@ -$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.21 2021/06/27 14:54:41 tnn Exp $ +$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.21.8.1 2022/08/28 13:58:00 spz Exp $ -BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and -pkg/53223. -Fix detection of GCC>=10. - ---- common/autoconf/generated-configure.sh.orig 2021-05-14 21:52:06.000000000 +0000 +--- common/autoconf/generated-configure.sh.orig 2022-05-26 16:48:39.258220648 +0000 +++ common/autoconf/generated-configure.sh -@@ -4191,7 +4191,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi +@@ -4198,7 +4198,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi # These toolchains are valid on different platforms VALID_TOOLCHAINS_bsd="clang gcc" VALID_TOOLCHAINS_linux="gcc clang" @@ -15,7 +11,7 @@ Fix detection of GCC>=10. VALID_TOOLCHAINS_macosx="gcc clang" VALID_TOOLCHAINS_aix="xlc" VALID_TOOLCHAINS_windows="microsoft" -@@ -15482,9 +15482,6 @@ done +@@ -15475,9 +15475,6 @@ done # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. if test "x$MAKE" != x; then # User has supplied a make, test it. @@ -25,7 +21,7 @@ Fix detection of GCC>=10. MAKE_CANDIDATE=""$MAKE"" DESCRIPTION="user supplied MAKE=$MAKE" -@@ -20173,7 +20170,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -20352,7 +20349,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -34,7 +30,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -20505,7 +20502,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -20684,7 +20681,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -43,7 +39,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -20823,7 +20820,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -21002,7 +20999,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -52,7 +48,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -21011,7 +21008,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -21190,7 +21187,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -61,7 +57,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -21289,7 +21286,7 @@ fi +@@ -21468,7 +21465,7 @@ fi # Resolve file symlinks while test $COUNTER -lt 20; do ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` @@ -70,7 +66,7 @@ Fix detection of GCC>=10. # This is not a symbolic link! We are done! break fi -@@ -21339,7 +21336,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -21518,7 +21515,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -79,7 +75,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -21554,7 +21551,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -21733,7 +21730,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -88,7 +84,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -21734,7 +21731,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -21913,7 +21910,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -97,7 +93,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -21942,7 +21939,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -22121,7 +22118,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -106,7 +102,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -22122,7 +22119,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -22301,7 +22298,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -115,7 +111,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -22330,7 +22327,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -22509,7 +22506,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -124,7 +120,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -22510,7 +22507,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -22689,7 +22686,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -133,7 +129,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -22718,7 +22715,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -22897,7 +22894,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -142,7 +138,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -22898,7 +22895,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -23077,7 +23074,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -151,7 +147,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -23093,7 +23090,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -23272,7 +23269,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -160,7 +156,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -23271,7 +23268,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -23450,7 +23447,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -169,7 +165,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -23467,7 +23464,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -23646,7 +23643,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -178,7 +174,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -23645,7 +23642,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -23824,7 +23821,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -187,7 +183,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -23840,7 +23837,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -24019,7 +24016,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -196,7 +192,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -24018,7 +24015,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -24197,7 +24194,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -205,7 +201,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -24214,7 +24211,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -24393,7 +24390,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -214,7 +210,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -24392,7 +24389,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -24571,7 +24568,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -223,7 +219,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -24569,7 +24566,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -24748,7 +24745,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -232,7 +228,7 @@ Fix detection of GCC>=10. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -24975,16 +24972,15 @@ $as_echo_n "checking flags for boot jdk +@@ -25154,16 +25151,15 @@ $as_echo_n "checking flags for boot jdk # Maximum amount of heap memory. # Maximum stack size. if test "x$BOOT_JDK_BITS" = x32; then @@ -250,7 +246,7 @@ Fix detection of GCC>=10. $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5 $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5 -@@ -27518,7 +27514,7 @@ $as_echo_n "checking resolved symbolic l +@@ -27719,7 +27715,7 @@ $as_echo_n "checking resolved symbolic l # Resolve file symlinks while test $COUNTER -lt 20; do ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` @@ -259,7 +255,7 @@ Fix detection of GCC>=10. # This is not a symbolic link! We are done! break fi -@@ -27973,7 +27969,7 @@ $as_echo_n "checking for resolved symbol +@@ -28174,7 +28170,7 @@ $as_echo_n "checking for resolved symbol # Resolve file symlinks while test $COUNTER -lt 20; do ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` @@ -268,7 +264,7 @@ Fix detection of GCC>=10. # This is not a symbolic link! We are done! break fi -@@ -29259,7 +29255,7 @@ $as_echo_n "checking resolved symbolic l +@@ -29460,7 +29456,7 @@ $as_echo_n "checking resolved symbolic l # Resolve file symlinks while test $COUNTER -lt 20; do ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` @@ -277,7 +273,7 @@ Fix detection of GCC>=10. # This is not a symbolic link! We are done! break fi -@@ -29714,7 +29710,7 @@ $as_echo_n "checking for resolved symbol +@@ -29915,7 +29911,7 @@ $as_echo_n "checking for resolved symbol # Resolve file symlinks while test $COUNTER -lt 20; do ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` @@ -286,7 +282,7 @@ Fix detection of GCC>=10. # This is not a symbolic link! We are done! break fi -@@ -41431,6 +41427,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -42022,6 +42018,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' SET_SHARED_LIBRARY_MAPFILE='' @@ -299,7 +295,7 @@ Fix detection of GCC>=10. else # Default works for linux, might work on other platforms as well. SHARED_LIBRARY_FLAGS='-shared' -@@ -41482,7 +41484,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -42093,7 +42095,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; } if test "x$OPENJDK_TARGET_OS" = xsolaris; then CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__" CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__" @@ -309,7 +305,7 @@ Fix detection of GCC>=10. fi # The (cross) compiler is now configured, we can now test capabilities # of the target platform. -@@ -41623,7 +41627,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -42253,7 +42257,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; } elif test "x$TOOLCHAIN_TYPE" = xgcc; then LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" @@ -318,7 +314,7 @@ Fix detection of GCC>=10. LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" fi -@@ -42370,7 +42374,9 @@ $as_echo "$supports" >&6; } +@@ -43112,7 +43116,9 @@ $as_echo "$supports" >&6; } # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous # java heap. if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then @@ -328,7 +324,7 @@ Fix detection of GCC>=10. fi fi fi -@@ -42863,7 +42869,8 @@ $as_echo "alsa pulse x11" >&6; } +@@ -43600,7 +43606,8 @@ $as_echo "alsa pulse x11" >&6; } if test "x$OPENJDK_TARGET_OS" = xbsd; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5 $as_echo_n "checking what is not needed on BSD?... " >&6; } @@ -338,7 +334,7 @@ Fix detection of GCC>=10. ALSA_NOT_NEEDED=yes PULSE_NOT_NEEDED=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 -@@ -44093,7 +44100,7 @@ $as_echo "$as_me: WARNING: Can't find pr +@@ -44830,7 +44837,7 @@ $as_echo "$as_me: WARNING: Can't find pr BUILD_FREETYPE=no fi # Now check if configure found a version of 'msbuild.exe' @@ -347,7 +343,7 @@ Fix detection of GCC>=10. { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5 $as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;} BUILD_FREETYPE=no -@@ -44509,7 +44516,11 @@ $as_echo "$as_me: WARNING: --with-freety +@@ -45246,7 +45253,11 @@ $as_echo "$as_me: WARNING: --with-freety # Allow --with-freetype-lib and --with-freetype-include to override if test "x$with_freetype_include" != x; then @@ -360,7 +356,7 @@ Fix detection of GCC>=10. fi if test "x$with_freetype_lib" != x; then POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib" -@@ -47619,7 +47630,7 @@ $as_echo "$as_me: The path of FREETYPE_I +@@ -48356,7 +48367,7 @@ $as_echo "$as_me: The path of FREETYPE_I FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`" fi @@ -369,7 +365,7 @@ Fix detection of GCC>=10. FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH" else FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH" -@@ -47752,7 +47763,7 @@ $as_echo "$as_me: The path of FREETYPE_L +@@ -48489,7 +48500,7 @@ $as_echo "$as_me: The path of FREETYPE_L if test "x$OPENJDK_TARGET_OS" = xwindows; then FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib" else @@ -378,7 +374,7 @@ Fix detection of GCC>=10. fi fi -@@ -49089,9 +49100,6 @@ fi +@@ -49824,9 +49835,6 @@ fi @@ -388,7 +384,7 @@ Fix detection of GCC>=10. llvm_components="jit mcjit engine nativecodegen native" unset LLVM_CFLAGS -@@ -49134,7 +49142,7 @@ fi +@@ -49869,7 +49877,7 @@ fi fi # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so) diff --git a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp index 659b59d7296..4f1e8306a11 100644 --- a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp +++ b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp,v 1.1 2021/06/27 18:30:26 tnn Exp $ +$NetBSD: patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp,v 1.1.8.1 2022/08/28 13:58:00 spz Exp $ NetBSD/evbarm-aarch64 support ---- hotspot/src/os_cpu/bsd_aarch64/vm/os_bsd_aarch64.cpp.orig 2021-05-14 21:52:06.000000000 +0000 +--- hotspot/src/os_cpu/bsd_aarch64/vm/os_bsd_aarch64.cpp.orig 2022-04-23 02:23:55.000000000 +0000 +++ hotspot/src/os_cpu/bsd_aarch64/vm/os_bsd_aarch64.cpp -@@ -107,6 +107,8 @@ address os::Bsd::ucontext_get_pc(ucontex +@@ -110,6 +110,8 @@ address os::Bsd::ucontext_get_pc(ucontex return (address)uc->uc_mcontext.mc_gpregs.gp_elr; #elif defined(__OpenBSD__) return (address)uc->sc_elr; @@ -13,7 +13,7 @@ NetBSD/evbarm-aarch64 support #endif } -@@ -115,6 +117,8 @@ void os::Bsd::ucontext_set_pc(ucontext_t +@@ -118,6 +120,8 @@ void os::Bsd::ucontext_set_pc(ucontext_t uc->uc_mcontext.mc_gpregs.gp_elr = (intptr_t)pc; #elif defined(__OpenBSD__) uc->sc_elr = (unsigned long)pc; @@ -22,7 +22,7 @@ NetBSD/evbarm-aarch64 support #endif } -@@ -123,6 +127,8 @@ intptr_t* os::Bsd::ucontext_get_sp(ucont +@@ -126,6 +130,8 @@ intptr_t* os::Bsd::ucontext_get_sp(ucont return (intptr_t*)uc->uc_mcontext.mc_gpregs.gp_sp; #elif defined(__OpenBSD__) return (intptr_t*)uc->sc_sp; @@ -31,7 +31,7 @@ NetBSD/evbarm-aarch64 support #endif } -@@ -131,6 +137,8 @@ intptr_t* os::Bsd::ucontext_get_fp(ucont +@@ -134,6 +140,8 @@ intptr_t* os::Bsd::ucontext_get_fp(ucont return (intptr_t*)uc->uc_mcontext.mc_gpregs.gp_x[REG_FP]; #elif defined(__OpenBSD__) return (intptr_t*)uc->sc_x[REG_FP]; @@ -40,12 +40,12 @@ NetBSD/evbarm-aarch64 support #endif } -@@ -285,7 +293,7 @@ JVM_handle_bsd_signal(int sig, +@@ -288,7 +296,7 @@ JVM_handle_bsd_signal(int sig, return 1; } --#ifndef AMD64 -+#if 0 +-#if !defined(AMD64) && !defined(__OpenBSD__) ++#if !defined(AMD64) && defined(SI_KERNEL) // Halt if SI_KERNEL before more crashes get misdiagnosed as Java bugs // This can happen in any running code (currently more frequently in // interpreter code but has been seen in compiled code) diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp deleted file mode 100644 index aa24f6bdedb..00000000000 --- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_classfile_symbolTable.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $ - -Static member variables of templates must be defined. C++11 inline -definitions would be an alternative. - ---- hotspot/src/share/vm/classfile/symbolTable.cpp.orig 2016-12-10 16:08:22.000287424 +0000 -+++ hotspot/src/share/vm/classfile/symbolTable.cpp -@@ -42,6 +42,8 @@ - - PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC - -+template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::_seed = 0; -+ - // -------------------------------------------------------------------------- - - // the number of buckets a thread claims diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp deleted file mode 100644 index fa5ee96ad80..00000000000 --- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $ - -Static member variables of templates must be defined. C++11 inline -definitions would be an alternative. - ---- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.orig 2016-12-10 16:01:00.232060787 +0000 -+++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp -@@ -48,6 +48,9 @@ - //// CompactibleFreeListSpace - ///////////////////////////////////////////////////////////////////////// - -+template <class Chunk_t, class FreeList_t> -+size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t, FreeList_t>)/HeapWordSize; -+ - // highest ranked free list lock rank - int CompactibleFreeListSpace::_lockRank = Mutex::leaf + 3; - diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp deleted file mode 100644 index 55b9cc1c9b4..00000000000 --- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp,v 1.1 2016/12/15 23:56:53 joerg Exp $ - -defined() is not evaluated inside macros when used later. - ---- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp.orig 2016-12-10 15:50:21.837559173 +0000 -+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp -@@ -35,7 +35,11 @@ typedef FormatBuffer<HRS_ERR_MSG_BUFSZ> - // HEAP_REGION_SET_FORCE_VERIFY to be 1, or in builds in which - // asserts are compiled in. - #ifndef HEAP_REGION_SET_FORCE_VERIFY --#define HEAP_REGION_SET_FORCE_VERIFY defined(ASSERT) -+# if defined(ASSERT) -+# define HEAP_REGION_SET_FORCE_VERIFY 1 -+# else -+# define HEAP_REGION_SET_FORCE_VERIFY 0 -+# endif - #endif // HEAP_REGION_SET_FORCE_VERIFY - - class hrs_ext_msg; diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp deleted file mode 100644 index bdd361a3b86..00000000000 --- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_memory_metaspace.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $ - -Static member variables of templates must be defined. C++11 inline -definitions would be an alternative. - ---- hotspot/src/share/vm/memory/metaspace.cpp.orig 2016-12-10 16:06:04.248447262 +0000 -+++ hotspot/src/share/vm/memory/metaspace.cpp -@@ -50,6 +50,9 @@ - - PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC - -+template <class Chunk_t, class FreeList_t> -+size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t, FreeList_t>)/HeapWordSize; -+ - typedef BinaryTreeDictionary<Metablock, FreeList<Metablock> > BlockTreeDictionary; - typedef BinaryTreeDictionary<Metachunk, FreeList<Metachunk> > ChunkTreeDictionary; - |