diff options
| author | hq <hq@FreeBSD.org> | 2004-11-29 17:33:41 +0000 |
|---|---|---|
| committer | hq <hq@FreeBSD.org> | 2004-11-29 17:33:41 +0000 |
| commit | f07c358a7ffdf25f32a50c1a26bf3a5a682af667 (patch) | |
| tree | d211cee55d78c1cd4233e3e891e587cc52f7943c /Mk | |
| parent | 194781c5df5324ed80bc2787054ebce444882fa3 (diff) | |
| download | FreeBSD-ports-f07c358a7ffdf25f32a50c1a26bf3a5a682af667.zip FreeBSD-ports-f07c358a7ffdf25f32a50c1a26bf3a5a682af667.tar.gz | |
When USE_ANT is defined, JAVA_BUILD is automatically set to 'jdk' but this
conflicts with the default values for JAVA_BUILD and JAVA_RUN. Those variables
are indeed set a default value when none of the them (together with
JAVA_EXTRACT) is defined. Having USE_ANT set a value for JAVA_BUILD will cause
JAVA_RUN not to be set its default value.
This has RUN_DEPENDS not correctly set (missing the JDK entry) on many ports
that use USE_ANT.
This patch addresses this issue by moving the statements dealing with default
values to have them executed before USE_ANT handling.
Approved by: glewis (co-maintainer)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.java.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index a1641a4..dccdc3b 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -330,6 +330,16 @@ check-makevars:: @${FALSE} . endif +# Set default values for JAVA_BUILD and JAVA_RUN +# When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre +# (unless NO_BUILD is set) +. if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN) +. if !defined(NO_BUILD) +JAVA_BUILD= jdk +. endif +JAVA_RUN= jre +. endif + # JDK dependency setting . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE @@ -444,14 +454,6 @@ JAVA_BUILD= jdk # Add the JDK port to the dependencies DEPEND_JAVA= ${JAVA}:${PORTSDIR}/${JAVA_PORT} -# When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre -# (unless NO_BUILD is set) -. if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN) -. if !defined(NO_BUILD) -JAVA_BUILD= jdk -. endif -JAVA_RUN= jre -. endif . if defined(JAVA_EXTRACT) EXTRACT_DEPENDS+= ${DEPEND_JAVA} . endif |
