Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Add JAVA_LD_LIBRARY_PATH, which is needed by the upcoming sun-jre6.

  • Loading branch information...
commit cb215197428b425c0fe21f3fb13bc0b8ba727fff 1 parent 51171b7
tv authored

Showing 1 changed file with 10 additions and 1 deletion. Show diff stats Hide diff stats

  1. +10 1 mk/java-env.mk
11 mk/java-env.mk
... ... @@ -1,4 +1,4 @@
1   -# $NetBSD: java-env.mk,v 1.8 2006/05/16 21:25:38 rillig Exp $
  1 +# $NetBSD: java-env.mk,v 1.9 2007/02/18 16:25:54 tv Exp $
2 2 #
3 3 # This Makefile fragment handles Java wrappers and is meant to be included
4 4 # by packages that provide a Java build-time and/or run-time environment.
@@ -9,6 +9,10 @@
9 9 # JAVA_CLASSPATH Classpath that will be prepended on all invocations
10 10 # to this implementation. Optional.
11 11 #
  12 +# JAVA_LD_LIBRARY_PATH
  13 +# Value to prepend to LD_LIBRARY_PATH before running
  14 +# the real command. Optional; use *only* if necessary.
  15 +#
12 16 # JAVA_HOME Path to the directory holding the Java implementation.
13 17 # Required.
14 18 #
@@ -32,6 +36,7 @@ JAVA_ENV_MK= # defined
32 36 JAVA_NAME?= # undefined
33 37 JAVA_HOME?= # undefined
34 38 JAVA_CLASSPATH?= # empty
  39 +JAVA_LD_LIBRARY_PATH?= # empty
35 40 JAVA_UNLIMIT?= # empty
36 41 JAVA_WRAPPERS?= # empty
37 42
@@ -67,6 +72,10 @@ ${WRKDIR}/${w}:
67 72 @${ECHO} 'CLASSPATH=${JAVA_CLASSPATH}:$${CLASSPATH}; export CLASSPATH' \
68 73 >>${WRKDIR}/${w}
69 74 . endif
  75 +. if !empty(JAVA_LD_LIBRARY_PATH)
  76 + @${ECHO} 'LD_LIBRARY_PATH=${JAVA_LD_LIBRARY_PATH}$${LD_LIBRARY_PATH:+:}$${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH' \
  77 + >>${WRKDIR}/${w}
  78 +. endif
70 79 . for f in ${JAVA_UNLIMIT}
71 80 @${ECHO} '${ULIMIT_CMD_${f}}' >>${WRKDIR}/${w}
72 81 . endfor

0 comments on commit cb21519

Please sign in to comment.
Something went wrong with that request. Please try again.