aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRonald Klop <ronald@FreeBSD.org>2026-06-18 11:06:40 +0000
committerRonald Klop <ronald@FreeBSD.org>2026-06-18 14:14:52 +0000
commit366b8812ebbaa00f1136bcc24de4af11f22226ca (patch)
tree7f731c0cd5581ed196813e6f68589fdeaf99b3d1 /java
parent80527120331acce13beac0008fd3a404607a3f2b (diff)
Diffstat (limited to 'java')
-rw-r--r--java/openjdk8/Makefile2
-rw-r--r--java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp14
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