From d382ecb43a560c908f120593357745375b29f41d Mon Sep 17 00:00:00 2001 From: Jihoon Jung Date: Fri, 25 Mar 2022 14:09:25 +0900 Subject: [PATCH] Remove Errors from full 64 bit build Change-Id: Ifa48ed443778e0ac65a31f47022b831684e881de Signed-off-by: Jihoon Jung --- CMakeLists.txt | 1 - packaging/nfc-manager.spec | 2 ++ src/commonlib/nfc-common-lib.pc.in | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0f48ac..9c4e2be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,6 @@ PROJECT(nfc-manager C CXX) MESSAGE("build nfc-common-lib and nfc-manager") SET(PREFIX ${CMAKE_INSTALL_PREFIX}) -SET(LIBDIR "${PREFIX}/lib") SET(MODULEDIR "${LIBDIR}/nfc") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror") ADD_DEFINITIONS("-D_GNU_SOURCE") diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec index bc25378..1222a96 100644 --- a/packaging/nfc-manager.spec +++ b/packaging/nfc-manager.spec @@ -98,6 +98,8 @@ export LDFLAGS+=" -lgcov" export LDFLAGS+=" -Wl,--rpath=%{_prefix}/lib -Wl,--as-needed" LDFLAGS="$LDFLAGS" cmake . \ + -DLIBDIR=%{_libdir} \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DTIZEN_ENGINEER_MODE=1 \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DTIZEN_TELEPHONY_ENABLED=1 \ diff --git a/src/commonlib/nfc-common-lib.pc.in b/src/commonlib/nfc-common-lib.pc.in index 30c2054..e2fe8c7 100644 --- a/src/commonlib/nfc-common-lib.pc.in +++ b/src/commonlib/nfc-common-lib.pc.in @@ -1,11 +1,11 @@ prefix=@PREFIX@ exec_prefix=${prefix}/bin -libdir=@LIB_INSTALL_DIR@ +libdir=@LIBDIR@ includedir=@INCLUDE_INSTALL_DIR@/nfc-common-lib Name: nfc-common-lib Description: NFC Common Library Version: 1.0 -Requires: +Requires: Libs: -L@LIB_INSTALL_DIR@ -lnfc-common-lib Cflags: -I@INCLUDE_INSTALL_DIR@/nfc-common-lib -- 2.7.4