cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for OpenJDK 1.8

Browse Source 
Add support for Oracle JDK 1.8
Remove support for Sun JDK 1.6 (EOLed)
Remove support for USE_JAVA=1.5
This commit is contained in:
Baptiste Daroussin 2014-04-10 07:20:23 +00:00
parent 6b16064740
commit 8a3c16d98f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=350782
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Mk/bsd.java.mk
View File

@ -25,7 +25,7 @@ Java_Include_MAINTAINER= glewis@FreeBSD.org hq@FreeBSD.org
#
# JAVA_VERSION List of space-separated suitable java versions for the
# port. An optional "+" allows you to specify a range of
# versions. (allowed values: 1.5[+] 1.6[+] 1.7[+])
# versions. (allowed values: 1.6[+] 1.7[+] 1.8[+])
#
# JAVA_OS List of space-separated suitable JDK port operating systems
# for the port. (allowed values: native linux)
@ -156,25 +156,28 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}"
. endif
# The complete list of Java versions, os and vendors supported.
__JAVA_VERSION_LIST= 1.5 1.6 1.7
__JAVA_VERSION_LIST= 1.6 1.7 1.8
_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST= native linux
_JAVA_VENDOR_LIST= sun openjdk
_JAVA_VENDOR_LIST= sun openjdk oracle
# Set all meta-information about JDK ports:
# port location, corresponding JAVA_HOME, JDK version, OS, vendor
_JAVA_PORT_NATIVE_OPENJDK_JDK_1_8_INFO= PORT=java/openjdk8 HOME=${LOCALBASE}/openjdk8 \
VERSION=1.8.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_6_INFO= PORT=java/openjdk6 HOME=${LOCALBASE}/openjdk6 \
VERSION=1.6.0 OS=native VENDOR=openjdk
_JAVA_PORT_LINUX_SUN_JDK_1_6_INFO= PORT=java/linux-sun-jdk16 HOME=${LOCALBASE}/linux-sun-jdk1.6.0 \
VERSION=1.6.0 OS=linux VENDOR=sun
_JAVA_PORT_LINUX_SUN_JDK_1_7_INFO= PORT=java/linux-sun-jdk17 HOME=${LOCALBASE}/linux-sun-jdk1.7.0 \
VERSION=1.7.0 OS=linux VENDOR=sun
_JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-sun-jdk1.8.0 \
VERSION=1.7.0 OS=linux VENDOR=oracle
# Verbose description for each VENDOR
_JAVA_VENDOR_openjdk= "OpenJDK BSD Porting Team"
_JAVA_VENDOR_sun= Sun
_JAVA_VENDOR_oracle= Oracle
# Verbose description for each OS
_JAVA_OS_native= Native
@ -184,10 +187,11 @@ _JAVA_OS_linux= Linux
_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_OPENJDK_JDK_1_6
# List all JDK ports
__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \
__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_SUN_JDK_1_7 \
JAVA_PORT_LINUX_SUN_JDK_1_6
JAVA_PORT_LINUX_ORACLE_JDK_1_8 \
JAVA_PORT_LINUX_SUN_JDK_1_7
_JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \
${_JAVA_PREFERRED_PORTS} \
${__JAVA_PORTS_ALL}
@ -269,7 +273,7 @@ JAVA_RUN= jre
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
. if defined(JAVA_VERSION)
_JAVA_VERSION= ${JAVA_VERSION:S/1.5/1.6/:S/1.5+/1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7/}
_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.6 1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif