From 8923afb64f022e5668404e02bc9af376dd27f8d7 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 30 Oct 2011 19:49:42 +0100 Subject: [PATCH] Force using of LLs prebuild ssl libs. This is necesary or webit will use the system versions. Linux only. --- indra/newview/linux_tools/wrapper.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index e09dc1edc0..63f28c5d18 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -121,6 +121,20 @@ export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-firestorm-bin' # AO: experimentally removing to allow --settings on the command line w/o error. FIRE-1031 #export SL_OPT="`cat etc/gridargs.dat` $@" +# [blerg] set LD_PRELOAD so plugins will pick up the correct sll libs, otherwise they will pick up the system versions. +LLCRYPTO="`pwd`/lib/libcrypto.so.1.0.0" +LLSSL="`pwd`/lib/libssl.so.1.0.0" +if [ -f ${LLCRYPTO} ] +then + export LD_PRELOAD="${LD_PRELOAD}:${LLCRYPTO}" +fi +if [ -f ${LLSSL} ] +then + export LD_PRELOAD="${LD_PRELOAD}:${LLSSL}" +fi +# End of hack; God will kill a kitten for this :( + + # Run the program eval ${SL_ENV} ${SL_CMD} $@ ${SL_OPT} || LL_RUN_ERR=runerr