summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2015-06-02 20:37:01 +0000
committerryoon <ryoon@pkgsrc.org>2015-06-02 20:37:01 +0000
commit1dc27205ec1b5d691109ef3d4d1ac0b9454d0903 (patch)
treed8233d1690f66e2e16dda9587ee48a9880c1db45 /mk
parente278c486fbb85f250c0d14afdc45603294cb2653 (diff)
downloadpkgsrc-1dc27205ec1b5d691109ef3d4d1ac0b9454d0903.tar.gz
Add oracle-jre8/jdk8 to supported Java VMs.
Diffstat (limited to 'mk')
-rw-r--r--mk/java-vm.mk25
1 files changed, 22 insertions, 3 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index fec6d679395..9ad765de7b8 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.101 2015/03/06 18:28:45 szptvlfn Exp $
+# $NetBSD: java-vm.mk,v 1.102 2015/06/02 20:37:01 ryoon Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -10,7 +10,7 @@
# The JVM that should be used if nothing particular is specified.
#
# Possible values: kaffe openjdk7 openjdk8
-# sun-jdk6 sun-jdk7
+# sun-jdk6 sun-jdk7 oracle-jdk8
# Default value: (platform-dependent)
#
# Package-settable variables:
@@ -70,7 +70,7 @@ PKG_JVMS_ACCEPTED?= ${_PKG_JVMS}
# This is a list of all of the JDKs that may be used.
#
-_PKG_JVMS.8= openjdk8
+_PKG_JVMS.8= openjdk8 oracle-jdk8
_PKG_JVMS.7= ${_PKG_JVMS.8} openjdk7 sun-jdk7
_PKG_JVMS.6= ${_PKG_JVMS.7} sun-jdk6 jdk16
_PKG_JVMS.1.5= ${_PKG_JVMS.6} jdk15
@@ -161,6 +161,15 @@ _ONLY_FOR_PLATFORMS.sun-jdk7= \
NetBSD-[6-9]*-i386 NetBSD-[6-9]*-x86_64 \
SunOS-5.11-i386 \
SunOS-5.11-x86_64
+_ONLY_FOR_PLATFORMS.oracle-jdk8= \
+ Darwin-9.*-i386 Darwin-9.*-x86_64 \
+ Darwin-[1-9][0-9].*-i386 Darwin-[1-9][0-9].*-x86_64 \
+ DragonFly-*-i386 \
+ FreeBSD-6.*-i386 \
+ Linux-*-i[3-6]86 \
+ Linux-*-x86_64 \
+ NetBSD-[6-9]*-i386 NetBSD-[6-9]*-x86_64 \
+ SunOS-5.11-x86_64
# Set ONLY_FOR_PLATFORM based on accepted JVMs
.for _jvm_ in ${PKG_JVMS_ACCEPTED}
@@ -181,6 +190,7 @@ _JAVA_PKGBASE.openjdk7= openjdk7
_JAVA_PKGBASE.openjdk8= openjdk8
_JAVA_PKGBASE.sun-jdk6= sun-jre6
_JAVA_PKGBASE.sun-jdk7= sun-jre7
+_JAVA_PKGBASE.oracle-jdk8= oracle-jre8
# The following is copied from the respective JVM Makefiles.
_JAVA_NAME.kaffe= kaffe
@@ -188,6 +198,7 @@ _JAVA_NAME.openjdk7= openjdk7
_JAVA_NAME.openjdk8= openjdk8
_JAVA_NAME.sun-jdk6= sun6
_JAVA_NAME.sun-jdk7= sun7
+_JAVA_NAME.oracle-jdk8= oracle8
# Mark the acceptable JVMs and check which JVM packages are installed.
.for _jvm_ in ${_PKG_JVMS_ACCEPTED}
@@ -242,12 +253,15 @@ BUILDLINK_API_DEPENDS.sun-jdk6?= sun-jdk6-[0-9]*
BUILDLINK_API_DEPENDS.sun-jre6?= sun-jre6-[0-9]*
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]*
_JRE.kaffe= kaffe
_JRE.openjdk7= openjdk7
_JRE.openjdk8= openjdk8
_JRE.sun-jdk6= sun-jre6
_JRE.sun-jdk7= sun-jre7
+_JRE.oracle-jdk8= oracle-jre8
_JAVA_BASE_CLASSES= classes.zip
@@ -273,6 +287,11 @@ _JDK_PKGSRCDIR= ../../lang/sun-jdk7
_JRE_PKGSRCDIR= ../../lang/sun-jre7
_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/sun-7
UNLIMIT_RESOURCES+= datasize
+.elif ${_PKG_JVM} == "oracle-jdk8"
+_JDK_PKGSRCDIR= ../../lang/oracle-jdk8
+_JRE_PKGSRCDIR= ../../lang/oracle-jre8
+_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/oracle-8
+UNLIMIT_RESOURCES+= datasize
.endif
.if defined(_JAVA_HOME_DEFAULT)