From 601e868a69a0af2106437c2ef9c82dd5ab7b9e4c Mon Sep 17 00:00:00 2001 From: Pedro Giffuni Date: Sun, 9 Oct 2011 00:00:03 +0000 Subject: i87583: FreeBSD port: ORIGIN is not supported. --- desktop/scripts/soffice.sh | 9 +++++++++ padmin/source/spadmin.sh | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index b5494f9c9727..fc7571b37c08 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -92,6 +92,15 @@ done # extend the ld_library_path for java: javaldx checks the sofficerc for us if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then + # this is a temporary hack until we can live with the default search paths + case "`uname -s`" in + FreeBSD) + 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}} + export LD_LIBRARY_PATH + ;; + esac my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh index c831ab7f0919..24b8314a5c20 100644 --- a/padmin/source/spadmin.sh +++ b/padmin/source/spadmin.sh @@ -54,6 +54,15 @@ done # extend the ld_library_path for java: javaldx checks the sofficerc for us if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then + # this is a temporary hack until we can live with the default search paths + case "`uname -s`" in + FreeBSD) + 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}} + export LD_LIBRARY_PATH + ;; + esac my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then -- cgit