|
Lines 214-222
Link Here
|
| 214 |
|
214 |
|
| 215 |
# Error checking: JAVA_VERSION |
215 |
# Error checking: JAVA_VERSION |
| 216 |
.if !defined(_JAVA_VERSION_LIST_REGEXP) |
216 |
.if !defined(_JAVA_VERSION_LIST_REGEXP) |
| 217 |
. for v in ${_JAVA_VERSION_LIST} |
217 |
. for v in ${_JAVA_VERSION_LIST:C/\+/\\+/} |
| 218 |
. if defined(_JAVA_VERSION_LIST_REGEXP) |
218 |
. if defined(_JAVA_VERSION_LIST_REGEXP) |
| 219 |
_JAVA_VERSION_LIST_REGEXP:= ${_JAVA_VERSION_LIST_REGEXP}\| |
219 |
_JAVA_VERSION_LIST_REGEXP:= ${_JAVA_VERSION_LIST_REGEXP}| |
| 220 |
. endif |
220 |
. endif |
| 221 |
_JAVA_VERSION_LIST_REGEXP:= ${_JAVA_VERSION_LIST_REGEXP}$v |
221 |
_JAVA_VERSION_LIST_REGEXP:= ${_JAVA_VERSION_LIST_REGEXP}$v |
| 222 |
. endfor |
222 |
. endfor |
|
Lines 224-230
Link Here
|
| 224 |
|
224 |
|
| 225 |
|
225 |
|
| 226 |
check-makevars:: |
226 |
check-makevars:: |
| 227 |
@test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VERSION_LIST_REGEXP}" || \ |
227 |
@test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VERSION_LIST_REGEXP}" || \ |
| 228 |
(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; ${FALSE})) || true |
228 |
(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; ${FALSE})) || true |
| 229 |
|
229 |
|
| 230 |
# Error checking: JAVA_VENDOR |
230 |
# Error checking: JAVA_VENDOR |
|
Lines 231-243
Link Here
|
| 231 |
.if !defined(_JAVA_VENDOR_LIST_REGEXP) |
231 |
.if !defined(_JAVA_VENDOR_LIST_REGEXP) |
| 232 |
. for v in ${_JAVA_VENDOR_LIST} |
232 |
. for v in ${_JAVA_VENDOR_LIST} |
| 233 |
. if defined(_JAVA_VENDOR_LIST_REGEXP) |
233 |
. if defined(_JAVA_VENDOR_LIST_REGEXP) |
| 234 |
_JAVA_VENDOR_LIST_REGEXP:= ${_JAVA_VENDOR_LIST_REGEXP}\| |
234 |
_JAVA_VENDOR_LIST_REGEXP:= ${_JAVA_VENDOR_LIST_REGEXP}| |
| 235 |
. endif |
235 |
. endif |
| 236 |
_JAVA_VENDOR_LIST_REGEXP:= ${_JAVA_VENDOR_LIST_REGEXP}$v |
236 |
_JAVA_VENDOR_LIST_REGEXP:= ${_JAVA_VENDOR_LIST_REGEXP}$v |
| 237 |
. endfor |
237 |
. endfor |
| 238 |
.endif |
238 |
.endif |
| 239 |
check-makevars:: |
239 |
check-makevars:: |
| 240 |
@test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VENDOR_LIST_REGEXP}" || \ |
240 |
@test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VENDOR_LIST_REGEXP}" || \ |
| 241 |
(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDOR_LIST}"; \ |
241 |
(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDOR_LIST}"; \ |
| 242 |
${FALSE})) || true |
242 |
${FALSE})) || true |
| 243 |
|
243 |
|
|
Lines 245-257
Link Here
|
| 245 |
.if !defined(_JAVA_OS_LIST_REGEXP) |
245 |
.if !defined(_JAVA_OS_LIST_REGEXP) |
| 246 |
. for v in ${_JAVA_OS_LIST} |
246 |
. for v in ${_JAVA_OS_LIST} |
| 247 |
. if defined(_JAVA_OS_LIST_REGEXP) |
247 |
. if defined(_JAVA_OS_LIST_REGEXP) |
| 248 |
_JAVA_OS_LIST_REGEXP:= ${_JAVA_OS_LIST_REGEXP}\| |
248 |
_JAVA_OS_LIST_REGEXP:= ${_JAVA_OS_LIST_REGEXP}| |
| 249 |
. endif |
249 |
. endif |
| 250 |
_JAVA_OS_LIST_REGEXP:= ${_JAVA_OS_LIST_REGEXP}$v |
250 |
_JAVA_OS_LIST_REGEXP:= ${_JAVA_OS_LIST_REGEXP}$v |
| 251 |
. endfor |
251 |
. endfor |
| 252 |
.endif |
252 |
.endif |
| 253 |
check-makevars:: |
253 |
check-makevars:: |
| 254 |
@test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_OS_LIST_REGEXP}" || \ |
254 |
@test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_OS_LIST_REGEXP}" || \ |
| 255 |
(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}"; \ |
255 |
(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}"; \ |
| 256 |
${FALSE})) || true |
256 |
${FALSE})) || true |
| 257 |
|
257 |
|