From eed0bc3ebd15bf94a28ca019ab656a3a0bc0d258 Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Sun, 30 Sep 2018 15:11:24 +0300 Subject: Add support for installing binaries with DT_RPATH It's better to use DT_RPATH dynamic section of the elf binary to store the paths of libraries to load instead of overwriting LD_LIBRARY_PATH for the whole environment, causing surprises. This solution is much more transparent and perfectly suitable for running contained installations of wayland/wlroots/sway. The code unsetting the LD_LIBRARY_PATH/LD_PRELOAD was also deleted as it's a placebo security at best - we should trust the execution path that leads us to running sway, and it's way too late to care about those variables since we already started executing our compositor, thus we would be compromised anyway. --- meson_options.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index 50d646fd..2db852fc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,6 @@ option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.') -option('ld-library-path', type: 'string', value: '', description: 'The LD_LIBRARY_PATH environment variable.') +option('use_rpath', type: 'boolean', value: false, description: 'install binaries with rpath set') +option('custom_rpath', type: 'string', value: '', description: 'override rpath with a custom one') option('default-wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.') -- cgit v1.2.3