From b1b3fac3a0f744db7fdf8b8428f3910a41463be1 Mon Sep 17 00:00:00 2001 From: Tomasz Olszak Date: Tue, 10 Nov 2015 15:42:05 +0100 Subject: [PATCH] packaging: update for Tizen 3.0 Mobile * scim: enable only for tizen2 * egl: enable also for Tizen 3.0 Mobile * use TIZEN_SCIM define enable Tizen scim integration. * unset CFLAGS, CXXFLAGS and LFLAGS for Tizen 3.0 Mobile, Qt is smart enough to pick most optimal subset (else there is build error) Change-Id: Ie6b21b184987832b642a0c4118b8852a1e17b414 Bug-Tizen: TC-2147/related Signed-off-by: Philippe Coval --- packaging/qt5.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packaging/qt5.spec b/packaging/qt5.spec index 901f5315f5..cb12a9175d 100644 --- a/packaging/qt5.spec +++ b/packaging/qt5.spec @@ -54,7 +54,7 @@ %endif -%if "%{profile}" == "mobile" +%if "%{profile}" == "mobile" && 0%{tizen_version_major} < 3 %define _with_tizenscim 1 %endif @@ -63,7 +63,7 @@ %define _with_xscrnsaver 1 %endif -%if "%{profile}" != "wearable" && "%{profile}" != "mobile" +%if "%{profile}" != "wearable" && "%{profile}" != "mobile" && 0%{tizen_version_major} < 3 %define _with_egl 1 %endif @@ -602,6 +602,12 @@ export CXXFLAGS="$(echo $CXXFLAGS| sed 's/-mfpu=neon//gi')" %endif %endif +%if "%{profile}" == "mobile" +%ifarch %arm armv7l %{aarch64} +unset CFLAGS CXXFLAGS LFLAGS +%endif +%endif + MAKEFLAGS=%{?_smp_mflags} \ ./configure --disable-static \ -confirm-license \ @@ -615,6 +621,9 @@ MAKEFLAGS=%{?_smp_mflags} \ %if 0%{?_tizen_emulator:1} -device-option TIZEN_EMULATOR=1 \ %endif +%if %{with tizenscim} + -device-option DEFINES+=TIZEN_SCIM=1 +%endif %endif %if %{with wayland} -qpa wayland \ -- 2.34.1