CVS commit: pkgsrc/lang/openjdk11

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri May  8 21:17:33 UTC 2020

Modified Files:
        pkgsrc/lang/openjdk11: options.mk

Log Message:
openjdk11: remove the jdk-zeroshark-vm option, it is not supported any more


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/openjdk11/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/openjdk11/options.mk
diff -u pkgsrc/lang/openjdk11/options.mk:1.3 pkgsrc/lang/openjdk11/options.mk:1.4
--- pkgsrc/lang/openjdk11/options.mk:1.3        Sun May  3 20:41:34 2020
+++ pkgsrc/lang/openjdk11/options.mk    Fri May  8 21:17:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2020/05/03 20:41:34 tnn Exp $
+# $NetBSD: options.mk,v 1.4 2020/05/08 21:17:33 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openjdk11
 PKG_OPTIONS_OPTIONAL_GROUPS=   variant
@@ -6,10 +6,6 @@ PKG_OPTIONS_GROUP.variant=     jdk-zero-vm
 PKG_SUPPORTED_OPTIONS=         debug dtrace jre-jce x11 static-libstdcpp
 PKG_SUGGESTED_OPTIONS=         jre-jce x11
 
-.if !empty(PKGSRC_COMPILER:Mclang)
-PKG_OPTIONS_GROUP.variant+=    jdk-zeroshark-vm
-.endif
-
 .if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 PKG_OPTIONS_GROUP.variant+=    jdk-hotspot-vm
 PKG_SUGGESTED_OPTIONS+=                jdk-hotspot-vm
@@ -106,11 +102,6 @@ CONFIGURE_ARGS+=   --with-stdc++lib=dynami
 .if !empty(PKG_OPTIONS:Mjdk-zero-vm)
 BUILD_VARIANT=         zero
 .include "../../devel/libffi/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mjdk-zeroshark-vm)
-BUILD_VARIANT=         zeroshark
-.include "../../devel/libffi/buildlink3.mk"
-.include "../../lang/libLLVM/buildlink3.mk"
-CONFIGURE_ENV+=                LLVM_CONFIG=${LLVM_CONFIG_PATH}
 .elif !empty(PKG_OPTIONS:Mjdk-hotspot-vm)
 BUILD_VARIANT=         server
 .endif