diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 20:00:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:26 +0100 |
commit | a0a29221c8df7c277139b0c875330f08cb2bdea3 (patch) | |
tree | 967c8777a198f33333e458ca8579fe896c784e99 /meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch | |
parent | 248e9f48c77212372b50074f0a475a16bb8db4be (diff) | |
download | poky-a0a29221c8df7c277139b0c875330f08cb2bdea3.tar.gz |
qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
(From OE-Core rev: dcda03d3f6ec442740e3683a1971103dc639689d)
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.patch | 22 |
1 files changed, 22 insertions, 0 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 new file mode 100644 index 0000000000..d5eac6b167 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Allow expansion of $(...) references in QMAKE_CXX (currently its value | ||
2 | is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed | ||
3 | which allows WebKit to be enabled. | ||
4 | |||
5 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: 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 | ||