Kaydet (Commit) 8db53bfd authored tarafından Thomas Klausner's avatar Thomas Klausner Kaydeden (comit) Thomas Klausner

Fix "javaPathHelper: not found" errors during startup.

javaPathHelper is a tool from OpenBSD ports, so there is no point
looking for it on other operating systems.

Change-Id: I763d717fdf7172b412d527fcd88347b2e54a8fe9
üst a777e447
......@@ -141,7 +141,7 @@ if echo "$checks" | grep -q "cc" ; then
fi
case "$(uname -s)" in
NetBSD|OpenBSD|DragonFly)
OpenBSD)
# this is a temporary hack until we can live with the default search paths
LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
......@@ -150,6 +150,11 @@ NetBSD|OpenBSD|DragonFly)
export JAVA_HOME
fi
;;
NetBSD|DragonFly)
# this is a temporary hack until we can live with the default search paths
LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
export LD_LIBRARY_PATH
;;
AIX)
LIBPATH="$sd_prog${LIBPATH:+:$LIBPATH}"
export LIBPATH
......
......@@ -37,7 +37,7 @@ cd "$sd_cwd" || exit $?
# this is a temporary hack until we can live with the default search paths
case "$(uname -s)" in
NetBSD|OpenBSD|FreeBSD|DragonFly)
OpenBSD)
LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH
......@@ -45,6 +45,10 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
export JAVA_HOME
fi
;;
NetBSD|FreeBSD|DragonFly)
LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
export LD_LIBRARY_PATH
;;
AIX)
LIBPATH="$sd_prog${LIBPATH:+:${LIBPATH}}"
export LIBPATH
......
......@@ -35,7 +35,7 @@ cd "$sd_cwd"
# this is a temporary hack until we can live with the default search paths
case "$(uname -s)" in
NetBSD|OpenBSD|FreeBSD|DragonFly)
OpenBSD)
LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH
......@@ -43,6 +43,10 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
export JAVA_HOME
fi
;;
NetBSD|FreeBSD|DragonFly)
LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
export LD_LIBRARY_PATH
;;
AIX)
LIBPATH=$sd_prog${LIBPATH:+:${LIBPATH}}
export LIBPATH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment