Re: USE_TOOLS (or equal) for java?

["OBATA Akio" <obache%users.sourceforge.net@localhost>]

On Wed, 30 Sep 2009 16:59:41 +0900, Fredrik Pettai <pettai%nordu.net@localhost> 
wrote:

> On Sep 30, 2009, at 9:52 AM, OBATA Akio wrote:
>> On Wed, 30 Sep 2009 16:40:51 +0900, Fredrik Pettai
>> <pettai%nordu.net@localhost> wrote:
>>
>>> Will you get that patch commited to pkgsrc-current?
>>
>> Maybe, after feature freeze for 2009Q3.
>> (If I forget, please build a fire under me:)
>
> I can file a PR, then it won't be forgotten.

Take 2.
Change build-time dependency on JDK to JRE.

Index: mk/java-vm.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/java-vm.mk,v
retrieving revision 1.69
diff -u -r1.69 java-vm.mk
--- mk/java-vm.mk       5 Jun 2009 16:00:47 -0000       1.69
+++ mk/java-vm.mk       13 Oct 2009 02:57:56 -0000
@@ -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
@@ -305,9 +307,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
@@ -315,7 +321,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"


-- 
"Of course I love NetBSD":-)
OBATA Akio / obache%users.sourceforge.net@localhost

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
pkgsrc-wip-discuss mailing list
pkgsrc-wip-discuss%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-discuss