summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2007-02-18 16:25:54 +0000
committertv <tv@pkgsrc.org>2007-02-18 16:25:54 +0000
commit6460221db69455b95585672171ad474907216525 (patch)
tree2c066cf2e6ef4e2106c4729884e899fc6a43c938
parentca859064c6398922a4e777b99be0d9170b053c7c (diff)
downloadpkgsrc-6460221db69455b95585672171ad474907216525.tar.gz
Add JAVA_LD_LIBRARY_PATH, which is needed by the upcoming sun-jre6.
-rw-r--r--mk/java-env.mk11
1 files changed, 10 insertions, 1 deletions
diff --git a/mk/java-env.mk b/mk/java-env.mk
index e4d2e9907f7..e4c9e2d59e1 100644
--- a/mk/java-env.mk
+++ b/mk/java-env.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-env.mk,v 1.8 2006/05/16 21:25:38 rillig Exp $
+# $NetBSD: java-env.mk,v 1.9 2007/02/18 16:25:54 tv Exp $
#
# This Makefile fragment handles Java wrappers and is meant to be included
# by packages that provide a Java build-time and/or run-time environment.
@@ -9,6 +9,10 @@
# JAVA_CLASSPATH Classpath that will be prepended on all invocations
# to this implementation. Optional.
#
+# JAVA_LD_LIBRARY_PATH
+# Value to prepend to LD_LIBRARY_PATH before running
+# the real command. Optional; use *only* if necessary.
+#
# JAVA_HOME Path to the directory holding the Java implementation.
# Required.
#
@@ -32,6 +36,7 @@ JAVA_ENV_MK= # defined
JAVA_NAME?= # undefined
JAVA_HOME?= # undefined
JAVA_CLASSPATH?= # empty
+JAVA_LD_LIBRARY_PATH?= # empty
JAVA_UNLIMIT?= # empty
JAVA_WRAPPERS?= # empty
@@ -67,6 +72,10 @@ ${WRKDIR}/${w}:
@${ECHO} 'CLASSPATH=${JAVA_CLASSPATH}:$${CLASSPATH}; export CLASSPATH' \
>>${WRKDIR}/${w}
. endif
+. if !empty(JAVA_LD_LIBRARY_PATH)
+ @${ECHO} 'LD_LIBRARY_PATH=${JAVA_LD_LIBRARY_PATH}$${LD_LIBRARY_PATH:+:}$${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH' \
+ >>${WRKDIR}/${w}
+. endif
. for f in ${JAVA_UNLIMIT}
@${ECHO} '${ULIMIT_CMD_${f}}' >>${WRKDIR}/${w}
. endfor