- Sync with 1.68
This commit is contained in:
parent
97ad987a54
commit
f501e41dde
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=147165
2 changed files with 10 additions and 0 deletions
|
@ -442,6 +442,11 @@ 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
|
||||
# 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"
|
||||
USE_JIKES?= NO
|
||||
. endif
|
||||
# First test if USE_JIKES has a valid value
|
||||
. if defined(USE_JIKES) && !(${USE_JIKES:U} == "YES") && !(${USE_JIKES:U} == "NO")
|
||||
check-makevars::
|
||||
|
|
|
@ -442,6 +442,11 @@ 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
|
||||
# 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"
|
||||
USE_JIKES?= NO
|
||||
. endif
|
||||
# First test if USE_JIKES has a valid value
|
||||
. if defined(USE_JIKES) && !(${USE_JIKES:U} == "YES") && !(${USE_JIKES:U} == "NO")
|
||||
check-makevars::
|
||||
|
|
Loading…
Reference in a new issue