diff options
author | tnn <tnn@pkgsrc.org> | 2021-06-27 07:53:43 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2021-06-27 07:53:43 +0000 |
commit | 4ac90695c2f5df35da6edb1c034d21bfdafde4a2 (patch) | |
tree | df43d2b90d8e45ee630eb9ae1d951cdd327784f7 /lang | |
parent | 29a61c0f3970ce713ee22742e2f81a9688877b09 (diff) | |
download | pkgsrc-4ac90695c2f5df35da6edb1c034d21bfdafde4a2.tar.gz |
openjdk11: revert options.mk 1.5
https://mail-index.netbsd.org/pkgsrc-changes/2021/06/22/msg237065.html
Diffstat (limited to 'lang')
-rw-r--r-- | lang/openjdk11/options.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lang/openjdk11/options.mk b/lang/openjdk11/options.mk index 8dca4667252..ff041a8a937 100644 --- a/lang/openjdk11/options.mk +++ b/lang/openjdk11/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2021/06/22 11:56:35 nia Exp $ +# $NetBSD: options.mk,v 1.6 2021/06/27 07:53:43 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk11 PKG_OPTIONS_OPTIONAL_GROUPS= variant @@ -6,11 +6,7 @@ PKG_OPTIONS_GROUP.variant= jdk-zero-vm PKG_SUPPORTED_OPTIONS= debug dtrace jre-jce x11 static-libstdcpp PKG_SUGGESTED_OPTIONS= jre-jce x11 -.if ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_ARCH} == "x86_64" || \ - (${MACHINE_ARCH} == "aarch64" && \ - (empty(MACHINE_PLATFORM:MNetBSD-9.*-aarch64) || \ - !empty(MACHINE_PLATFORM:MNetBSD-9.99.*-aarch64))) +.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" PKG_OPTIONS_GROUP.variant+= jdk-hotspot-vm PKG_SUGGESTED_OPTIONS+= jdk-hotspot-vm .else |