pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/openjdk11 openjdk11: only enable hotspot VM on ne...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b75d7dea726c
branches:  trunk
changeset: 454834:b75d7dea726c
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jun 22 11:56:35 2021 +0000

description:
openjdk11: only enable hotspot VM on netbsd/aarch64 HEAD

diffstat:

 lang/openjdk11/options.mk |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 81b119390f94 -r b75d7dea726c lang/openjdk11/options.mk
--- a/lang/openjdk11/options.mk Tue Jun 22 11:51:30 2021 +0000
+++ b/lang/openjdk11/options.mk Tue Jun 22 11:56:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/05/08 21:17:33 tnn Exp $
+# $NetBSD: options.mk,v 1.5 2021/06/22 11:56:35 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openjdk11
 PKG_OPTIONS_OPTIONAL_GROUPS=   variant
@@ -6,7 +6,11 @@
 PKG_SUPPORTED_OPTIONS=         debug dtrace jre-jce x11 static-libstdcpp
 PKG_SUGGESTED_OPTIONS=         jre-jce x11
 
-.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "x86_64" || \
+    (${MACHINE_ARCH} == "aarch64" && \
+      (empty(MACHINE_PLATFORM:MNetBSD-9.*-aarch64) || \
+      !empty(MACHINE_PLATFORM:MNetBSD-9.99.*-aarch64)))
 PKG_OPTIONS_GROUP.variant+=    jdk-hotspot-vm
 PKG_SUGGESTED_OPTIONS+=                jdk-hotspot-vm
 .else



Home | Main Index | Thread Index | Old Index