diff options
| author | Giovanni Campagna <gcampagn@redhat.com> | 2013-08-19 15:02:45 +0200 |
|---|---|---|
| committer | Giovanni Campagna <gcampagn@redhat.com> | 2013-08-28 11:12:30 +0200 |
| commit | b1e758b34192aee3be44f43415ffde5eae66a9d2 (patch) | |
| tree | 37c2c877834482e7900362942c12e4240b5d009b | |
| parent | 96753bb70326ebf043eb44a11647aab62d86e288 (diff) | |
| download | mutter-b1e758b34192aee3be44f43415ffde5eae66a9d2.tar.gz | |
mutter-launch: make sure that the spawned binaries sees the right libraries
Being a setuid binary, our LD_LIBRARY_PATH is cleared by glibc at
startup, but we need the spawned binary to see it, otherwise
jhbuild doesn't work, so hardcode it using the configured libdir.
https://bugzilla.gnome.org/show_bug.cgi?id=705861
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/wayland/weston-launch.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f747bf722..4fc7c5820 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -251,7 +251,7 @@ bin_PROGRAMS+=mutter-launch mutter_launch_SOURCES = wayland/weston-launch.c wayland/weston-launch.h -mutter_launch_CFLAGS = $(MUTTER_LAUNCH_CFLAGS) +mutter_launch_CFLAGS = $(MUTTER_LAUNCH_CFLAGS) -DLIBDIR=\"$(libdir)\" mutter_launch_LDFLAGS = $(MUTTER_LAUNCH_LIBS) -lpam install-exec-hook: diff --git a/src/wayland/weston-launch.c b/src/wayland/weston-launch.c index 9a070fa13..8e6587d97 100644 --- a/src/wayland/weston-launch.c +++ b/src/wayland/weston-launch.c @@ -433,7 +433,7 @@ launch_compositor(struct weston_launch *wl, int argc, char *argv[]) setenv_fd("WESTON_TTY_FD", wl->tty); setenv_fd("WESTON_LAUNCHER_SOCK", wl->sock[1]); - + setenv("LD_LIBRARY_PATH", LIBDIR, 1); unsetenv("DISPLAY"); /* Do not give our signal mask to the new process. */ |