diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch new file mode 100644 index 0000000000..8b9b3bf911 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 3893ad264f85e4a0eec64017d515dddf9ee9ef88 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Wed, 26 Sep 2012 20:47:08 +0200 | ||
4 | Subject: [PATCH 16/22] configure: eval QMAKE_CXX | ||
5 | |||
6 | Allow expansion of $(...) references in QMAKE_CXX (currently its value | ||
7 | is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed | ||
8 | which allows WebKit to be enabled. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | configure | 3 ++- | ||
16 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/configure b/configure | ||
19 | index 5cc755e..1e6c910 100755 | ||
20 | --- a/configure | ||
21 | +++ b/configure | ||
22 | @@ -3329,7 +3329,8 @@ else | ||
23 | CFG_FRAMEWORK=no | ||
24 | fi | ||
25 | |||
26 | -QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1` | ||
27 | +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` | ||
28 | +QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"` | ||
29 | TEST_COMPILER="$CXX" | ||
30 | |||
31 | [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER | ||
32 | -- | ||
33 | 1.7.12 | ||
34 | |||