summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
blob: d5eac6b16750ef06c5a9a0866af6f720ac061ad9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
Allow expansion of $(...) references in QMAKE_CXX (currently its value
is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
which allows WebKit to be enabled.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Upstream-Status: Pending

Index: qt-everywhere-opensource-src-4.8.0/configure
===================================================================
--- qt-everywhere-opensource-src-4.8.0.orig/configure
+++ qt-everywhere-opensource-src-4.8.0/configure
@@ -3322,7 +3322,8 @@ else
     CFG_FRAMEWORK=no
 fi
 
-QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
+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`
+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
 TEST_COMPILER="$CXX"
 
 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER