. 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
This commit is contained in:
parent
09c8828884
commit
b96f3ee7cb
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=106211
1 changed files with 6 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue