[pkgsrc/trunk]: pkgsrc/mk Add openjdk7-bin to the list of valid JVMs and use ...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ddbb12dd42f
branches:  trunk
changeset: 557064:3ddbb12dd42f
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Apr 10 09:05:25 2009 +0000

description:
Add openjdk7-bin to the list of valid JVMs and use as a default on
NetBSD/i386 5.x
The previous default - the linux sun-jre6 - would randomly crash under
load for at least tomcat and jboss

diffstat:

 mk/java-vm.mk |  35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diffs (106 lines):

diff -r 3de3f6fac282 -r 3ddbb12dd42f mk/java-vm.mk
--- a/mk/java-vm.mk     Fri Apr 10 08:51:06 2009 +0000
+++ b/mk/java-vm.mk     Fri Apr 10 09:05:25 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.67 2009/01/19 00:34:53 christos Exp $
+# $NetBSD: java-vm.mk,v 1.68 2009/04/10 09:05:25 abs Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -9,7 +9,7 @@
 # PKG_JVM_DEFAULT
 #      The JVM that should be used if nothing particular is specified.
 #
-#      Possible values: jdk kaffe
+#      Possible values: jdk kaffe openjdk7-bin
 #              sun-jdk14 jdk14 sun-jdk15 sun-jdk6 jdk15
 #      Default value: (platform-dependent)
 #
@@ -68,7 +68,8 @@
 
 # This is a list of all of the JDKs that may be used.
 #
-_PKG_JVMS.6=           sun-jdk6
+_PKG_JVMS.7=           openjdk7-bin
+_PKG_JVMS.6=           ${_PKG_JVMS.7} sun-jdk6
 _PKG_JVMS.1.5=         ${_PKG_JVMS.6} sun-jdk15 jdk15
 _PKG_JVMS.1.4=         ${_PKG_JVMS.1.5} sun-jdk14 jdk14
 _PKG_JVMS.yes=         ${_PKG_JVMS.1.4} kaffe
@@ -90,7 +91,9 @@
 _PKG_JVM_DEFAULT=      ${PKG_JVM_DEFAULT}
 .endif
 .if !defined(_PKG_JVM_DEFAULT)
-.  if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
+.  if !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-i386)
+_PKG_JVM_DEFAULT?=     openjdk7-bin
+.  elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
       !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86)
 _PKG_JVM_DEFAULT?=     sun-jdk
 .  elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
@@ -134,6 +137,8 @@
        Linux-*-i[3-6]86 \
        NetBSD-*-i386 NetBSD-*-x86_64 \
        SunOS-5.11-i386
+_ONLY_FOR_PLATFORMS.openjdk7-bin= \
+       NetBSD-*-i386
 
 # Set the accepted JVMs for this platform.
 .for _jvm_ in ${_PKG_JVMS}
@@ -148,6 +153,7 @@
 _JAVA_PKGBASE.jdk14=           jdk14
 _JAVA_PKGBASE.jdk15=           jdk15
 _JAVA_PKGBASE.kaffe=           kaffe
+_JAVA_PKGBASE.openjdk7-bin=    openjdk7-bin
 _JAVA_PKGBASE.sun-jdk14=       sun-jre14
 _JAVA_PKGBASE.sun-jdk15=       sun-jre15
 _JAVA_PKGBASE.sun-jdk6=                sun-jre6
@@ -156,6 +162,7 @@
 _JAVA_NAME.jdk=                        jdk11
 _JAVA_NAME.jdk14=              jdk14
 _JAVA_NAME.kaffe=              kaffe
+_JAVA_NAME.openjdk7-bin=       openjdk7-bin
 _JAVA_NAME.sun-jdk14=          sun14
 _JAVA_NAME.sun-jdk15=          sun15
 _JAVA_NAME.sun-jdk6=           sun6
@@ -232,21 +239,23 @@
 _PKG_JVM=              "none"
 .endif
 
-BUILDLINK_API_DEPENDS.jdk?=                    jdk-[0-9]*
+BUILDLINK_API_DEPENDS.jdk?=            jdk-[0-9]*
 BUILDLINK_API_DEPENDS.jdk14?=          jdk14-[0-9]*
 BUILDLINK_API_DEPENDS.jdk15?=          jdk15-[0-9]*
 BUILDLINK_API_DEPENDS.kaffe?=          kaffe>=1.1.4
-BUILDLINK_API_DEPENDS.sun-jdk14?=              sun-jdk14-[0-9]*
-BUILDLINK_API_DEPENDS.sun-jre14?=              sun-jre14-[0-9]*
-BUILDLINK_API_DEPENDS.sun-jdk15?=              sun-jdk15-[0-9]*
-BUILDLINK_API_DEPENDS.sun-jre15?=              sun-jre15-[0-9]*
-BUILDLINK_API_DEPENDS.sun-jdk6?=               sun-jdk6-[0-9]*
-BUILDLINK_API_DEPENDS.sun-jre6?=               sun-jre6-[0-9]*
+BUILDLINK_API_DEPENDS.openjdk7-bin?=   openjdk7-bin-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jdk14?=      sun-jdk14-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jre14?=      sun-jre14-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jdk15?=      sun-jdk15-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jre15?=      sun-jre15-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jdk6?=       sun-jdk6-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jre6?=       sun-jre6-[0-9]*
 
 _JRE.jdk=              jdk
 _JRE.jdk14=            jdk14
 _JRE.jdk15=            jdk15
 _JRE.kaffe=            kaffe
+_JRE.openjdk7-bin=     openjdk7-bin
 _JRE.sun-jdk14=                sun-jre14
 _JRE.sun-jdk15=                sun-jre15
 _JRE.sun-jdk6=         sun-jre6
@@ -269,6 +278,10 @@
 _JDK_PKGSRCDIR=                ../../lang/kaffe
 _JRE_PKGSRCDIR=                ${_JDK_PKGSRCDIR}
 _JAVA_HOME_DEFAULT=    ${LOCALBASE}/java/kaffe
+.elif ${_PKG_JVM} == "openjdk7-bin"
+_JDK_PKGSRCDIR=                ../../lang/openjdk7-bin
+_JRE_PKGSRCDIR=                ${_JDK_PKGSRCDIR}
+_JAVA_HOME_DEFAULT=    ${LOCALBASE}/java/openjdk7-bin
 .elif ${_PKG_JVM} == "sun-jdk14"
 _JDK_PKGSRCDIR=                ../../lang/sun-jdk14
 _JRE_PKGSRCDIR=                ../../lang/sun-jre14