Change configure logic, so that only gcc 3.3 and older does
not build webkit and gcc 3.2 and older additionally not
build QtXmlPatterns.
Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
---
recipes-qt4/qt4/qt4-4.8.7.inc | 2 +-
.../qt4-4.8.7/{gcc-6.patch => gcc-version.patch} | 21 ++++++++++++++++++---
recipes-qt4/qt4/qt4-native.inc | 2 +-
3 files changed, 20 insertions(+), 5 deletions(-)
rename recipes-qt4/qt4/qt4-4.8.7/{gcc-6.patch => gcc-version.patch} (62%)
diff --git a/recipes-qt4/qt4/qt4-4.8.7.inc b/recipes-qt4/qt4/qt4-4.8.7.inc
index 7720463..40558aa 100644
--- a/recipes-qt4/qt4/qt4-4.8.7.inc
+++ b/recipes-qt4/qt4/qt4-4.8.7.inc
@@ -27,7 +27,7 @@ SRC_URI =
"http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
file://0034-Fix-kmap2qmap-build-with-clang.patch \
file://0035-Add-nios2-support.patch \
file://0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch \
- file://gcc-6.patch \
+ file://gcc-version.patch \
file://Fix-QWSLock-invalid-argument-logs.patch \
file://add_check_for_aarch64_32.patch \
file://0001-QWS-fix-24-bit-RGB-BGR-handling.patch \
diff --git a/recipes-qt4/qt4/qt4-4.8.7/gcc-6.patch
b/recipes-qt4/qt4/qt4-4.8.7/gcc-version.patch
similarity index 62%
rename from recipes-qt4/qt4/qt4-4.8.7/gcc-6.patch
rename to recipes-qt4/qt4/qt4-4.8.7/gcc-version.patch
index b0ce9cd..9c5dd48 100644
--- a/recipes-qt4/qt4/qt4-4.8.7/gcc-6.patch
+++ b/recipes-qt4/qt4/qt4-4.8.7/gcc-version.patch
@@ -6,14 +6,29 @@ RP 2016/5/26
Index: qt-everywhere-opensource-src-4.8.7/configure
===================================================================
+
+Amend this and change the logic to assume all compilers are suitable
+exept 3.3x resp. 3.2x and older ones.
+Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
+
--- qt-everywhere-opensource-src-4.8.7.orig/configure
+++ qt-everywhere-opensource-src-4.8.7/configure
-@@ -7756,7 +7756,7 @@ case "$XPLATFORM" in
+@@ -7757,15 +7757,15 @@
*-g++*)
# Check gcc's version
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
- 5*|4*|3.4*)
-+ 6*|5*|4*|3.4*)
- ;;
+- ;;
3.3*)
canBuildWebKit="no"
+ ;;
+- *)
++ 3.2*|3.1*|3.0*|2*)
+ canBuildWebKit="no"
+ canBuildQtXmlPatterns="no"
+ ;;
++ *)
++ ;;
+ esac
+ ;;
+ solaris-cc*)
diff --git a/recipes-qt4/qt4/qt4-native.inc b/recipes-qt4/qt4/qt4-native.inc
index c0d6b3c..08aa61d 100644
--- a/recipes-qt4/qt4/qt4-native.inc
+++ b/recipes-qt4/qt4/qt4-native.inc
@@ -18,7 +18,7 @@ SRC_URI =
"http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
file://0015-configure-add-nostrip-for-debug-packages.patch \
file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \
file://0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch \
- file://gcc-6.patch \
+ file://gcc-version.patch \
file://g++.conf \
file://linux.conf \
file://qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch \
--
2.9.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
