[pkgsrc/trunk]: pkgsrc/mk Allow USE_JAVA=build (build dependency on jre).

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e5f4050f4402
branches:  trunk
changeset: 400444:e5f4050f4402
user:      obache <obache%pkgsrc.org@localhost>
date:      Tue Oct 20 02:33:01 2009 +0000

description:
Allow USE_JAVA=build (build dependency on jre).

diffstat:

 mk/java-vm.mk |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r d5644649e457 -r e5f4050f4402 mk/java-vm.mk
--- a/mk/java-vm.mk     Tue Oct 20 01:51:22 2009 +0000
+++ b/mk/java-vm.mk     Tue Oct 20 02:33:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.70 2009/10/14 13:20:05 wiz Exp $
+# $NetBSD: java-vm.mk,v 1.71 2009/10/20 02:33:01 obache Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -16,10 +16,12 @@
 # Package-settable variables:
 #
 # USE_JAVA
-#      When set to "yes", a build-time dependency on the JDK is added.
+#      When set to "yes", a build-time dependency on the JDK and
+#                         a run-time dependency on the JRE are added.
 #      When set to "run", a run-time dependency on the JRE is added.
+#      When set to "build", a build-time dependency on the JRE is added.
 #
-#      Possible values: yes run
+#      Possible values: yes run build
 #      Default value: yes
 #
 # USE_JAVA2
@@ -317,9 +319,13 @@
 EVAL_PREFIX+=          _JAVA_HOME=${_JAVA_PKGBASE.${_PKG_JVM}}
 .endif
 
-# We always need a run-time dependency on the JRE.
+# If we are not using Java for building, then we need a run-time dependency on
+# the JRE, otherwise, build-time dependency on the JRE.
 .if defined(_JRE_PKGSRCDIR)
 .  if exists(${_JRE_PKGSRCDIR}/buildlink3.mk)
+.    if !empty(USE_JAVA:M[bB][uU][iI][lL][dD])
+BUILDLINK_DEPMETHOD.${_JRE.${_PKG_JVM}}=       build
+.    endif
 .    include "${_JRE_PKGSRCDIR}/buildlink3.mk"
 .  endif
 .endif
@@ -327,7 +333,7 @@
 # If we are building Java software, then we need a build-time dependency on
 # the JDK.
 #
-.if empty(USE_JAVA:M[rR][uU][nN])
+.if !empty(USE_JAVA:M[yE][eE][sS])
 .  if defined(_JDK_PKGSRCDIR)
 .    if exists(${_JDK_PKGSRCDIR}/buildlink3.mk)
 .      include "${_JDK_PKGSRCDIR}/buildlink3.mk"