diff options
| author | mrauch <mrauch@pkgsrc.org> | 2005-10-03 15:53:34 +0000 |
|---|---|---|
| committer | mrauch <mrauch@pkgsrc.org> | 2005-10-03 15:53:34 +0000 |
| commit | e81f8a44224826813816a95867970db8c158a04b (patch) | |
| tree | 3e956737454b0f233f8fd10601471b9e225a8b89 | |
| parent | c9c085d3a726dbf05f2e5d39545660bdd952c4f7 (diff) | |
| download | pkgsrc-e81f8a44224826813816a95867970db8c158a04b.tar.gz | |
Add the pkgsrc library path to LD_LIBRARY_PATH so shared libraries from
other packages which are loaded during runtime via dlopen() can be found.
This is necessary for fixing PR pkg/30473.
| -rwxr-xr-x | misc/openoffice-bin/files/soffice | 6 | ||||
| -rwxr-xr-x | misc/openoffice/files/soffice | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/misc/openoffice-bin/files/soffice b/misc/openoffice-bin/files/soffice index 8295480eb57..b1ad5950735 100755 --- a/misc/openoffice-bin/files/soffice +++ b/misc/openoffice-bin/files/soffice @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: soffice,v 1.2 2005/02/26 01:22:16 dmcmahill Exp $ +# $NetBSD: soffice,v 1.3 2005/10/03 15:53:34 mrauch Exp $ # SOINST=@@PREFIX@@/OpenOffice.org@@OO_VER@@ [ "X$SOFFICE" = "X" ] && SOFFICE=$HOME/OpenOffice.org@@OO_VER@@ @@ -62,4 +62,8 @@ PTHREAD_DIAGASSERT=AEL export PTHREAD_DIAGASSERT fi +# Let the standard pkgsrc libraries be found by dlopen() +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@@PREFIX@@/lib +export LD_LIBRARY_PATH + exec ${SOFFICE}/soffice "$@" diff --git a/misc/openoffice/files/soffice b/misc/openoffice/files/soffice index fde43d8440a..928949b2d65 100755 --- a/misc/openoffice/files/soffice +++ b/misc/openoffice/files/soffice @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: soffice,v 1.5 2005/01/06 15:52:20 mrauch Exp $ +# $NetBSD: soffice,v 1.6 2005/10/03 15:53:34 mrauch Exp $ # SOINST=@@PREFIX@@/@@OPENOFFICE_VERSION@@ [ "$SOFFICE" = "" ] && SOFFICE=$HOME/@@OPENOFFICE_VERSION@@ @@ -50,4 +50,8 @@ PTHREAD_DIAGASSERT=AEL export PTHREAD_DIAGASSERT fi +# Let the standard pkgsrc libraries be found by dlopen() +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@@PREFIX@@/lib +export LD_LIBRARY_PATH + exec ${SOFFICE}/soffice "$@" |