View | Details | Raw Unified | Return to bug 237054 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-4 / +10 lines)
Lines 159-165 Link Here
159
.              endif
159
.              endif
160
# The complete list of Java versions, os and vendors supported.
160
# The complete list of Java versions, os and vendors supported.
161
__JAVA_VERSION_LIST=   1.6 1.7 1.8 1.9
161
__JAVA_VERSION_LIST=   1.6 1.7 1.8 1.9 11.0 12.0
162
_JAVA_VERSION_LIST=            ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
162
_JAVA_VERSION_LIST=            ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
163
_JAVA_OS_LIST=                 native linux
163
_JAVA_OS_LIST=                 native linux
164
_JAVA_VENDOR_LIST=             openjdk oracle sun
164
_JAVA_VENDOR_LIST=             openjdk oracle sun
Lines 172-177 Link Here
172
                                                                                       VERSION=1.7.0   OS=native       VENDOR=openjdk
172
                                                                                       VERSION=1.7.0   OS=native       VENDOR=openjdk
173
_JAVA_PORT_NATIVE_OPENJDK_JDK_1_8_INFO=                PORT=java/openjdk8                      HOME=${LOCALBASE}/openjdk8 \
173
_JAVA_PORT_NATIVE_OPENJDK_JDK_1_8_INFO=                PORT=java/openjdk8                      HOME=${LOCALBASE}/openjdk8 \
174
                                                                                       VERSION=1.8.0   OS=native       VENDOR=openjdk
174
                                                                                       VERSION=1.8.0   OS=native       VENDOR=openjdk
175
_JAVA_PORT_NATIVE_OPENJDK_JDK_11_0_INFO=       PORT=java/openjdk11                     HOME=${LOCALBASE}/openjdk11 \
176
                                                                                       VERSION=11.0.0  OS=native       VENDOR=openjdk
177
_JAVA_PORT_NATIVE_OPENJDK_JDK_12_0_INFO=       PORT=java/openjdk12                     HOME=${LOCALBASE}/openjdk12 \
178
                                                                                       VERSION=12.0.0  OS=native       VENDOR=openjdk
175
_JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO=          PORT=java/linux-oracle-jdk18    HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \
179
_JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO=          PORT=java/linux-oracle-jdk18    HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \
176
                                                                                       VERSION=1.8.0   OS=linux        VENDOR=oracle
180
                                                                                       VERSION=1.8.0   OS=linux        VENDOR=oracle
177
_JAVA_PORT_LINUX_ORACLE_JDK_1_9_INFO=          PORT=java/linux-oracle-jdk9     HOME=${LOCALBASE}/linux-oracle-jdk9 \
181
_JAVA_PORT_LINUX_ORACLE_JDK_1_9_INFO=          PORT=java/linux-oracle-jdk9     HOME=${LOCALBASE}/linux-oracle-jdk9 \
Lines 187-193 Link Here
187
_JAVA_OS_linux=                Linux
191
_JAVA_OS_linux=                Linux
188
# List all JDK ports in order of preference
192
# List all JDK ports in order of preference
189
__JAVA_PORTS_ALL=      JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \
193
__JAVA_PORTS_ALL=      JAVA_PORT_NATIVE_OPENJDK_JDK_12_0 \
194
                                       JAVA_PORT_NATIVE_OPENJDK_JDK_11_0 \
195
                                       JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \
190
                                       JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \
196
                                       JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \
191
                                       JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \
197
                                       JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \
192
                                       JAVA_PORT_LINUX_ORACLE_JDK_1_8 \
198
                                       JAVA_PORT_LINUX_ORACLE_JDK_1_8 \
Lines 264-270 Link Here
264
.              undef _JAVA_PORTS_INSTALLED
270
.              undef _JAVA_PORTS_INSTALLED
265
.              undef _JAVA_PORTS_POSSIBLE
271
.              undef _JAVA_PORTS_POSSIBLE
266
.              if defined(JAVA_VERSION)
272
.              if defined(JAVA_VERSION)
267
_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.6 1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 1.9+/:S/1.9+/1.9/}
273
_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.6 1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 1.9+/:S/1.9+/1.9 11.0+/:S/11.0+/11.0 12.0+/:S/12.0+/12.0/}
268
.              else
274
.              else
269
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
275
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
270
.              endif
276
.              endif
Lines 282-288 Link Here
282
.              for A_JAVA_PORT in ${_JAVA_PORTS_ALL}
288
.              for A_JAVA_PORT in ${_JAVA_PORTS_ALL}
283
A_JAVA_PORT_INFO:=                     ${A_JAVA_PORT:S/^/\${_/:S/$/_INFO}/}
289
A_JAVA_PORT_INFO:=                     ${A_JAVA_PORT:S/^/\${_/:S/$/_INFO}/}
284
A_JAVA_PORT_HOME=                      ${A_JAVA_PORT_INFO:MHOME=*:S,HOME=,,}
290
A_JAVA_PORT_HOME=                      ${A_JAVA_PORT_INFO:MHOME=*:S,HOME=,,}
285
A_JAVA_PORT_VERSION=           ${A_JAVA_PORT_INFO:MVERSION=*:C/VERSION=([0-9])\.([0-9])(.*)/\1.\2/}
291
A_JAVA_PORT_VERSION=           ${A_JAVA_PORT_INFO:MVERSION=*:C/VERSION=([0-9]+)\.([0-9])(.*)/\1.\2/}
286
A_JAVA_PORT_OS=                                ${A_JAVA_PORT_INFO:MOS=*:S,OS=,,}
292
A_JAVA_PORT_OS=                                ${A_JAVA_PORT_INFO:MOS=*:S,OS=,,}
287
A_JAVA_PORT_VENDOR=                    ${A_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,}
293
A_JAVA_PORT_VENDOR=                    ${A_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,}
288
.if !defined(_JAVA_PORTS_INSTALLED) && exists(${A_JAVA_PORT_HOME}/${_JDK_FILE})
294
.if !defined(_JAVA_PORTS_INSTALLED) && exists(${A_JAVA_PORT_HOME}/${_JDK_FILE})

Return to bug 237054