Add rpath "/usr/lib/hal/" to sensord

Change-Id: I335d9d95e5bf2f43380cb9c30973f4426a62c5cc
Signed-off-by: Boram Bae <boram21.bae@samsung.com>

diff --git a/packaging/sensord.service b/packaging/sensord.service
index b20dc3ac741685457fb2ef5953a072f47e53b44a..be67d1bee5ae131f5edd98b4863079a70b41b732 100644 (file)
--- 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 15503f57ead6c543e3d9c4f830b13ea68ae45fda..656fb8f373902ac41125294922a7ccfb822c6a98 100644 (file)
--- 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(