diff options
| author | Robert Nagy <robert@openbsd.org> | 2010-11-15 16:00:48 +0100 |
|---|---|---|
| committer | Robert Nagy <robert@openbsd.org> | 2010-11-15 16:03:28 +0100 |
| commit | d057fa480802acf86485b4c5e36a4dc0676b2439 (patch) | |
| tree | 18c8b21887c9213e07c093702193654b862cd4a9 | |
| parent | 2ec330de0b0bffe24a1908ef2a5005582fa4cdf8 (diff) | |
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.
| -rw-r--r-- | desktop/scripts/soffice.sh | 14 | ||||
| -rw-r--r-- | desktop/scripts/unopkg.sh | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 0aee9c667e..1f1ad3ef37 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -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 $@ diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 6adedda901..07133856b8 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -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 $@ |