From 1c119e5e4772acb3cb3c72369cc3b5ea9d79f7c0 Mon Sep 17 00:00:00 2001 From: Sunmin Lee Date: Wed, 24 May 2017 15:17:24 +0900 Subject: [PATCH] Patch for x86 Resolve issues of building libtota in x86, x86_64 architecture. Change-Id: I70331c9d9246ca72d57e6d3928bf03ee9a65ae94 Signed-off-by: Sunmin Lee --- CMakeLists.txt | 2 +- packaging/libtota.spec | 5 ++--- ss_engine/fota_common.h | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a0f93e..fe4c89d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES(${LIBNAME} ${packages_LDFLAGS}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libtota.a DESTINATION ${LIB_INSTALL_DIR}) #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/modulename-api.pc.in ${CMAKE_CURRENT_BINARY_DIR}/modulename-api.pc @ONLY) #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/modulename-api.pc DESTINATION lib/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tota.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tota.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) FOREACH(hfile ${HEADERS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include) ENDFOREACH(hfile) diff --git a/packaging/libtota.spec b/packaging/libtota.spec index a873d50..5f4c488 100755 --- a/packaging/libtota.spec +++ b/packaging/libtota.spec @@ -1,8 +1,7 @@ Name: libtota Summary: fota update library -ExclusiveArch: %{arm} -Version: 0.2.1 -Release: 2 +Version: 0.2.2 +Release: 3 Group: System License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and PD Source0: %{name}-%{version}.tar.gz diff --git a/ss_engine/fota_common.h b/ss_engine/fota_common.h index 8424a45..f9beb06 100755 --- a/ss_engine/fota_common.h +++ b/ss_engine/fota_common.h @@ -30,7 +30,10 @@ typedef unsigned short u16; typedef signed int s32; typedef unsigned int u32; +#ifndef __size_t /* typedef check for x86 env: stddef.h */ +#define __size_t typedef u32 size_t; +#endif /* __size_t */ typedef signed long sl32; typedef unsigned long ul32; -- 2.7.4