java/openjdk17: Update to 17.0.2 GA

This commit is contained in:
Greg Lewis
2022-02-05 19:58:44 -08:00
parent c4e82ffe28
commit 57a7e706e6
3 changed files with 5 additions and 47 deletions
+2 -2
View File
@@ -61,8 +61,8 @@ NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 17
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 1
JDK_BUILD_NUMBER= 12
JDK_PATCH_VERSION= 2
JDK_BUILD_NUMBER= 8
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
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1635630441
SHA256 (battleblow-jdk17u-jdk-17.0.1+12-1_GH0.tar.gz) = d57fc4f2127926e1079d119dbc779725b6f8a6099baeab3553955c23f565db85
SIZE (battleblow-jdk17u-jdk-17.0.1+12-1_GH0.tar.gz) = 104757777
TIMESTAMP = 1644110440
SHA256 (battleblow-jdk17u-jdk-17.0.2+8-1_GH0.tar.gz) = 3797767e572ccfd5d1167bb732971fac90a552f46fc18ad3342666a7d3a5a27d
SIZE (battleblow-jdk17u-jdk-17.0.2+8-1_GH0.tar.gz) = 104857682
@@ -1,42 +0,0 @@
--- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp.orig 2021-12-30 23:31:30.529953000 -0800
+++ src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp 2021-12-30 23:31:40.303627000 -0800
@@ -35,7 +35,11 @@
#define amd64 1
#endif
-#ifdef i386
+#if defined(i386) && !defined(i586)
+#define i586 1
+#endif
+
+#ifdef i586
#include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h"
#endif
@@ -347,7 +351,7 @@
}
#undef NPRGREG
-#ifdef i386
+#ifdef i586
#define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG
#endif
#ifdef amd64
@@ -369,7 +373,7 @@
#undef REG_INDEX
-#ifdef i386
+#ifdef i586
#define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg
regs[REG_INDEX(GS)] = (uintptr_t) gregs.r_gs;
@@ -388,7 +392,7 @@
regs[REG_INDEX(CS)] = (uintptr_t) gregs.r_cs;
regs[REG_INDEX(SS)] = (uintptr_t) gregs.r_ss;
-#endif /* i386 */
+#endif /* i586 */
#ifdef amd64
#define REG_INDEX(reg) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##reg