summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 21:00:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:28 +0100
commitaea363afaa193feee774dad30d81c516ea4a98fc (patch)
tree00b6ca102fe4b7c09da87d482ec04a90d128e03c /meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
parent425df23c02b7dad3c843ec9959a51337ab450cd1 (diff)
downloadpoky-aea363afaa193feee774dad30d81c516ea4a98fc.tar.gz
qt4: replace all local patches with git patches with headers
* in preparation for upgrade to 4.8.3 (From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
deleted file mode 100644
index d5eac6b167..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Allow expansion of $(...) references in QMAKE_CXX (currently its value
2is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
3which allows WebKit to be enabled.
4
5Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
6
7Upstream-Status: Pending
8
9Index: qt-everywhere-opensource-src-4.8.0/configure
10===================================================================
11--- qt-everywhere-opensource-src-4.8.0.orig/configure
12+++ qt-everywhere-opensource-src-4.8.0/configure
13@@ -3322,7 +3322,8 @@ else
14 CFG_FRAMEWORK=no
15 fi
16
17-QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
18+QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg' | tail -1`
19+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
20 TEST_COMPILER="$CXX"
21
22 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER