diff --git a/srcpkgs/openjdk17/patches/FixNullPtrCast.patch b/srcpkgs/openjdk17/patches/FixNullPtrCast.patch new file mode 100644 index 00000000000..7699327e1c2 --- /dev/null +++ b/srcpkgs/openjdk17/patches/FixNullPtrCast.patch @@ -0,0 +1,19 @@ +Patch taken from Alpine: https://git.alpinelinux.org/aports/tree/community/openjdk17/FixNullPtrCast.patch + +Subject: Fix cast errors with latest GCC +Upstream: No +Author: Simon Frankenberger + +This patch fixes one remaining casting error reported by GCC 12 for aarch64 + +--- old/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp ++++ new/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp +@@ -267,7 +267,7 @@ + + virtual void pass_object() { + intptr_t* addr = single_slot_addr(); +- intptr_t value = *addr == 0 ? NULL : (intptr_t)addr; ++ intptr_t value = *addr == 0 ? (intptr_t) 0 : (intptr_t)addr; + if (pass_gpr(value) < 0) { + pass_stack<>(value); + } diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 76373a13831..a7c107f8f7d 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -1,6 +1,6 @@ # Template file for 'openjdk17' pkgname=openjdk17 -version=17.0.8+6 +version=17.0.9+6 revision=1 _gtest_ver=1.8.1 _java_ver="${version%%.*}" @@ -45,7 +45,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz" -checksum="ce6e1b61c70cc9d7f3c4c27bda1fa9c21d5a54f5cdb98512c30425703dee9ce4 +checksum="6444e9125c878281bccfb0ec58e7bece8a2e22c7a0bd3eb0667a32f0d0d8ce0f 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c" provides="java-environment-${version}_1" patch_args="-Np1 --directory=$build_wrksrc"