From caa30a7bc02a11cc3a61e90ff0872bbbcfb5e12d Mon Sep 17 00:00:00 2001 From: Boram Bae Date: Mon, 18 Jan 2021 10:28:24 +0900 Subject: [PATCH] Add rpath "/usr/lib/hal/" to sensord Change-Id: I335d9d95e5bf2f43380cb9c30973f4426a62c5cc Signed-off-by: Boram Bae --- packaging/sensord.service | 1 - src/server/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packaging/sensord.service b/packaging/sensord.service index b20dc3ac..be67d1be 100644 --- a/packaging/sensord.service +++ b/packaging/sensord.service @@ -10,7 +10,6 @@ ExecStart=/usr/bin/sensord MemoryLimit=20M Sockets=sensord.socket Nice=-5 -Environment=LD_LIBRARY_PATH=@LIBDIR@/hal [Install] WantedBy=multi-user.target diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 15503f57..656fb8f3 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -13,7 +13,7 @@ FOREACH(flag ${SERVER_PKGS_CFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE -Wl,-rpath,/usr/lib/hal/") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") INCLUDE_DIRECTORIES( -- 2.34.1