summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Olszak <olszak.tomasz@gmail.com>2015-11-10 15:42:06 +0100
committerTomasz Olszak <olszak.tomasz@gmail.com>2015-11-10 15:42:06 +0100
commit76d9ec7aa55bd186d1330fa045eb3c021b2ba473 (patch)
treeb0d76ccb4279c7eeaf043d8df7ca8d04ce7582be
parent919286e7eefd547d40dbd97300fe4f0bdee9a02c (diff)
downloadqtbase-76d9ec7aa55bd186d1330fa045eb3c021b2ba473.tar.gz
qtbase-76d9ec7aa55bd186d1330fa045eb3c021b2ba473.tar.bz2
qtbase-76d9ec7aa55bd186d1330fa045eb3c021b2ba473.zip
packaging: fix build issues w/ IVI profile and GBS
* use "" to eval macro * egl: fix 'enable also for Tizen 3.0 Mobile' * unset CFLAGS, CXXFLAGS and LFLAGS for all builds Change-Id: I99d04d2c638f68e2042058bd76ef0626b36d5eab Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
-rw-r--r--packaging/qt5.spec6
1 files changed, 2 insertions, 4 deletions
diff --git a/packaging/qt5.spec b/packaging/qt5.spec
index d7946fe191..8e9370861d 100644
--- a/packaging/qt5.spec
+++ b/packaging/qt5.spec
@@ -54,7 +54,7 @@
%endif
-%if "%{profile}" == "mobile" && 0%{tizen_version_major} < 3
+%if "%{profile}" == "mobile" && "%{tizen_version_major}" < "3"
%define _with_tizenscim 1
%endif
@@ -63,7 +63,7 @@
%define _with_xscrnsaver 1
%endif
-%if "%{profile}" != "wearable" && "%{profile}" != "mobile" && 0%{tizen_version_major} < 3
+%if "%{profile}" != "wearable" && "%{profile}" != "mobile" && "%{tizen_version_major}" > "2"
%define _with_egl 1
%endif
@@ -602,11 +602,9 @@ 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 \