diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-04-24 18:05:21 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-04-24 18:05:21 +0000 |
| commit | d367a33745441e51331970becce36c1e06831315 (patch) | |
| tree | 596d83465be61e6908d7fb9af5e7e55045b0c6ab /Mk/bsd.java.mk | |
| parent | f1a936d9b2686954b8dd0924690582271cded821 (diff) | |
| download | ports-d367a33745441e51331970becce36c1e06831315.tar.gz ports-d367a33745441e51331970becce36c1e06831315.zip | |
- Sort Java implementations by preference, i.e., java/openjdk7 is preferred
over java/openjdk8. java/openjdk8 is still in its infancy.
- Retire redundant _JAVA_PREFERRED_PORTS hack. We only have one preferred
port since r290539 and we want to keep it that way.
Notes
Notes:
svn path=/head/; revision=352036
Diffstat (limited to 'Mk/bsd.java.mk')
| -rw-r--r-- | Mk/bsd.java.mk | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 80113da00a53..aa3805696252 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -163,16 +163,16 @@ _JAVA_VENDOR_LIST= openjdk oracle sun # 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_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_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_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-oracle-jdk1.8.0 \ + VERSION=1.8.0 OS=linux VENDOR=oracle # Verbose description for each VENDOR _JAVA_VENDOR_openjdk= "OpenJDK BSD Porting Team" @@ -183,17 +183,13 @@ _JAVA_VENDOR_sun= Sun _JAVA_OS_native= Native _JAVA_OS_linux= Linux -# Enforce preferred Java ports according to OS -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 - -# List all JDK ports -__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \ +# List all JDK ports in order of preference +__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \ JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \ - JAVA_PORT_LINUX_ORACLE_JDK_1_8 \ - JAVA_PORT_LINUX_SUN_JDK_1_7 + JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \ + JAVA_PORT_LINUX_SUN_JDK_1_7 \ + JAVA_PORT_LINUX_ORACLE_JDK_1_8 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ - ${_JAVA_PREFERRED_PORTS} \ ${__JAVA_PORTS_ALL} # Set the name of the file that indicates that a JDK is indeed installed, as a |