summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-06-02 09:52:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-08 17:34:02 +0100
commitba93bdd38dad2146e40d42f8cd20dc7a755529dc (patch)
treef3aa3d5f31b6833c0d2e4698811d6405788164d3 /meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch
parent20a3a36547831349d5d8b429cb35f1415a856bda (diff)
downloadpoky-ba93bdd38dad2146e40d42f8cd20dc7a755529dc.tar.gz
qt4: upgrade to 4.8.7
Upgrade qt4 packages from version 4.8.6 to 4.8.7. * remove arm64 related patches which are merged * remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch which is backported. * update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch and 0013-configure-add-crossarch-option.patch for new version * remove useless variable INC_PR (From OE-Core rev: 4d033fdc5e754e22edb2e9074e30e58847c4b791) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch
new file mode 100644
index 0000000000..9c3de47b4b
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.7/0016-configure-eval-QMAKE_CXX.patch
@@ -0,0 +1,37 @@
1From 8403634a71f067eec514b6d2193cf41e281dff8e Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:47:08 +0200
4Subject: [PATCH 16/21] configure: eval QMAKE_CXX
5
6Allow expansion of $(...) references in QMAKE_CXX (currently its value
7is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
8which allows WebKit to be enabled.
9
10Upstream-Status: Pending
11
12Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14
15Conflicts:
16 configure
17---
18 configure | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
20
21diff --git a/configure b/configure
22index d02824b..891d6e7 100755
23--- a/configure
24+++ b/configure
25@@ -3409,7 +3409,8 @@ else
26 CFG_FRAMEWORK=no
27 fi
28
29-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
30+QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
31+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
32 TEST_COMPILER="$CXX"
33
34 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
35--
361.8.0
37