From b96b485581865aaec7b3d2d9cfcc114ef11341dc Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 13 Jan 2020 01:53:50 +0000 Subject: Add lang/adoptopenjdk11-bin support --- mk/java-vm.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/java-vm.mk b/mk/java-vm.mk index ce4f28532f1..ffab3606703 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.117 2019/10/02 13:16:29 ryoon Exp $ +# $NetBSD: java-vm.mk,v 1.118 2020/01/13 01:53:50 ryoon Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -11,6 +11,7 @@ # # Possible values: kaffe openjdk7 openjdk8 # sun-jdk7 oracle-jdk8 +# adoptopenjdk11-bin # openjdk-bin openjdk11 # Default value: (platform-dependent) # @@ -72,7 +73,7 @@ PKG_JVMS_ACCEPTED?= ${_PKG_JVMS} # This is a list of all of the JDKs that may be used. # -_PKG_JVMS.9= openjdk-bin openjdk11 +_PKG_JVMS.9= adoptopenjdk11-bin openjdk-bin openjdk11 _PKG_JVMS.8= ${_PKG_JVMS.9} openjdk8 oracle-jdk8 _PKG_JVMS.7= ${_PKG_JVMS.8} openjdk7 sun-jdk7 _PKG_JVMS.6= ${_PKG_JVMS.7} jdk16 @@ -168,6 +169,9 @@ _ONLY_FOR_PLATFORMS.oracle-jdk8= \ Linux-*-x86_64 \ NetBSD-[6-9]*-i386 NetBSD-[6-9]*-x86_64 \ SunOS-5.11-x86_64 +_ONLY_FOR_PLATFORMS.adoptopenjdk11-bin= \ + Linux-*-x86_64 \ + NetBSD-[6-9]*-x86_64 _ONLY_FOR_PLATFORMS.openjdk-bin= \ Linux-*-x86_64 \ NetBSD-[6-9]*-x86_64 @@ -194,6 +198,7 @@ _JAVA_PKGBASE.openjdk7= openjdk7 _JAVA_PKGBASE.openjdk8= openjdk8 _JAVA_PKGBASE.sun-jdk7= sun-jre7 _JAVA_PKGBASE.oracle-jdk8= oracle-jre8 +_JAVA_PKGBASE.adoptopenjdk11-bin= adoptopenjdk11-bin _JAVA_PKGBASE.openjdk-bin= openjdk-bin _JAVA_PKGBASE.openjdk11= openjdk11 @@ -203,6 +208,7 @@ _JAVA_NAME.openjdk7= openjdk7 _JAVA_NAME.openjdk8= openjdk8 _JAVA_NAME.sun-jdk7= sun7 _JAVA_NAME.oracle-jdk8= oracle8 +_JAVA_NAME.adoptopenjdk11-bin= adoptopenjdk11-bin _JAVA_NAME.openjdk-bin= openjdk-bin _JAVA_NAME.openjdk11= openjdk11 @@ -259,6 +265,7 @@ BUILDLINK_API_DEPENDS.sun-jdk7?= sun-jdk7-[0-9]* BUILDLINK_API_DEPENDS.sun-jre7?= sun-jre7-[0-9]* BUILDLINK_API_DEPENDS.oracle-jdk8?= oracle-jdk8-[0-9]* BUILDLINK_API_DEPENDS.oracle-jre8?= oracle-jre8-[0-9]* +BUILDLINK_API_DEPENDS.adoptopenjdk11-bin?= adoptopenjdk11-bin-[0-9]* BUILDLINK_API_DEPENDS.openjdk-bin?= openjdk-bin-[0-9]* BUILDLINK_API_DEPENDS.openjdk11?= openjdk11-[0-9]* @@ -267,6 +274,7 @@ _JRE.openjdk7= openjdk7 _JRE.openjdk8= openjdk8 _JRE.sun-jdk7= sun-jre7 _JRE.oracle-jdk8= oracle-jre8 +_JRE.adoptopenjdk11-bin= adoptopenjdk11-bin _JRE.openjdk-bin= openjdk-bin _JRE.openjdk11= openjdk11 @@ -294,6 +302,10 @@ _JDK_PKGSRCDIR= ../../lang/oracle-jdk8 _JRE_PKGSRCDIR= ../../lang/oracle-jre8 _JAVA_HOME= ${LOCALBASE}/java/oracle-8 UNLIMIT_RESOURCES+= datasize +.elif ${_PKG_JVM} == "adoptopenjdk11-bin" +_JDK_PKGSRCDIR= ../../lang/adoptopenjdk11-bin +_JRE_PKGSRCDIR= ../../lang/adoptopenjdk11-bin +_JAVA_HOME= ${LOCALBASE}/java/adoptopenjdk11-bin .elif ${_PKG_JVM} == "openjdk-bin" _JDK_PKGSRCDIR= ../../lang/openjdk-bin _JRE_PKGSRCDIR= ../../lang/openjdk-bin -- cgit v1.2.3