diff options
| author | tnn <tnn@pkgsrc.org> | 2022-05-16 12:29:33 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2022-05-16 12:29:33 +0000 |
| commit | 8d0c20834ac8b53e0820e34bd48f608118a56ec8 (patch) | |
| tree | 5ab497284b53061171d0fb5af020ce8059ceb9f2 /lang | |
| parent | 8c281b91cea2330eb7677d4d07a8cdeec7a7ab20 (diff) | |
| download | pkgsrc-8d0c20834ac8b53e0820e34bd48f608118a56ec8.tar.gz | |
openjdk17: fix PLIST for zerovm option
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/openjdk17/Makefile | 8 | ||||
| -rw-r--r-- | lang/openjdk17/PLIST | 4 | ||||
| -rw-r--r-- | lang/openjdk17/options.mk | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/lang/openjdk17/Makefile b/lang/openjdk17/Makefile index d2ecc2171dc..aa0abc869f3 100644 --- a/lang/openjdk17/Makefile +++ b/lang/openjdk17/Makefile @@ -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 int EV_CLEAR = 0x0020;/static final int .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 --git a/lang/openjdk17/PLIST b/lang/openjdk17/PLIST index 2899a6d2e58..8fe9e01a9fe 100644 --- a/lang/openjdk17/PLIST +++ b/lang/openjdk17/PLIST @@ -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 diff --git a/lang/openjdk17/options.mk b/lang/openjdk17/options.mk index 35c7581547e..71a9d05ba36 100644 --- a/lang/openjdk17/options.mk +++ b/lang/openjdk17/options.mk @@ -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=dynamic # # 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} |