From 98624afe7d6376db4bee80f26ea6fbc2c4909ea9 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Tue, 20 Sep 2016 04:03:13 +0000 Subject: [PATCH] [4.0] Remove ExcludeArch and dead copmiler definitions If TV-profile should not include this package, it should be removed from the ks file (meta-tv.git). As we are trying to merge build projects, trying not to build for a specific profile will become meaningless soon. Thus, the ExcludeArch statement in the specfile is useless and confuses the system. So, it is removed. CMakeLists.txt states as if there are code with compiler definitions of "_MOBILE_" and "_WEARABLE". However, grep on the source code has revealed that there are no such code. Therefore, these two definitions are deadcode. We have not yet completely removed profile build dependencies. There will be another patch following this soon from me. Change-Id: I59025327e0ca933fd5599388b13939973a81081a Signed-off-by: MyungJoo Ham --- CMakeLists.txt | 9 --------- packaging/context-provider.spec | 4 ---- 2 files changed, 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 303cca7..2c21cb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,15 +15,6 @@ ADD_DEFINITIONS(-DLOG_TAG="CONTEXT") ADD_DEFINITIONS(-D_LIBDIR_="${LIBDIR}") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIC -Wl,--as-needed -Wl,--gc-section -Wl,--print-gc-section") -# Profiles -IF("${PROFILE}" STREQUAL "mobile") - ADD_DEFINITIONS("-D_MOBILE_") -ENDIF("${PROFILE}" STREQUAL "mobile") - -IF("${PROFILE}" STREQUAL "wearable") - ADD_DEFINITIONS("-D_WEARABLE_") -ENDIF("${PROFILE}" STREQUAL "wearable") - INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${target_dir}/internal diff --git a/packaging/context-provider.spec b/packaging/context-provider.spec index 2a2a1d6..765f485 100644 --- a/packaging/context-provider.spec +++ b/packaging/context-provider.spec @@ -8,10 +8,6 @@ Source0: %{name}-%{version}.tar.gz %define BUILD_PROFILE %{?profile}%{!?profile:%{?tizen_profile_name}} -%if "%{?BUILD_PROFILE}" == "tv" -ExcludeArch: %{arm} aarch64 %ix86 x86_64 -%endif - BuildRequires: cmake BuildRequires: pkgconfig(gmodule-2.0) -- 2.34.1