Mon Jun 28 23:12:22 2021 UTC ()
openjdk11: options: accept jdk-hotspot-vm on arm


(tnn)
diff -r1.6 -r1.7 pkgsrc/lang/openjdk11/options.mk
cvs diff -r1.6 -r1.7 pkgsrc/lang/openjdk11/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/options.mk 2021/06/27 07:53:43 1.6
+++ pkgsrc/lang/openjdk11/options.mk 2021/06/28 23:12:22 1.7
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.6 2021/06/27 07:53:43 tnn Exp $ 1# $NetBSD: options.mk,v 1.7 2021/06/28 23:12:22 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk11 3PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk11
4PKG_OPTIONS_OPTIONAL_GROUPS= variant 4PKG_OPTIONS_OPTIONAL_GROUPS= variant
5PKG_OPTIONS_GROUP.variant= jdk-zero-vm 5PKG_OPTIONS_GROUP.variant= jdk-zero-vm
6PKG_SUPPORTED_OPTIONS= debug dtrace jre-jce x11 static-libstdcpp 6PKG_SUPPORTED_OPTIONS= debug dtrace jre-jce x11 static-libstdcpp
7PKG_SUGGESTED_OPTIONS= jre-jce x11 7PKG_SUGGESTED_OPTIONS= jre-jce x11
8 8
9.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 9.if ${MACHINE_ARCH} == "aarch64" || !empty(MACHINE_ARCH:M*arm*) || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
10PKG_OPTIONS_GROUP.variant+= jdk-hotspot-vm 10PKG_OPTIONS_GROUP.variant+= jdk-hotspot-vm
11PKG_SUGGESTED_OPTIONS+= jdk-hotspot-vm 11PKG_SUGGESTED_OPTIONS+= jdk-hotspot-vm
12.else 12.else
13PKG_SUGGESTED_OPTIONS+= jdk-zero-vm 13PKG_SUGGESTED_OPTIONS+= jdk-zero-vm
14.endif 14.endif
15 15
16.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
17 17
18### 18###
19### Java(TM) Cryptography Extension (JCE) 19### Java(TM) Cryptography Extension (JCE)
20### 20###
21.if !empty(PKG_OPTIONS:Mjre-jce) 21.if !empty(PKG_OPTIONS:Mjre-jce)
22CONFIGURE_ARGS+= --enable-unlimited-crypto 22CONFIGURE_ARGS+= --enable-unlimited-crypto