FreeBSD Bugzilla – Attachment 204819 Details for
Bug 237054
java/openjdk11: Needs to be integrated into bsd.java.mk
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Changes for bsd.java.mk
bsd.java.mk.diff (text/plain), 4.49 KB, created by
Greg Lewis
on 2019-06-04 14:17:02 UTC
(
hide
)
Description:
Changes for bsd.java.mk
Filename:
MIME Type:
Creator:
Greg Lewis
Created:
2019-06-04 14:17:02 UTC
Size:
4.49 KB
patch
obsolete
>Index: bsd.java.mk >=================================================================== >--- bsd.java.mk (revision 501024) >+++ bsd.java.mk (working copy) >@@ -130,6 +130,9 @@ > > . if defined(USE_JAVA) > >+. if !defined(JAVA_VERSION) && empty(USE_JAVA:C/[0-9]*[\.]*[0-9]*[+]*//) >+JAVA_VERSION=${USE_JAVA} >+. endif > > #------------------------------------------------------------------------------- > # Stage 1: Define constants >@@ -159,7 +162,7 @@ > . endif > > # The complete list of Java versions, os and vendors supported. >-__JAVA_VERSION_LIST= 1.6 1.7 1.8 1.9 >+__JAVA_VERSION_LIST= 6 7 8 9 10 11 12 > _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} > _JAVA_OS_LIST= native linux > _JAVA_VENDOR_LIST= openjdk oracle sun >@@ -166,16 +169,22 @@ > > # Set all meta-information about JDK ports: > # port location, corresponding JAVA_HOME, JDK version, OS, vendor >-_JAVA_PORT_NATIVE_OPENJDK_JDK_1_6_INFO= PORT=java/openjdk6 HOME=${LOCALBASE}/openjdk6 \ >- VERSION=1.6.0 OS=native VENDOR=openjdk >-_JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_INFO= PORT=java/openjdk7 HOME=${LOCALBASE}/openjdk7 \ >- VERSION=1.7.0 OS=native VENDOR=openjdk >-_JAVA_PORT_NATIVE_OPENJDK_JDK_1_8_INFO= PORT=java/openjdk8 HOME=${LOCALBASE}/openjdk8 \ >- VERSION=1.8.0 OS=native VENDOR=openjdk >-_JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \ >- VERSION=1.8.0 OS=linux VENDOR=oracle >-_JAVA_PORT_LINUX_ORACLE_JDK_1_9_INFO= PORT=java/linux-oracle-jdk9 HOME=${LOCALBASE}/linux-oracle-jdk9 \ >- VERSION=1.9.0 OS=linux VENDOR=oracle >+_JAVA_PORT_NATIVE_OPENJDK_JDK_6_INFO= PORT=java/openjdk6 HOME=${LOCALBASE}/openjdk6 \ >+ VERSION=6 OS=native VENDOR=openjdk >+_JAVA_PORT_NATIVE_OPENJDK_JDK_7_INFO= PORT=java/openjdk7 HOME=${LOCALBASE}/openjdk7 \ >+ VERSION=7 OS=native VENDOR=openjdk >+_JAVA_PORT_NATIVE_OPENJDK_JDK_8_INFO= PORT=java/openjdk8 HOME=${LOCALBASE}/openjdk8 \ >+ VERSION=8 OS=native VENDOR=openjdk >+_JAVA_PORT_NATIVE_OPENJDK_JDK_11_INFO= PORT=java/openjdk11 HOME=${LOCALBASE}/openjdk11 \ >+ VERSION=11 OS=native VENDOR=openjdk >+_JAVA_PORT_NATIVE_OPENJDK_JDK_12_INFO= PORT=java/openjdk12 HOME=${LOCALBASE}/openjdk12 \ >+ VERSION=12 OS=native VENDOR=openjdk >+_JAVA_PORT_LINUX_ORACLE_JDK_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \ >+ VERSION=8 OS=linux VENDOR=oracle >+_JAVA_PORT_LINUX_ORACLE_JDK_9_INFO= PORT=java/linux-oracle-jdk9 HOME=${LOCALBASE}/linux-oracle-jdk9 \ >+ VERSION=9 OS=linux VENDOR=oracle >+_JAVA_PORT_LINUX_ORACLE_JDK_10_INFO= PORT=java/linux-oracle-jdk10 HOME=${LOCALBASE}/linux-oracle-jdk10 \ >+ VERSION=10 OS=linux VENDOR=oracle > > # Verbose description for each VENDOR > _JAVA_VENDOR_openjdk= "OpenJDK BSD Porting Team" >@@ -187,11 +196,14 @@ > _JAVA_OS_linux= Linux > > # List all JDK ports in order of preference >-__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \ >- JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \ >- JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \ >- JAVA_PORT_LINUX_ORACLE_JDK_1_8 \ >- JAVA_PORT_LINUX_ORACLE_JDK_1_9 >+__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_8 \ >+ JAVA_PORT_NATIVE_OPENJDK_JDK_11 \ >+ JAVA_PORT_NATIVE_OPENJDK_JDK_12 \ >+ JAVA_PORT_NATIVE_OPENJDK_JDK_7 \ >+ JAVA_PORT_NATIVE_OPENJDK_JDK_6 \ >+ JAVA_PORT_LINUX_ORACLE_JDK_8 \ >+ JAVA_PORT_LINUX_ORACLE_JDK_9 \ >+ JAVA_PORT_LINUX_ORACLE_JDK_10 > _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ > ${__JAVA_PORTS_ALL} > >@@ -264,7 +276,7 @@ > . undef _JAVA_PORTS_INSTALLED > . undef _JAVA_PORTS_POSSIBLE > . if defined(JAVA_VERSION) >-_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/} >+_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 10+/:S/1.6/6/:S/1.7/7/:S/1.8/8/:S/1.9/9/:S/6+/6 7+/:S/7+/7 8+/:S/8+/8 9+/:S/9+/9 10+/:S/10+/10 11+/:S/11+/11 12+/:S/12+/12/} > . else > _JAVA_VERSION= ${__JAVA_VERSION_LIST} > . endif >@@ -282,7 +294,7 @@ > . for A_JAVA_PORT in ${_JAVA_PORTS_ALL} > A_JAVA_PORT_INFO:= ${A_JAVA_PORT:S/^/\${_/:S/$/_INFO}/} > A_JAVA_PORT_HOME= ${A_JAVA_PORT_INFO:MHOME=*:S,HOME=,,} >-A_JAVA_PORT_VERSION= ${A_JAVA_PORT_INFO:MVERSION=*:C/VERSION=([0-9])\.([0-9])(.*)/\1.\2/} >+A_JAVA_PORT_VERSION= ${A_JAVA_PORT_INFO:MVERSION=*:S,VERSION=,,} > A_JAVA_PORT_OS= ${A_JAVA_PORT_INFO:MOS=*:S,OS=,,} > A_JAVA_PORT_VENDOR= ${A_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,} > .if !defined(_JAVA_PORTS_INSTALLED) && exists(${A_JAVA_PORT_HOME}/${_JDK_FILE})
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 237054
:
204462
|
204463
|
204640
| 204819