mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1050 from Hummer12007/cmake

Browse source 
Unset LD_LIBRARY_PATH, unless specified
This commit is contained in:
Drew DeVault 2017-01-16 13:24:26 -05:00 • committed by GitHub
commit 2047bb81dc
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -47,9 +47,11 @@ option(enable-swaymsg "Enables the swaymsg utility" YES)
option(enable-gdk-pixbuf "Use Pixbuf to support more image formats" YES) option(enable-gdk-pixbuf "Use Pixbuf to support more image formats" YES)
option(zsh-completions "Zsh shell completions" NO) option(zsh-completions "Zsh shell completions" NO)
option(default-wallpaper "Installs the default wallpaper" YES) option(default-wallpaper "Installs the default wallpaper" YES)
set(LD_LIBRARY_PATH "/usr/lib" CACHE STRING "Configures sway's default LD_LIBRARY_PATH") option(LD_LIBRARY_PATH "Configure sway's default LD_LIBRARY_PATH")
if (LD_LIBRARY_PATH)
add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}") add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}")
endif()
find_package(JsonC REQUIRED) find_package(JsonC REQUIRED)
find_package(PCRE REQUIRED) find_package(PCRE REQUIRED)

4
sway/main.c
View file

@ -214,7 +214,11 @@ int main(int argc, char **argv) {
// Security: // Security:
unsetenv("LD_PRELOAD"); unsetenv("LD_PRELOAD");
#ifdef _LD_LIBRARY_PATH
setenv("LD_LIBRARY_PATH", _LD_LIBRARY_PATH, 1); setenv("LD_LIBRARY_PATH", _LD_LIBRARY_PATH, 1);
#else
unsetenv("LD_LIBRARY_PATH");
#endif
int c; int c;
while (1) { while (1) {