diff options
| author | Ernst de Haan <znerd@FreeBSD.org> | 2002-04-26 23:39:17 +0000 |
|---|---|---|
| committer | Ernst de Haan <znerd@FreeBSD.org> | 2002-04-26 23:39:17 +0000 |
| commit | 4da77455890fbc8d5411c80d42d0584628c6e49d (patch) | |
| tree | 20edf0d0fe17f38b88139d8d09844147cfb6e95c /Mk/bsd.java.mk | |
| parent | Making pkg-plist file a bit smaller by using (diff) | |
Add support for the Sun JDK 1.2.
Also fix one NEED_JAVAC related bug/typo.
Notes
Notes:
svn path=/head/; revision=58200
Diffstat (limited to 'Mk/bsd.java.mk')
| -rw-r--r-- | Mk/bsd.java.mk | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index dba8096fb39a..e12855961f0a 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -43,6 +43,7 @@ _JAVA_HOME_FREEBSD_1_1= ${LOCALBASE}/jdk1.1.8 _JAVA_HOME_FREEBSD_1_2= ${LOCALBASE}/jdk1.2.2 _JAVA_HOME_FREEBSD_1_3= ${LOCALBASE}/jdk1.3.1 _JAVA_HOME_BLACKDOWN_LINUX_1_2= ${LOCALBASE}/linux-jdk1.2.2 +_JAVA_HOME_SUN_LINUX_1_2= ${LOCALBASE}/linux-sun-jdk1.2.2.011 _JAVA_HOME_IBM_LINUX_1_3= ${LOCALBASE}/linux-ibm-jdk1.3.1 _JAVA_HOME_SUN_LINUX_1_3= ${LOCALBASE}/linux-jdk1.3.1 _JAVA_HOME_SUN_LINUX_1_4= ${LOCALBASE}/linux-jdk1.4.0 @@ -52,6 +53,7 @@ _JAVA_PORT_FREEBSD_1_1= java/jdk _JAVA_PORT_FREEBSD_1_2= java/jdk12-beta _JAVA_PORT_FREEBSD_1_3= java/jdk13 _JAVA_PORT_BLACKDOWN_LINUX_1_2= java/linux-jdk +_JAVA_PORT_SUN_LINUX_1_2= java/linux-sun-jdk12 _JAVA_PORT_IBM_LINUX_1_3= java/linux-ibm-jdk13 _JAVA_PORT_SUN_LINUX_1_3= java/linux-jdk13 _JAVA_PORT_SUN_LINUX_1_4= java/linux-jdk14 @@ -83,6 +85,8 @@ JAVA_PORT= ${_JAVA_PORT_FREEBSD_1_2} JAVA_PORT= ${_JAVA_PORT_FREEBSD_1_3} . elif ${_JAVA_HOME} == ${_JAVA_HOME_BLACKDOWN_LINUX_1_2} JAVA_PORT= ${_JAVA_PORT_BLACKDOWN_LINUX_1_2} +. elif ${_JAVA_HOME} == ${_JAVA_HOME_SUN_LINUX_1_2} +JAVA_PORT= ${_JAVA_PORT_SUN_LINUX_1_2} . elif ${_JAVA_HOME} == ${_JAVA_HOME_IBM_LINUX_1_3} JAVA_PORT= ${_JAVA_PORT_IBM_LINUX_1_3} . elif ${_JAVA_HOME} == ${_JAVA_HOME_SUN_LINUX_1_3} @@ -130,7 +134,8 @@ JAVA_HOME= ${_JAVA_HOME} exists(${_JAVA_HOME_IBM_LINUX_1_3}/${_JDK_FILE}) USE_JAVA= 1.3 . elif exists(${_JAVA_HOME_FREEBSD_1_2}/${_JDK_FILE}) || \ - exists(${_JAVA_HOME_BLACKDOWN_LINUX_1_2}/${_JDK_FILE}) + exists(${_JAVA_HOME_BLACKDOWN_LINUX_1_2}/${_JDK_FILE}) || \ + exists(${_JAVA_HOME_SUN_LINUX_1_2}/${_JDK_FILE}) USE_JAVA= 1.2 . elif !exists(${_JAVA_HOME_SUN_LINUX_1_4}/${_JDK_FILE}) USE_JAVA= 1.1 @@ -187,9 +192,13 @@ JAVA_PORT= ${_JAVA_PORT_FREEBSD_1_1} # (1) JDK 1.2.2 for FreeBSD # (2) Blackdown JDK 1.2.2 for Linux # -# If the Blackdown JDK 1.2.2 is installed, but the FreeBSD JDK 1.2.2 is *not* -# installed, then the Blackdown JDK will be used as the dependency. Otherwise -# the FreeBSD JDK 1.2.2 will be used as the dependency. +# If either the Blackdown or Sun JDK 1.2.2 (both for Linux) is installed, but +# the FreeBSD JDK 1.2.2 is *not* installed, then the installed Linux JDK will +# be used as the dependency. Otherwise the FreeBSD JDK 1.2.2 will be used as +# the dependency. +# +# The FreeBSD JDK 1.2 is preferred over the Linux JDK's. Among these, the +# Blackdown JDK is preferred over the Sun JDK. . elif ${USE_JAVA} == "1.2" . if exists(${_JAVA_HOME_BLACKDOWN_LINUX_1_2}/${_JDK_FILE}) \ && !exists(${_JAVA_HOME_FREEBSD_1_2}/${_JDK_FILE}) @@ -198,6 +207,13 @@ JAVA_VER= 1.2.2 JAVA_OS= Linux JAVA_HOME= ${_JAVA_HOME_BLACKDOWN_LINUX_1_2} JAVA_PORT= ${_JAVA_PORT_BLACKDOWN_LINUX_1_2} +. elif exists(${_JAVA_HOME_SUN_LINUX_1_2}/${_JDK_FILE}) \ + && !exists(${_JAVA_HOME_FREEBSD_1_2}/${_JDK_FILE}) +JAVA_VENDOR= Sun +JAVA_VER= 1.2.2 +JAVA_OS= Linux +JAVA_HOME= ${_JAVA_HOME_SUN_LINUX_1_2} +JAVA_PORT= ${_JAVA_PORT_SUN_LINUX_1_2} . else JAVA_VENDOR= FreeBSD JAVA_VER= 1.2.2 @@ -278,7 +294,7 @@ JAVA_PORT= ${_JAVA_PORT_SUN_LINUX_1_4} NEED_JAVAC= YES . endif -. if (${JAVAC} == "YES") || (${NEED_JAVAC} == "yes") +. if (${NEED_JAVAC} == "YES") || (${NEED_JAVAC} == "yes") . if defined(USE_JIKES) . if (${USE_JIKES} == "YES") || (${USE_JIKES} == "yes") JAVAC= ${_JIKES_PATH} |