diff options
| author | tv <tv@pkgsrc.org> | 2005-03-24 17:46:00 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-03-24 17:46:00 +0000 |
| commit | fe3c1321bf998d62a4552a591092b48ed03f7428 (patch) | |
| tree | d810c92114f578110af57e0a04897d51e7bceb57 /mk/java-vm.mk | |
| parent | 0b69fc27e289d5731e25e95b5792dd9b266a5653 (diff) | |
| download | pkgsrc-fe3c1321bf998d62a4552a591092b48ed03f7428.tar.gz | |
USE_BUILDLINK3 is no longer optional (and cannot be turned off). Per mail
to tech-pkg:
=====
* USE_BUILDLINK3=YES will be unconditional. (In fact, USE_BUILDLINK3 will
be ignored altogether by mk/; but see below.)
* NO_BUILDLINK and NO_WRAPPER will be ignored by mk/. If a build happens,
these phases will happen.
* The existing NO_BUILD will imply the previous NO_BUILDLINK and NO_WRAPPER.
If no build happens, those phases are not needed.
* NO_TOOLS will be ignored by mk/. The tools phase, which provides much
more than just the C compiler, will always happen regardless of package.
This will make metapackage builds only slightly slower, in trade for far
less user error.
Diffstat (limited to 'mk/java-vm.mk')
| -rw-r--r-- | mk/java-vm.mk | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 7afc83010da..8190471ce41 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.38 2005/02/11 16:36:49 tv Exp $ +# $NetBSD: java-vm.mk,v 1.39 2005/03/24 17:46:01 tv Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -268,8 +268,6 @@ _JAVA_HOME_DEFAULT= ${LOCALBASE}/java/wonka _JAVA_BASE_CLASSES= wre.jar SCRIPTS_ENV+= JAVAC="jikes" .endif -_JDK_DEPENDENCY?= ${BUILDLINK_DEPENDS.${_PKG_JVM}}:${_JDK_PKGSRCDIR} -_JRE_DEPENDENCY?= ${BUILDLINK_DEPENDS.${_JRE.${_PKG_JVM}}}:${_JRE_PKGSRCDIR} .if defined(_JAVA_HOME_DEFAULT) _JAVA_HOME= ${_JAVA_HOME_DEFAULT} @@ -279,12 +277,8 @@ EVAL_PREFIX+= _JAVA_HOME=${_JAVA_PKGBASE.${_PKG_JVM}} # We always need a run-time dependency on the JRE. .if defined(_JRE_PKGSRCDIR) -. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[Nn][Oo]) -. if exists(${_JRE_PKGSRCDIR}/buildlink3.mk) -. include "${_JRE_PKGSRCDIR}/buildlink3.mk" -. endif -. else -DEPENDS+= ${_JRE_DEPENDENCY} +. if exists(${_JRE_PKGSRCDIR}/buildlink3.mk) +. include "${_JRE_PKGSRCDIR}/buildlink3.mk" . endif .endif @@ -293,12 +287,8 @@ DEPENDS+= ${_JRE_DEPENDENCY} # .if empty(USE_JAVA:M[rR][uU][nN]) . if defined(_JDK_PKGSRCDIR) -. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[Nn][Oo]) -. if exists(${_JDK_PKGSRCDIR}/buildlink3.mk) -. include "${_JDK_PKGSRCDIR}/buildlink3.mk" -. endif -. else -BUILD_DEPENDS+= ${_JDK_DEPENDENCY} +. if exists(${_JDK_PKGSRCDIR}/buildlink3.mk) +. include "${_JDK_PKGSRCDIR}/buildlink3.mk" . endif . endif .endif |