diff options
| author | Mikko Ylinen <mikko.ylinen@intel.com> | 2015-01-18 18:56:30 +0200 |
|---|---|---|
| committer | Mikko Ylinen <mikko.ylinen@intel.com> | 2015-01-18 19:03:23 +0200 |
| commit | a41b67956fd05f8196a8690c324c1d364a8c03b9 (patch) | |
| tree | a72f32e8a4b865e9eb6527245d3f3d84e85ccb3b | |
| parent | cd735443d8ed3fd719b5d6a11e7ac4435be3c980 (diff) | |
| download | qtbase-a41b67956fd05f8196a8690c324c1d364a8c03b9.tar.gz qtbase-a41b67956fd05f8196a8690c324c1d364a8c03b9.tar.bz2 qtbase-a41b67956fd05f8196a8690c324c1d364a8c03b9.zip | |
packaging: fix build issues w/ IVI profile and GBStizen_3.0_ivi_releasetizen_3.0.m2.a1_tv_releasetizen_3.0.m1_tv_releasesubmit/tizen_wearable/20150130.021233submit/tizen_tv/20150323.000000submit/tizen_ivi/20150120.333333submit/tizen_ivi/20150120.111111submit/tizen_common/20150520.888886submit/tizen_3.0_ivi/20150120.222222accepted/tizen/wearable/20150130.040256accepted/tizen/tv/20150324.014635accepted/tizen/ivi/20150120.050747accepted/tizen/common/20150521.125500accepted/tizen/3.0/ivi/20150120.102855tizen_3.0.m1_tvtizen_3.0.2015.q2_common
* 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.spec | 6 |
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 \ |