kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

. Enforce NO_JIKES when 1.6 is required as well.

Browse source
This commit is contained in:
Greg Lewis 2007-08-05 21:19:47 +00:00
parent ba60481e73
commit 0ae458e9c4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=197151
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mk/bsd.java.mk
View file

@ -394,9 +394,10 @@ JAVA_PORT_OS_DESCRIPTION:= ${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/}
. undef HAVE_JIKES
# Enforce USE_JIKES=NO if not defined and using Java 1.5
# Enforce USE_JIKES=NO if not defined and using Java 1.5+
# XXX: This is a temporary fix to be removed when Jikes supports Java 1.5
. if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5"
. if (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5") || \
(${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.6")
USE_JIKES?= NO
. endif
# First test if USE_JIKES has a valid value