[pkgsrc/trunk]: pkgsrc/lang/openjdk17 openjdk17: fix PLIST for zerovm option

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/db860a65881d
branches:  trunk
changeset: 379416:db860a65881d
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon May 16 12:29:33 2022 +0000

description:
openjdk17: fix PLIST for zerovm option

diffstat:

 lang/openjdk17/Makefile   |  8 ++------
 lang/openjdk17/PLIST      |  4 ++--
 lang/openjdk17/options.mk |  4 +++-
 3 files changed, 7 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 9ec2a6e60fa0 -r db860a65881d lang/openjdk17/Makefile
--- a/lang/openjdk17/Makefile   Mon May 16 12:14:22 2022 +0000
+++ b/lang/openjdk17/Makefile   Mon May 16 12:29:33 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/05/15 20:29:00 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/16 12:29:33 tnn Exp $
 
 DISTNAME=      jdk17u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk17-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -149,11 +149,7 @@
 .endif
 
 PLIST_VARS+=                   internal_vm_compiler jvmci
-.if ${MACHINE_ARCH} == "x86_64"
-PLIST.internal_vm_compiler=    yes
-PLIST.jvmci=                   yes
-.endif
-.if ${MACHINE_ARCH} == "aarch64"
+.if (${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64") && !empty(PKG_OPTIONS:Mjdk-hotspot-vm)
 PLIST.internal_vm_compiler=    yes
 PLIST.jvmci=                   yes
 .endif
diff -r 9ec2a6e60fa0 -r db860a65881d lang/openjdk17/PLIST
--- a/lang/openjdk17/PLIST      Mon May 16 12:14:22 2022 +0000
+++ b/lang/openjdk17/PLIST      Mon May 16 12:29:33 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/05/13 14:24:19 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/05/16 12:29:33 tnn Exp $
 bin/openjdk17-jar
 bin/openjdk17-jarsigner
 bin/openjdk17-java
@@ -520,7 +520,7 @@
 java/openjdk17/legal/jdk.zipfs/ADDITIONAL_LICENSE_INFO
 java/openjdk17/legal/jdk.zipfs/ASSEMBLY_EXCEPTION
 java/openjdk17/legal/jdk.zipfs/LICENSE
-java/openjdk17/lib/classlist
+${PLIST.hotspot}java/openjdk17/lib/classlist
 java/openjdk17/lib/ct.sym
 java/openjdk17/lib/fontconfig.bfc
 java/openjdk17/lib/fontconfig.properties.src
diff -r 9ec2a6e60fa0 -r db860a65881d lang/openjdk17/options.mk
--- a/lang/openjdk17/options.mk Mon May 16 12:14:22 2022 +0000
+++ b/lang/openjdk17/options.mk Mon May 16 12:29:33 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2022/05/13 14:24:19 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2022/05/16 12:29:33 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openjdk17
 PKG_OPTIONS_OPTIONAL_GROUPS=   variant
@@ -99,10 +99,12 @@
 #
 # Build variant. Zero VM builds a portable JVM without assembly optimization.
 #
+PLIST_VARS+=           hotspot
 .if !empty(PKG_OPTIONS:Mjdk-zero-vm)
 BUILD_VARIANT=         zero
 .include "../../devel/libffi/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Mjdk-hotspot-vm)
 BUILD_VARIANT=         server
+PLIST.hotspot=         yes
 .endif
 CONFIGURE_ARGS+=       --with-jvm-variants=${BUILD_VARIANT}