pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openjdk11: appease pkglint



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Tue Oct 1 15:24:30 2019 +0200
Changeset:	99d70d86d17a37108141ef7cc53f334635abfc0e

Modified Files:
	openjdk11/options.mk

Log Message:
openjdk11: appease pkglint

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=99d70d86d17a37108141ef7cc53f334635abfc0e

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

diffstat:
 openjdk11/options.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diffs:
diff --git a/openjdk11/options.mk b/openjdk11/options.mk
index 2d1e4f62d9..d7a304cfb5 100644
--- a/openjdk11/options.mk
+++ b/openjdk11/options.mk
@@ -13,9 +13,6 @@ PKG_OPTIONS_GROUP.variant+=	jdk-zeroshark-vm
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 PKG_OPTIONS_GROUP.variant+=	jdk-hotspot-vm
 PKG_SUGGESTED_OPTIONS+=		jdk-hotspot-vm
-#notyet
-#.elif !empty(PKGSRC_COMPILER:Mclang)
-#PKG_SUGGESTED_OPTIONS+		jdk-zeroshark-vm
 .else
 PKG_SUGGESTED_OPTIONS+=		jdk-zero-vm
 .endif
@@ -106,7 +103,6 @@ CONFIGURE_ARGS+=	--with-stdc++lib=dynamic
 #
 # Build variant. Zero VM builds a portable JVM without assembly optimization.
 #
-PLIST_VARS+=		native
 .if !empty(PKG_OPTIONS:Mjdk-zero-vm)
 BUILD_VARIANT=		zero
 .include "../../devel/libffi/buildlink3.mk"
@@ -115,8 +111,7 @@ BUILD_VARIANT=		zeroshark
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../lang/libLLVM/buildlink3.mk"
 CONFIGURE_ENV+=		LLVM_CONFIG=${LLVM_CONFIG_PATH}
-.else
+.elif !empty(PKG_OPTIONS:Mjdk-hotspot-vm)
 BUILD_VARIANT=		server
-PLIST.native=		yes
 .endif
 CONFIGURE_ARGS+=	--with-jvm-variants=${BUILD_VARIANT}


Home | Main Index | Thread Index | Old Index