diff options
| author | Ronald Klop <ronald@FreeBSD.org> | 2026-06-18 11:06:40 +0000 |
|---|---|---|
| committer | Ronald Klop <ronald@FreeBSD.org> | 2026-06-18 14:14:52 +0000 |
| commit | 366b8812ebbaa00f1136bcc24de4af11f22226ca (patch) | |
| tree | 7f731c0cd5581ed196813e6f68589fdeaf99b3d1 | |
| parent | 80527120331acce13beac0008fd3a404607a3f2b (diff) | |
java/openjdk8: fix build on aarch64/16
>>> Compiling /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u482-b08.1/hotspot/src/os/bsd/vm/os_perf_bsd.cpp
>>> In file included from /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u482-b08.1/hotspot/src/os/bsd/vm/os_perf_bsd.cpp:67:
>>> In file included from /usr/include/sys/user.h:52:
>>> In file included from /usr/include/vm/pmap.h:88:
>>> In file included from /usr/include/machine/pmap.h:46:
>>> In file included from /usr/include/sys/systm.h:46:
>>> /usr/include/machine/cpufunc.h:35:1: error: static declaration of 'breakpoint' follows non-static declaration
>>> 35 | breakpoint(void)
>>> | ^
>>> /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u482-b08.1/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp:224:17: note: previous declaration is here
>>> 224 | extern "C" void breakpoint();
>>> | ^
>>> 1 error generated.
I don't know why this does not happen on other architectures or freebsd versions.
- changed post-patch to pre-configure, this makes it a lot easier to use "make makepatch".
Approved-by: silence on java@ https://lists.freebsd.org/archives/freebsd-java/2026-June/003715.html
| -rw-r--r-- | java/openjdk8/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 258c61a9fa86..624714d9628d 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -227,7 +227,7 @@ ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} post-extract-TEST-on: @${LN} -sf ${WRKDIR}/jtreg/linux/bin ${WRKDIR}/jtreg/ -post-patch: +pre-configure: @${FIND} ${WRKSRC} -name '*.orig' -delete @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${FILESDIR}/bsd.fontconfig.properties.in > \ 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..d82a1c4ecdb3 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp @@ -0,0 +1,14 @@ +--- hotspot/src/os/bsd/vm/os_perf_bsd.cpp.orig 2026-01-23 00:36:25 UTC ++++ hotspot/src/os/bsd/vm/os_perf_bsd.cpp +@@ -58,9 +58,9 @@ + */ + #define _MACHINE_PCB_H_ + /* +- * do not redefine breakpoint on armv7 ++ * do not redefine breakpoint on armv7 and aarch64/16 + */ +- #ifdef __arm__ ++ #if defined(__arm__) || ( defined (__aarch64__) && __FreeBSD_version >= 160000 ) + #define _MACHINE_CPUFUNC_H_ + #endif + #endif |