incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1180509 - in /incubator/ooo/trunk/main: desktop/scripts/soffice.sh padmin/source/spadmin.sh
Date Sun, 09 Oct 2011 01:00:03 GMT
Author: pfg
Date: Sun Oct  9 01:00:03 2011
New Revision: 1180509

URL: http://svn.apache.org/viewvc?rev=1180509&view=rev
Log:
i87583: FreeBSD port: ORIGIN is not supported.

Modified:
    incubator/ooo/trunk/main/desktop/scripts/soffice.sh
    incubator/ooo/trunk/main/padmin/source/spadmin.sh

Modified: incubator/ooo/trunk/main/desktop/scripts/soffice.sh
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/scripts/soffice.sh?rev=1180509&r1=1180508&r2=1180509&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/scripts/soffice.sh (original)
+++ incubator/ooo/trunk/main/desktop/scripts/soffice.sh Sun Oct  9 01:00:03 2011
@@ -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

Modified: incubator/ooo/trunk/main/padmin/source/spadmin.sh
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/padmin/source/spadmin.sh?rev=1180509&r1=1180508&r2=1180509&view=diff
==============================================================================
--- incubator/ooo/trunk/main/padmin/source/spadmin.sh (original)
+++ incubator/ooo/trunk/main/padmin/source/spadmin.sh Sun Oct  9 01:00:03 2011
@@ -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



Mime
View raw message