isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-11 00:26:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

mutter-launch: make sure that the spawned binaries sees the right libraries

Browse Source 
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
This commit is contained in:
Giovanni Campagna 2013-08-19 15:02:45 +02:00
parent 2d27873f98
commit 1c34f0b342
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -251,7 +251,7 @@ bin_PROGRAMS+=mutter-launch
mutter_launch_SOURCES = wayland/weston-launch.c wayland/weston-launch.h 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 mutter_launch_LDFLAGS = $(MUTTER_LAUNCH_LIBS) -lpam
install-exec-hook: install-exec-hook:

2
src/wayland/weston-launch.c
View File

@ -433,7 +433,7 @@ launch_compositor(struct weston_launch *wl, int argc, char *argv[])
setenv_fd("WESTON_TTY_FD", wl->tty); setenv_fd("WESTON_TTY_FD", wl->tty);
setenv_fd("WESTON_LAUNCHER_SOCK", wl->sock[1]); setenv_fd("WESTON_LAUNCHER_SOCK", wl->sock[1]);
setenv("LD_LIBRARY_PATH", LIBDIR, 1);
unsetenv("DISPLAY"); unsetenv("DISPLAY");
/* Do not give our signal mask to the new process. */ /* Do not give our signal mask to the new process. */