From b96f3ee7cb0fb28cfd864f11171a5f31983fc9f8 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Mon, 5 Apr 2004 06:41:53 +0000 Subject: . 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 --- Mk/bsd.java.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Mk/bsd.java.mk') 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 -- cgit v1.2.3