From: MyungJoo Ham Date: Fri, 9 Sep 2016 07:58:06 +0000 (+0000) Subject: Remove unnecessary profile dependencies and spec conditions X-Git-Tag: submit/tizen/20160928.054547^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F87807%2F1;p=platform%2Fcore%2Fapi%2Fcontext.git Remove unnecessary profile dependencies and spec conditions The previous context.spec disables build if it is public-TV profile or private-TV profile. At the same time, context.spec commands to add a compiler definition, "_ALLOW_SERVICE_APP_TRIGGER_", if it is public-TV or private-TV profile while the control can NEVER reach inside it. Furthermore, the cmake's compiler definition "PROFILE" is never used. Thus all profile related macros, which prohibits Tizen build system from merging profile builds and configurability, can be easily removed. Note that the meta-tv.git does NOT context in its YAML; therefore, this patch CANNOT change the Tizen-TV platform image. Change-Id: Idbc4ee79825576b009f65b33876f8d6e85aa0b11 Signed-off-by: MyungJoo Ham --- diff --git a/packaging/context.spec b/packaging/context.spec index bff0727..ed1d1dd 100644 --- a/packaging/context.spec +++ b/packaging/context.spec @@ -6,15 +6,9 @@ Group: Service/Context License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -%define BUILD_PROFILE %{?profile}%{!?profile:%{?tizen_profile_name}} - %define SYSTEM_SERVICE 0 %define LEGACY_APPFW 0 -%if "%{?BUILD_PROFILE}" == "tv" -ExcludeArch: %{arm} aarch64 %ix86 x86_64 -%endif - BuildRequires: cmake BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(context-common) @@ -52,13 +46,7 @@ export CXXFLAGS+=" -std=c++0x" #export CXXFLAGS+=" -DTIZEN_ENGINEER_MODE" #export FFLAGS+=" -DTIZEN_ENGINEER_MODE" -%if "%{?BUILD_PROFILE}" == "tv" -export CFLAGS+=" -D_ALLOW_SERVICE_APP_TRIGGER_" -export CXXFLAGS+=" -D_ALLOW_SERVICE_APP_TRIGGER_" -%endif - cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} \ - -DPROFILE=%{?BUILD_PROFILE} \ -DSYSTEM_SERVICE=%{SYSTEM_SERVICE} \ -DLEGACY_APPFW=%{LEGACY_APPFW} make %{?jobs:-j%jobs}