git: 23aba7204c39 - 2024Q4 - java/openjdk8: fix build on 32 bit arm
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 12 Oct 2024 11:12:58 UTC
The branch 2024Q4 has been updated by ronald:
URL: https://cgit.FreeBSD.org/ports/commit/?id=23aba7204c39589899e397b166f170b27653f042
commit 23aba7204c39589899e397b166f170b27653f042
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-10-10 15:12:51 +0000
Commit: Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2024-10-12 11:12:37 +0000
java/openjdk8: fix build on 32 bit arm
Fixes:
In file included from /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/os/bsd/vm/os_perf_bsd.cpp:61:
In file included from /usr/include/sys/user.h:51:
In file included from /usr/include/vm/pmap.h:88:
In file included from /usr/include/machine/pmap.h:48:
In file included from /usr/include/sys/systm.h:46:
/usr/include/machine/cpufunc.h:184:1: error: static declaration of 'breakpoint' follows non-static declaration
184 | breakpoint(void)
| ^
/wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp:224:17: note: previous declaration is here
224 | extern "C" void breakpoint();
| ^
- bumped portrevision to easily spot if future bug reports are about this change.
PR: 281991
Approved by: early maintainer timeout java@ (the build is broken and the patch does not affect other architectures)
Obtained from: Mikael Urankar <mikael@> via Attachment 254105 in bug #255662
(cherry picked from commit e13c81137266603a6a0700810b6bad419f9d98c8)
---
java/openjdk8/Makefile | 2 +-
.../files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 1b9f0a35ea3d..7b32985fd649 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -1,6 +1,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= LOCAL/jkim:jtreg
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
diff --git a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp
new file mode 100644
index 000000000000..3cefb5553df4
--- /dev/null
+++ b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp
@@ -0,0 +1,15 @@
+--- hotspot/src/os/bsd/vm/os_perf_bsd.cpp.orig 2024-10-10 08:36:27 UTC
++++ hotspot/src/os/bsd/vm/os_perf_bsd.cpp
+@@ -57,6 +57,12 @@
+ * with the same name.
+ */
+ #define _MACHINE_PCB_H_
++ /*
++ * do not redefine breakpoint on armv7
++ */
++ #ifdef __arm__
++ #define _MACHINE_CPUFUNC_H_
++ #endif
+ #endif
+ #include <sys/user.h>
+ #endif