diff options
| author | glewis <glewis@FreeBSD.org> | 2004-04-05 14:41:53 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2004-04-05 14:41:53 +0800 |
| commit | 6a954dbfe8d5e26a9078560d15cfcbbdb8db6f3e (patch) | |
| tree | 53c2737fd180937ba935b26aed0482f507980c50 | |
| parent | ad479986a15b21c85be1dd4fca2149d6ca49e4e2 (diff) | |
| download | freebsd-ports-gnome-6a954dbfe8d5e26a9078560d15cfcbbdb8db6f3e.tar.gz freebsd-ports-gnome-6a954dbfe8d5e26a9078560d15cfcbbdb8db6f3e.tar.zst freebsd-ports-gnome-6a954dbfe8d5e26a9078560d15cfcbbdb8db6f3e.zip | |
. Allow ports to defined JAVA_EXTRACT when they want an explicit
EXTRACT_DEPENDS for java (and not necessarily a BUILD_DEPENDS or
RUN_DEPENDS).
Result of a problem report from: kris
| -rw-r--r-- | Mk/bsd.java.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index a555c443c5fa..8fa3e022a865 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -493,7 +493,9 @@ RUN_DEPENDS+= ${_DEPEND_JIKES} @${FALSE} . endif _DEPEND_JAVA= ${JAVA}:${PORTSDIR}/${JAVA_PORT} -. if !defined(JAVA_BUILD) && !defined(JAVA_RUN) +. if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN) +# In general, an EXTRACT_DEPENDS on java is not wanted, so only +# automatically set up BUILD_DEPENDS and RUN_DEPENDS . if !defined(NO_BUILD_DEPENDS_JAVA) && !defined(NO_BUILD) BUILD_DEPENDS+= ${_DEPEND_JAVA} . endif @@ -501,6 +503,9 @@ BUILD_DEPENDS+= ${_DEPEND_JAVA} RUN_DEPENDS+= ${_DEPEND_JAVA} . endif . else +. if defined(JAVA_EXTRACT) +EXTRACT_DEPENDS+= ${_DEPEND_JAVA} +. endif . if defined(JAVA_BUILD) BUILD_DEPENDS+= ${_DEPEND_JAVA} . endif |