Fri Feb 13 10:49:39 2015 UTC ()
set the default JVM for NetBSD/sparc64 and clean out nonexistent JVMs


(tnn)
diff -r1.97 -r1.98 pkgsrc/mk/java-vm.mk
cvs diff -r1.97 -r1.98 pkgsrc/mk/java-vm.mk (expand / switch to unified diff)

--- pkgsrc/mk/java-vm.mk 2015/02/09 16:55:01 1.97
+++ pkgsrc/mk/java-vm.mk 2015/02/13 10:49:39 1.98
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: java-vm.mk,v 1.97 2015/02/09 16:55:01 ryoon Exp $ 1# $NetBSD: java-vm.mk,v 1.98 2015/02/13 10:49:39 tnn Exp $
2# 2#
3# This Makefile fragment handles Java dependencies and make variables, 3# This Makefile fragment handles Java dependencies and make variables,
4# and is meant to be included by packages that require Java either at 4# and is meant to be included by packages that require Java either at
5# build-time or at run-time. 5# build-time or at run-time.
6# 6#
7# User-settable variables: 7# User-settable variables:
8# 8#
9# PKG_JVM_DEFAULT 9# PKG_JVM_DEFAULT
10# The JVM that should be used if nothing particular is specified. 10# The JVM that should be used if nothing particular is specified.
11# 11#
12# Possible values: kaffe openjdk7 openjdk7-bin openjdk8 12# Possible values: kaffe openjdk7 openjdk7-bin openjdk8
13# sun-jdk6 sun-jdk7 jdk15 jdk16 13# sun-jdk6 sun-jdk7
14# Default value: (platform-dependent) 14# Default value: (platform-dependent)
15# 15#
16# Package-settable variables: 16# Package-settable variables:
17# 17#
18# USE_JAVA 18# USE_JAVA
19# When set to "yes", a build-time dependency on the JDK and 19# When set to "yes", a build-time dependency on the JDK and
20# a run-time dependency on the JRE are added. 20# a run-time dependency on the JRE are added.
21# When set to "run", a run-time dependency on the JRE is added. 21# When set to "run", a run-time dependency on the JRE is added.
22# When set to "build", a build-time dependency on the JRE is added. 22# When set to "build", a build-time dependency on the JRE is added.
23# 23#
24# Possible values: yes run build 24# Possible values: yes run build
25# Default value: yes 25# Default value: yes
26# 26#
@@ -84,84 +84,81 @@ _PKG_JVMS= ${_PKG_JVMS.${USE_JAVA2}} @@ -84,84 +84,81 @@ _PKG_JVMS= ${_PKG_JVMS.${USE_JAVA2}}
84# 84#
85.if defined(PKG_JVM) 85.if defined(PKG_JVM)
86. if !empty(PKG_JVM) 86. if !empty(PKG_JVM)
87_PKG_JVM_DEFAULT:= ${PKG_JVM} 87_PKG_JVM_DEFAULT:= ${PKG_JVM}
88. endif 88. endif
89.endif 89.endif
90 90
91# Set the default JVM for this platform. 91# Set the default JVM for this platform.
92# 92#
93.if !empty(PKG_JVM_DEFAULT) 93.if !empty(PKG_JVM_DEFAULT)
94_PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT} 94_PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT}
95.endif 95.endif
96.if !defined(_PKG_JVM_DEFAULT) 96.if !defined(_PKG_JVM_DEFAULT)
97. if !empty(MACHINE_PLATFORM:MNetBSD-[456789].*-i386) || \ 97. if !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-i386) || \
98 !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64) 98 !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64)
99_PKG_JVM_DEFAULT?= openjdk7 99_PKG_JVM_DEFAULT?= openjdk7
 100. elif !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-sparc64)
 101_PKG_JVM_DEFAULT?= openjdk8
100. elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ 102. elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
101 !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \ 103 !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
102 !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 104 !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
103_PKG_JVM_DEFAULT?= sun-jdk6 105_PKG_JVM_DEFAULT?= sun-jdk6
104. elif !empty(MACHINE_PLATFORM:MDarwin-*-*) 106. elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
105_PKG_JVM_DEFAULT?= sun-jdk6 107_PKG_JVM_DEFAULT?= sun-jdk6
106. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) || \ 108. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) || \
107 !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64) 109 !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
108_PKG_JVM_DEFAULT?= openjdk7 110_PKG_JVM_DEFAULT?= openjdk7
109. elif !empty(MACHINE_PLATFORM:MDragonFly-*-*) 111. elif !empty(MACHINE_PLATFORM:MDragonFly-*-*)
110_PKG_JVM_DEFAULT?= openjdk7 112_PKG_JVM_DEFAULT?= openjdk7
111. else 113. else
112_PKG_JVM_DEFAULT?= kaffe 114_PKG_JVM_DEFAULT?= kaffe
113. endif 115. endif
114.endif 116.endif
115 117
116# These lists are copied from the JVM package Makefiles. 118# These lists are copied from the JVM package Makefiles.
117_ONLY_FOR_PLATFORMS.jdk15= \ 
118 DragonFly-*-* \ 
119 FreeBSD-8.[1-9]*-i386 FreeBSD-8.[1-9]*-x86_64 \ 
120 NetBSD-[2-9].*-i386 NetBSD-[4-9].*-x86_64 
121_ONLY_FOR_PLATFORMS.jdk16= \ 
122 DragonFly-*-* \ 
123 NetBSD-[2-9].*-i386 NetBSD-[4-9].*-x86_64 
124_ONLY_FOR_PLATFORMS.kaffe= \ 119_ONLY_FOR_PLATFORMS.kaffe= \
125 *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \ 120 *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \
126 *-*-mipsel* *-*-sparc *-*-powerpc 121 *-*-mipsel* *-*-sparc *-*-powerpc
127# exclude *-*-x86_64 from kaffe list as it apparently doesn't work 122# exclude *-*-x86_64 from kaffe list as it apparently doesn't work
128_ONLY_FOR_PLATFORMS.sun-jdk6= \ 123_ONLY_FOR_PLATFORMS.sun-jdk6= \
129 Darwin-9.*-i386 Darwin-9.*-x86_64 \ 124 Darwin-9.*-i386 Darwin-9.*-x86_64 \
130 Darwin-10.*-i386 Darwin-10.*-x86_64 \ 125 Darwin-10.*-i386 Darwin-10.*-x86_64 \
131 Darwin-11.*-i386 Darwin-11.*-x86_64 \ 126 Darwin-11.*-i386 Darwin-11.*-x86_64 \
132 DragonFly-*-i386 \ 127 DragonFly-*-i386 \
133 FreeBSD-6.*-i386 \ 128 FreeBSD-6.*-i386 \
134 Linux-*-i[3-6]86 \ 129 Linux-*-i[3-6]86 \
135 Linux-*-x86_64 \ 130 Linux-*-x86_64 \
136 NetBSD-*-i386 NetBSD-*-x86_64 \ 131 NetBSD-*-i386 NetBSD-*-x86_64 \
137 SunOS-5.10-i386 \ 132 SunOS-5.10-i386 \
138 SunOS-5.10-sparc \ 133 SunOS-5.10-sparc \
139 SunOS-5.10-x86_64 \ 134 SunOS-5.10-x86_64 \
140 SunOS-5.11-i386 \ 135 SunOS-5.11-i386 \
141 SunOS-5.11-x86_64 136 SunOS-5.11-x86_64
142_ONLY_FOR_PLATFORMS.openjdk7= \ 137_ONLY_FOR_PLATFORMS.openjdk7= \
143 DragonFly-*-* \ 138 DragonFly-*-* \
144 NetBSD-[5-9]*-i386 \ 139 NetBSD-[5-9]*-i386 \
145 NetBSD-[5-9]*-x86_64 \ 140 NetBSD-[5-9]*-x86_64 \
 141 NetBSD-[7-9]*-sparc64 \
