Sun Jun 27 07:53:43 2021 UTC ()
openjdk11: revert options.mk 1.5

https://mail-index.netbsd.org/pkgsrc-changes/2021/06/22/msg237065.html


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

--- pkgsrc/lang/openjdk11/options.mk 2021/06/22 11:56:35 1.5
+++ pkgsrc/lang/openjdk11/options.mk 2021/06/27 07:53:43 1.6
@@ -1,26 +1,22 @@ @@ -1,26 +1,22 @@
1# $NetBSD: options.mk,v 1.5 2021/06/22 11:56:35 nia Exp $ 1# $NetBSD: options.mk,v 1.6 2021/06/27 07:53:43 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} == "i386" || \ 9.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
10 ${MACHINE_ARCH} == "x86_64" || \ 
11 (${MACHINE_ARCH} == "aarch64" && \ 
12 (empty(MACHINE_PLATFORM:MNetBSD-9.*-aarch64) || \ 
13 !empty(MACHINE_PLATFORM:MNetBSD-9.99.*-aarch64))) 
14PKG_OPTIONS_GROUP.variant+= jdk-hotspot-vm 10PKG_OPTIONS_GROUP.variant+= jdk-hotspot-vm
15PKG_SUGGESTED_OPTIONS+= jdk-hotspot-vm 11PKG_SUGGESTED_OPTIONS+= jdk-hotspot-vm
16.else 12.else
17PKG_SUGGESTED_OPTIONS+= jdk-zero-vm 13PKG_SUGGESTED_OPTIONS+= jdk-zero-vm
18.endif 14.endif
19 15
20.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
21 17
22### 18###
23### Java(TM) Cryptography Extension (JCE) 19### Java(TM) Cryptography Extension (JCE)
24### 20###
25.if !empty(PKG_OPTIONS:Mjre-jce) 21.if !empty(PKG_OPTIONS:Mjre-jce)
26CONFIGURE_ARGS+= --enable-unlimited-crypto 22CONFIGURE_ARGS+= --enable-unlimited-crypto