From 4069613b854696911298317973d29ba19d643f5d Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Mon, 11 Nov 2024 17:09:22 -0800 Subject: [PATCH] java/openjdk21: Update to 21.0.5 --- java/openjdk21/Makefile | 4 ++-- java/openjdk21/distinfo | 6 +++--- .../files/patch-make_autoconf_flags-cflags.m4 | 13 ------------- 3 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 java/openjdk21/files/patch-make_autoconf_flags-cflags.m4 diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile index 1fd46b7c8835..b72db935b762 100644 --- a/java/openjdk21/Makefile +++ b/java/openjdk21/Makefile @@ -62,8 +62,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 21 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 4 -JDK_BUILD_NUMBER= 7 +JDK_PATCH_VERSION= 5 +JDK_BUILD_NUMBER= 11 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/openjdk21/distinfo b/java/openjdk21/distinfo index 2a28eb150b9f..ec6aef9af9ff 100644 --- a/java/openjdk21/distinfo +++ b/java/openjdk21/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1722133185 -SHA256 (battleblow-jdk21u-jdk-21.0.4+7-1_GH0.tar.gz) = 657f06a8e620227bd8dc8903f92a523bb0456577b796a1776c4fbe832d354fd2 -SIZE (battleblow-jdk21u-jdk-21.0.4+7-1_GH0.tar.gz) = 112633561 +TIMESTAMP = 1731346874 +SHA256 (battleblow-jdk21u-jdk-21.0.5+11-1_GH0.tar.gz) = e73d27edeeba29971ce2909a368cd32724e47c204b622680e07d76739b069cbc +SIZE (battleblow-jdk21u-jdk-21.0.5+11-1_GH0.tar.gz) = 112788042 diff --git a/java/openjdk21/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk21/files/patch-make_autoconf_flags-cflags.m4 deleted file mode 100644 index 5156c18515da..000000000000 --- a/java/openjdk21/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