From 3893ad264f85e4a0eec64017d515dddf9ee9ef88 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 26 Sep 2012 20:47:08 +0200 Subject: [PATCH 16/22] configure: eval QMAKE_CXX 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. Upstream-Status: Pending Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5cc755e..1e6c910 100755 --- a/configure +++ b/configure @@ -3329,7 +3329,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 -- 1.7.12