146 SunOS-*-i386 \ 142 SunOS-*-i386 \
147 SunOS-*-x86_64 143 SunOS-*-x86_64
148_ONLY_FOR_PLATFORMS.openjdk7-bin= \ 144_ONLY_FOR_PLATFORMS.openjdk7-bin= \
149 NetBSD-[5-9]*-i386 \ 145 NetBSD-[5-9]*-i386 \
150 NetBSD-[5-9]*-x86_64 146 NetBSD-[5-9]*-x86_64
151_ONLY_FOR_PLATFORMS.openjdk8= \ 147_ONLY_FOR_PLATFORMS.openjdk8= \
152 DragonFly-*-* \ 148 DragonFly-*-* \
153 NetBSD-[5-9]*-i386 \ 149 NetBSD-[5-9]*-i386 \
154 NetBSD-[5-9]*-x86_64 \ 150 NetBSD-[5-9]*-x86_64 \
 151 NetBSD-[7-9]*-sparc64 \
155 SunOS-*-i386 \ 152 SunOS-*-i386 \
156 SunOS-*-x86_64 153 SunOS-*-x86_64
157_ONLY_FOR_PLATFORMS.sun-jdk7= \ 154_ONLY_FOR_PLATFORMS.sun-jdk7= \
158 Darwin-9.*-i386 Darwin-9.*-x86_64 \ 155 Darwin-9.*-i386 Darwin-9.*-x86_64 \
159 Darwin-[1-9][0-9].*-i386 Darwin-[1-9][0-9].*-x86_64 \ 156 Darwin-[1-9][0-9].*-i386 Darwin-[1-9][0-9].*-x86_64 \
160 DragonFly-*-i386 \ 157 DragonFly-*-i386 \
161 FreeBSD-6.*-i386 \ 158 FreeBSD-6.*-i386 \
162 Linux-*-i[3-6]86 \ 159 Linux-*-i[3-6]86 \
163 Linux-*-x86_64 \ 160 Linux-*-x86_64 \
164 NetBSD-[6-9]*-i386 NetBSD-[6-9]*-x86_64 \ 161 NetBSD-[6-9]*-i386 NetBSD-[6-9]*-x86_64 \
165 SunOS-5.11-i386 \ 162 SunOS-5.11-i386 \
166 SunOS-5.11-x86_64 163 SunOS-5.11-x86_64
167 164
@@ -169,40 +166,34 @@ _ONLY_FOR_PLATFORMS.sun-jdk7= \ @@ -169,40 +166,34 @@ _ONLY_FOR_PLATFORMS.sun-jdk7= \
169.for _jvm_ in ${PKG_JVMS_ACCEPTED} 166.for _jvm_ in ${PKG_JVMS_ACCEPTED}
170ONLY_FOR_PLATFORM+= ${_ONLY_FOR_PLATFORMS.${_jvm_}} 167ONLY_FOR_PLATFORM+= ${_ONLY_FOR_PLATFORMS.${_jvm_}}
171.endfor 168.endfor
172 169
173# Set the accepted JVMs for this platform. 170# Set the accepted JVMs for this platform.
174.for _jvm_ in ${_PKG_JVMS} 171.for _jvm_ in ${_PKG_JVMS}
175. for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}} 172. for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}}
176. if !empty(MACHINE_PLATFORM:M${_pattern_}) 173. if !empty(MACHINE_PLATFORM:M${_pattern_})
177_PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}} 174_PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}}
178. endif 175. endif
179. endfor 176. endfor
180.endfor 177.endfor
181 178
182_JAVA_PKGBASE.jdk= jdk 
183_JAVA_PKGBASE.jdk14= jdk14 
184_JAVA_PKGBASE.jdk15= jdk15 
185_JAVA_PKGBASE.jdk16= jdk16 
186_JAVA_PKGBASE.kaffe= kaffe 179_JAVA_PKGBASE.kaffe= kaffe
187_JAVA_PKGBASE.openjdk7= openjdk7 180_JAVA_PKGBASE.openjdk7= openjdk7
188_JAVA_PKGBASE.openjdk7-bin= openjdk7-bin 181_JAVA_PKGBASE.openjdk7-bin= openjdk7-bin
189_JAVA_PKGBASE.openjdk8= openjdk8 182_JAVA_PKGBASE.openjdk8= openjdk8
190_JAVA_PKGBASE.sun-jdk6= sun-jre6 183_JAVA_PKGBASE.sun-jdk6= sun-jre6
191_JAVA_PKGBASE.sun-jdk7= sun-jre7 184_JAVA_PKGBASE.sun-jdk7= sun-jre7
192 185
193# The following is copied from the respective JVM Makefiles. 186# The following is copied from the respective JVM Makefiles.
194_JAVA_NAME.jdk= jdk11 
195_JAVA_NAME.jdk14= jdk14 
196_JAVA_NAME.kaffe= kaffe 187_JAVA_NAME.kaffe= kaffe
197_JAVA_NAME.openjdk7= openjdk7 188_JAVA_NAME.openjdk7= openjdk7
198_JAVA_NAME.openjdk7-bin= openjdk7-bin 189_JAVA_NAME.openjdk7-bin= openjdk7-bin
199_JAVA_NAME.openjdk8= openjdk8 190_JAVA_NAME.openjdk8= openjdk8
200_JAVA_NAME.sun-jdk6= sun6 191_JAVA_NAME.sun-jdk6= sun6
201_JAVA_NAME.sun-jdk7= sun7 192_JAVA_NAME.sun-jdk7= sun7
202 193
203# Mark the acceptable JVMs and check which JVM packages are installed. 194# Mark the acceptable JVMs and check which JVM packages are installed.
204.for _jvm_ in ${_PKG_JVMS_ACCEPTED} 195.for _jvm_ in ${_PKG_JVMS_ACCEPTED}
205_PKG_JVM_OK.${_jvm_}= yes 196_PKG_JVM_OK.${_jvm_}= yes
206_PKG_JVM_INSTALLED.${_jvm_}!= \ 197_PKG_JVM_INSTALLED.${_jvm_}!= \
207 if ${PKG_INFO} -qe ${_JAVA_PKGBASE.${_jvm_}}; then \ 198 if ${PKG_INFO} -qe ${_JAVA_PKGBASE.${_jvm_}}; then \
208 ${ECHO} yes; \ 199 ${ECHO} yes; \
@@ -236,57 +227,45 @@ _PKG_JVM= ${_PKG_JVM_DEFAULT} @@ -236,57 +227,45 @@ _PKG_JVM= ${_PKG_JVM_DEFAULT}
236. if defined(_PKG_JVM_FIRSTACCEPTED) 227. if defined(_PKG_JVM_FIRSTACCEPTED)
237_PKG_JVM= ${_PKG_JVM_FIRSTACCEPTED} 228_PKG_JVM= ${_PKG_JVM_FIRSTACCEPTED}
238. endif 229. endif
239.endif 230.endif
240# 231#
241# If there are no acceptable JVMs, then generate an error. 232# If there are no acceptable JVMs, then generate an error.
242# 233#
243.if !defined(_PKG_JVM) 234.if !defined(_PKG_JVM)
244# force an error 235# force an error
245PKG_FAIL_REASON= "no acceptable JVM found" 236PKG_FAIL_REASON= "no acceptable JVM found"
246_PKG_JVM= "none" 237_PKG_JVM= "none"
247.endif 238.endif
248 239
249BUILDLINK_API_DEPENDS.jdk15?= jdk15-[0-9]* 
250BUILDLINK_API_DEPENDS.jdk16?= jdk16-[0-9]* 
251BUILDLINK_API_DEPENDS.kaffe?= kaffe>=1.1.4 240BUILDLINK_API_DEPENDS.kaffe?= kaffe>=1.1.4
252BUILDLINK_API_DEPENDS.openjdk7?= openjdk7-[0-9]* 241BUILDLINK_API_DEPENDS.openjdk7?= openjdk7-[0-9]*
253BUILDLINK_API_DEPENDS.openjdk7-bin?= openjdk7-bin-[0-9]* 242BUILDLINK_API_DEPENDS.openjdk7-bin?= openjdk7-bin-[0-9]*
254BUILDLINK_API_DEPENDS.openjdk8?= openjdk8-[0-9]* 243BUILDLINK_API_DEPENDS.openjdk8?= openjdk8-[0-9]*
255BUILDLINK_API_DEPENDS.sun-jdk6?= sun-jdk6-[0-9]* 244BUILDLINK_API_DEPENDS.sun-jdk6?= sun-jdk6-[0-9]*
256BUILDLINK_API_DEPENDS.sun-jre6?= sun-jre6-[0-9]* 245BUILDLINK_API_DEPENDS.sun-jre6?= sun-jre6-[0-9]*
257BUILDLINK_API_DEPENDS.sun-jdk7?= sun-jdk7-[0-9]* 246BUILDLINK_API_DEPENDS.sun-jdk7?= sun-jdk7-[0-9]*
258BUILDLINK_API_DEPENDS.sun-jre7?= sun-jre7-[0-9]* 247BUILDLINK_API_DEPENDS.sun-jre7?= sun-jre7-[0-9]*
259 248
260_JRE.jdk15= jdk15 
261_JRE.jdk16= jdk16 
262_JRE.kaffe= kaffe 249_JRE.kaffe= kaffe
263_JRE.openjdk7= openjdk7 250_JRE.openjdk7= openjdk7
264_JRE.openjdk7-bin= openjdk7-bin 251_JRE.openjdk7-bin= openjdk7-bin
265_JRE.openjdk8= openjdk8 252_JRE.openjdk8= openjdk8
266_JRE.sun-jdk6= sun-jre6 253_JRE.sun-jdk6= sun-jre6
267_JRE.sun-jdk7= sun-jre7 254_JRE.sun-jdk7= sun-jre7
268 255
269_JAVA_BASE_CLASSES= classes.zip 256_JAVA_BASE_CLASSES= classes.zip
270 257
271.if ${_PKG_JVM} == "jdk15" 258.if ${_PKG_JVM} == "kaffe"
272_JDK_PKGSRCDIR= ../../wip/jdk15 
273_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} 
274_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/jdk-1.5.0 
275.elif ${_PKG_JVM} == "jdk16" 
276_JDK_PKGSRCDIR= ../../wip/jdk16 
277_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} 
278_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/jdk-1.6.0 
279.elif ${_PKG_JVM} == "kaffe" 
280_JDK_PKGSRCDIR= ../../lang/kaffe 259_JDK_PKGSRCDIR= ../../lang/kaffe
281_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} 260_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
282_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/kaffe 261_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/kaffe
283.elif ${_PKG_JVM} == "openjdk7" 262.elif ${_PKG_JVM} == "openjdk7"
284_JDK_PKGSRCDIR= ../../lang/openjdk7 263_JDK_PKGSRCDIR= ../../lang/openjdk7
285_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} 264_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
286_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/openjdk7 265_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/openjdk7
287.elif ${_PKG_JVM} == "openjdk7-bin" 266.elif ${_PKG_JVM} == "openjdk7-bin"
288_JDK_PKGSRCDIR= ../../lang/openjdk7-bin 267_JDK_PKGSRCDIR= ../../lang/openjdk7-bin
289_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} 268_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
290_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/openjdk7-bin 269_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/openjdk7-bin
291.elif ${_PKG_JVM} == "openjdk8" 270.elif ${_PKG_JVM} == "openjdk8"
292_JDK_PKGSRCDIR= ../../lang/openjdk8 271_JDK_PKGSRCDIR= ../../lang/openjdk8