CVS commit: pkgsrc/lang/openjdk17

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon May 16 12:29:33 UTC 2022

Modified Files:
        pkgsrc/lang/openjdk17: Makefile PLIST options.mk

Log Message:
openjdk17: fix PLIST for zerovm option


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/openjdk17/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/openjdk17/PLIST \
    pkgsrc/lang/openjdk17/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk17/Makefile
diff -u pkgsrc/lang/openjdk17/Makefile:1.4 pkgsrc/lang/openjdk17/Makefile:1.5
--- pkgsrc/lang/openjdk17/Makefile:1.4  Sun May 15 20:29:00 2022
+++ pkgsrc/lang/openjdk17/Makefile      Mon May 16 12:29:33 2022
@@ -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 @@ SUBST_SED.kqueue+=         -e 's/static final i
 .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

Index: pkgsrc/lang/openjdk17/PLIST
diff -u pkgsrc/lang/openjdk17/PLIST:1.1 pkgsrc/lang/openjdk17/PLIST:1.2
--- pkgsrc/lang/openjdk17/PLIST:1.1     Fri May 13 14:24:19 2022
+++ pkgsrc/lang/openjdk17/PLIST Mon May 16 12:29:33 2022
@@ -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.xml.dom/LICENSE
 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
Index: pkgsrc/lang/openjdk17/options.mk
diff -u pkgsrc/lang/openjdk17/options.mk:1.1 pkgsrc/lang/openjdk17/options.mk:1.2
--- pkgsrc/lang/openjdk17/options.mk:1.1        Fri May 13 14:24:19 2022
+++ pkgsrc/lang/openjdk17/options.mk    Mon May 16 12:29:33 2022
@@ -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 @@ CONFIGURE_ARGS+=    --with-stdc++lib=dynami
 #
 # 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}