summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordyamy-lee <dyamy.lee@samsung.com>2021-03-22 17:53:26 +0900
committerdyamy-lee <dyamy.lee@samsung.com>2021-03-22 17:53:26 +0900
commit3711c999b6570077f855f50fb5308b599b6f633c (patch)
treeb4fc01de0de442d1a2280d579383783e154c1e38
parent49d4b7ead3b16ee629fc6b89c99d7e6369f95e9c (diff)
downloadfirmware-update-system-ui-3711c999b6570077f855f50fb5308b599b6f633c.tar.gz
firmware-update-system-ui-3711c999b6570077f855f50fb5308b599b6f633c.tar.bz2
firmware-update-system-ui-3711c999b6570077f855f50fb5308b599b6f633c.zip
list.in file can't figure out RPM macro. It must be changed as define macro which used in CMake. If using %{_hal_libdir}, it already applied /hal/lib or /hal/lib64. Change-Id: I6ae78fa7c517e681f4a5097877ea756262b64004
-rw-r--r--42-tota-gui-common.list.in4
-rw-r--r--CMakeLists.txt2
-rw-r--r--packaging/firmware-update-system-ui.spec2
3 files changed, 4 insertions, 4 deletions
diff --git a/42-tota-gui-common.list.in b/42-tota-gui-common.list.in
index b810ce9..6fbd57e 100644
--- a/42-tota-gui-common.list.in
+++ b/42-tota-gui-common.list.in
@@ -121,6 +121,6 @@ VERBATIMS="
WITHLIBS="
/usr/bin/fota_gui
/usr/bin/system-recovery_gui
-%{_hal_libdir}/hal/lib/libhal-backend-tdm.so
-%{_hal_libdir}/hal/lib/libhal-backend-tbm.so
+@SYSTEM_HAL_LIBDIR@/libhal-backend-tdm.so
+@SYSTEM_HAL_LIBDIR@/libhal-backend-tbm.so
"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2aabe9..59c2d0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ STRING(FIND ${CMAKE_C_FLAGS} "mhard-float" IFFOUND2)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/)
-SET(SYSTEM_RECOVERY_LIBDIR ${LIBDIR})
+SET(SYSTEM_HAL_LIBDIR ${HAL_LIBDIR})
SET(PACKAGE ${PROJECT_NAME})
SET(PKGNAME "${PACKAGE}")
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
diff --git a/packaging/firmware-update-system-ui.spec b/packaging/firmware-update-system-ui.spec
index c3b3238..fb85c03 100644
--- a/packaging/firmware-update-system-ui.spec
+++ b/packaging/firmware-update-system-ui.spec
@@ -46,7 +46,7 @@ export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
LDFLAGS="$LDFLAGS"
%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DLIBDIR=%{_libdir}
+ -DHAL_LIBDIR=%{_hal_libdir}
make %{?jobs:-j%jobs}