On Thu, Feb 17, 2011 at 06:40:11PM +0100, Francois Tigeot wrote:
> On Thu, Feb 17, 2011 at 05:25:06PM +0000, Michael Meeks wrote:
> >
> > Well; javaldx sets up the LD_LIBRARY_PATH for java to 'actually
> > work' It also used to be the case that without /proc mounted it would crash
> > and burn[1].
>
> > The good news is that in 3.4 we will have a totally different component
> > registration mechanism, so - we can kill that check on master
> > pre-emptively (perhaps).
Here's a patch to remove it.
--
Francois Tigeot
>From 06b267bc4d9c7df2f29afc218a587521c6ba80ec Mon Sep 17 00:00:00 2001
From: Francois Tigeot <ftig...@wolfpond.org>
Date: Fri, 18 Feb 2011 10:29:51 +0100
Subject: [PATCH] Remove javaldx /proc test.
---
solenv/bin/ooinstall | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index ba226fa..7ab12b9 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -14,8 +14,6 @@ use Cwd;
$path = '';
$do_link = 0;
-( $^O =~ /freebsd/i ) || ( $^O =~ /netbsd/i ) || ( $^O =~ /openbsd/i ) || (
$^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work
without javaldx running, which requires /proc to be mounted";
-
# Workaround for system Mozilla
if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
$ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}";
--
1.7.3.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
