Set LD_LIBRARY_PATH+JAVA_HOME on OpenBSD.
OpenBSD does not support $ORIGIN so we have to set LD_LIBRARY_PATH in order to find the shared libs of libreoffice. We also set JAVA_HOME here because it's path is outside of the default ones. NetBSD can probably use this too.
This commit is contained in:
parent
dfd74e58ef
commit
b02ec347aa
2 changed files with 28 additions and 0 deletions
|
@ -62,6 +62,20 @@ fi
|
|||
|
||||
sd_binary=`basename "$0"`.bin
|
||||
|
||||
# this is a temporary hack until we can live with the default search paths
|
||||
case "`uname -s`" in
|
||||
OpenBSD)
|
||||
sd_prog1="$sd_prog/../basis-link/program"
|
||||
sd_prog2="$sd_prog/../basis-link/ure-link/lib"
|
||||
LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
|
||||
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
|
||||
export LD_LIBRARY_PATH
|
||||
if [ -n "${JAVA_HOME}" ]; then
|
||||
export JAVA_HOME
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
#collect all bootstrap variables specified on the command line
|
||||
#so that they can be passed as arguments to javaldx later on
|
||||
for arg in $@
|
||||
|
|
|
@ -43,6 +43,20 @@ fi
|
|||
sd_prog=`pwd`
|
||||
cd "$sd_cwd"
|
||||
|
||||
# this is a temporary hack until we can live with the default search paths
|
||||
case "`uname -s`" in
|
||||
OpenBSD)
|
||||
sd_prog1="$sd_prog/../basis-link/program"
|
||||
sd_prog2="$sd_prog/../basis-link/ure-link/lib"
|
||||
LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
|
||||
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
|
||||
export LD_LIBRARY_PATH
|
||||
if [ -n "${JAVA_HOME}" ]; then
|
||||
export JAVA_HOME
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
#collect all bootstrap variables specified on the command line
|
||||
#so that they can be passed as arguments to javaldx later on
|
||||
for arg in $@
|
||||
|
|
Loading…
Reference in a new issue