openjdk8: Update to 1.8.332
CHangelog: Follow OpenJDK 8u332 GA.
This commit is contained in:
parent
5ee1ffa451
commit
1915da7fe6
9 changed files with 79 additions and 146 deletions
|
@ -1,13 +1,12 @@
|
|||
# $NetBSD: Makefile,v 1.110 2021/12/08 16:05:22 adam Exp $
|
||||
# $NetBSD: Makefile,v 1.111 2022/07/10 14:47:24 ryoon 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= jdk8u332-b09.1
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= https://openjdk.java.net/
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.88 2022/05/24 21:32:43 tnn Exp $
|
||||
$NetBSD: distinfo,v 1.89 2022/07/10 14:47:24 ryoon 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-jdk8u332-b09.1.tar.gz) = 119023e6274bef8b6db1a55cb80c549a652d3248e8f8ce583667cd5c5b3b7c89
|
||||
SHA512 (openjdk7/jdk8u-jdk8u332-b09.1.tar.gz) = 5074567d027ce5293186700fcea0c8e870c73c0364b423c3a2df7942907bc7655a5a94093d62de3b1db5c63a36403aef8add322ef10ad261d42b0c6ff651dce4
|
||||
Size (openjdk7/jdk8u-jdk8u332-b09.1.tar.gz) = 88705654 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) = 1c9f8e68b738975a6accce502f1b9ce6f6ebaabd
|
||||
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
|
||||
|
@ -122,4 +118,5 @@ SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = bb0a20f688093f2
|
|||
SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 07b071ace2a91acd1968ed670aead67d72f0d490
|
||||
SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = c2db0716408ae1d081b3516b6c866b8f43cf5b6f
|
||||
SHA1 (patch-langtools_make_build.xml) = e9dccdb67a0f25b266755f66e520c6420afaf7ba
|
||||
SHA1 (patch-make_common_MakeBase.gmk) = d91d68247d6125e2a1a55a08247b9c49435adb8f
|
||||
SHA1 (patch-make_common_NativeCompilation.gmk) = 8c1e0fd1e9eaa4be6db4b1622f199a063d923e20
|
||||
|
|
|
@ -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.22 2022/07/10 14:47:24 ryoon 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)
|
||||
|
|
|
@ -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.2 2022/07/10 14:47:24 ryoon 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,3 @@ NetBSD/evbarm-aarch64 support
|
|||
#endif
|
||||
}
|
||||
|
||||
@@ -285,7 +293,7 @@ JVM_handle_bsd_signal(int sig,
|
||||
return 1;
|
||||
}
|
||||
|
||||
-#ifndef AMD64
|
||||
+#if 0
|
||||
// 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)
|
||||
|
|
|
@ -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
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
||||
|
19
lang/openjdk8/patches/patch-make_common_MakeBase.gmk
Normal file
19
lang/openjdk8/patches/patch-make_common_MakeBase.gmk
Normal file
|
@ -0,0 +1,19 @@
|
|||
$NetBSD: patch-make_common_MakeBase.gmk,v 1.3 2022/07/10 14:47:25 ryoon Exp $
|
||||
|
||||
* If both of hg and git are unavailable, 'gmake images' stalls.
|
||||
|
||||
--- make/common/MakeBase.gmk.orig 2022-04-23 02:23:55.000000000 +0000
|
||||
+++ make/common/MakeBase.gmk
|
||||
@@ -318,11 +318,7 @@ SCM_TIP_FILECMD := $(PRINTF) "$(SCM):%s"
|
||||
# Emit the scm:id pair to $@
|
||||
define GetSourceTips
|
||||
$(CD) $(SRC_ROOT) ; \
|
||||
- if [ -d $(SCM_DIR) -a "$(SCM_VERSION)" != "" ] ; then \
|
||||
- $(ID_COMMAND) >> $@ ; \
|
||||
- elif [ -f $(SCM_TIP_FILENAME) ] ; then \
|
||||
- $(SCM_TIP_FILECMD) >> $@ ; \
|
||||
- fi;
|
||||
+ echo 'release' >> $@ ; \
|
||||
$(PRINTF) "\n" >> $@
|
||||
endef
|
||||
|
Loading…
Reference in a new issue