[oe] [meta-qt5][PATCH] qtbase: Add gcc to QMAKE_COMPILER variable.

Julien Brianceau (jbriance) jbriance at cisco.com
Fri Jan 2 08:12:41 UTC 2015


According to mkspecs/features/spec_post.prf, QMAKE_COMPILER variable should at least contain gcc for linux-oe-g++ platform.

This patch fixes a crash issue in QtWebKit introduced in v5.4.0 by:
https://qt.gitorious.org/qt/qtwebkit/commit/34d4628b981add039a9a349723cbdff1dadca144

Signed-off-by: Julien Brianceau <jbriance at cisco.com>
---
 recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch | 2 +-
 recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
index 081bcac..7a94dff 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -224,7 +224,7 @@ index 0000000..ca26b10
 +include(../common/g++-unix.conf)
 +
 +# tc settings from g++-base.conf
-+QMAKE_COMPILER = $(OE_QMAKE_COMPILER)
++QMAKE_COMPILER = $(OE_QMAKE_COMPILER) gcc
 +QMAKE_CC       = $(OE_QMAKE_CC)
 +QMAKE_CXX      = $(OE_QMAKE_CXX)
 +
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index 081bcac..7a94dff 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -224,7 +224,7 @@ index 0000000..ca26b10
 +include(../common/g++-unix.conf)
 +
 +# tc settings from g++-base.conf
-+QMAKE_COMPILER = $(OE_QMAKE_COMPILER)
++QMAKE_COMPILER = $(OE_QMAKE_COMPILER) gcc
 +QMAKE_CC       = $(OE_QMAKE_CC)
 +QMAKE_CXX      = $(OE_QMAKE_CXX)
 +
--
1.8.0




More information about the Openembedded-devel mailing list