diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2024-07-27 19:17:04 -0700 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2024-07-27 23:08:32 -0700 |
| commit | 94417f8e6926fcd2b6caa68c41a2e21d1bb63d09 (patch) | |
| tree | 3721969053bbedbffbf313b634afb705dca44fbd /java | |
| parent | java/openjdk11: Update to 11.0.24 (diff) | |
java/openjdk17: Update to 17.0.12
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk17/Makefile | 4 | ||||
| -rw-r--r-- | java/openjdk17/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk17/files/patch-make_autoconf_flags-cflags.m4 | 13 | ||||
| -rw-r--r-- | java/openjdk17/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp | 19 |
4 files changed, 5 insertions, 37 deletions
diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index e7039439f653..a07a8f217518 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -62,8 +62,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 17 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 11 -JDK_BUILD_NUMBER= 9 +JDK_PATCH_VERSION= 12 +JDK_BUILD_NUMBER= 7 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/openjdk17/distinfo b/java/openjdk17/distinfo index f4bfa407d35d..749bb5eb808c 100644 --- a/java/openjdk17/distinfo +++ b/java/openjdk17/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714539812 -SHA256 (battleblow-jdk17u-jdk-17.0.11+9-1_GH0.tar.gz) = b4282b1aa773482a5d45c7b3c806042d4ef8217c5bb1bbb397616fb5f0345006 -SIZE (battleblow-jdk17u-jdk-17.0.11+9-1_GH0.tar.gz) = 106698083 +TIMESTAMP = 1722121348 +SHA256 (battleblow-jdk17u-jdk-17.0.12+7-1_GH0.tar.gz) = f659f623d5ca9cadebf1b7e14bd8ea3a1d87d6afdf6346c4f4a1ae8cc5b995b3 +SIZE (battleblow-jdk17u-jdk-17.0.12+7-1_GH0.tar.gz) = 106710435 diff --git a/java/openjdk17/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk17/files/patch-make_autoconf_flags-cflags.m4 deleted file mode 100644 index 5156c18515da..000000000000 --- a/java/openjdk17/files/patch-make_autoconf_flags-cflags.m4 +++ /dev/null @@ -1,13 +0,0 @@ ---- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC -+++ make/autoconf/flags-cflags.m4 -@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], - # for all archs except arm and ppc, prevent gcc to omit frame pointer - $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer" - fi -+ elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then -+ if test "x$FLAGS_CPU" = xppc64; then -+ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" -+ fi - fi - - elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then diff --git a/java/openjdk17/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk17/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp deleted file mode 100644 index d3b0e0b9821e..000000000000 --- a/java/openjdk17/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig 2022-12-21 16:54:47 UTC -+++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp -@@ -187,16 +187,6 @@ frame os::current_frame() { - bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info, - ucontext_t* uc, JavaThread* thread) { - -- // Moved SafeFetch32 handling outside thread!=NULL conditional block to make -- // it work if no associated JavaThread object exists. -- if (uc) { -- address const pc = os::Posix::ucontext_get_pc(uc); -- if (pc && StubRoutines::is_safefetch_fault(pc)) { -- os::Posix::ucontext_set_pc(uc, StubRoutines::continuation_for_safefetch_fault(pc)); -- return true; -- } -- } -- - // decide if this trap can be handled by a stub - address stub = NULL; - address pc = NULL; |