From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 24 May 2013 17:50:00 +0000 (+0200)
Subject: qtbase: Don't use immediate expansion for OE_QMAKE_QMAKE_ORIG
X-Git-Tag: rev_ivi_2015_02_04~1091
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88a54b02c4dc69b15996fcbdb753743c7e8eee25;p=scm%2Fbb%2Ftizen-distro.git

qtbase: Don't use immediate expansion for OE_QMAKE_QMAKE_ORIG

* full path is part of sstate checksum with immediate expansion

(From meta-qt5 rev: 14f6ec2ca227c474a9045b68bcf6a6dd78b8cd57)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---

diff --git a/meta-qt5/recipes-qt/qt5/qtbase.inc b/meta-qt5/recipes-qt/qt5/qtbase.inc
index 5d4334a..cabe0b7 100644
--- a/meta-qt5/recipes-qt/qt5/qtbase.inc
+++ b/meta-qt5/recipes-qt/qt5/qtbase.inc
@@ -93,7 +93,7 @@ EOF
 QMAKE_MKSPEC_PATH = "${B}"
 
 # another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location
-OE_QMAKE_QMAKE_ORIG := "${OE_QMAKE_QMAKE}"
+OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake"
 OE_QMAKE_QMAKE = "bin/qmake"
 
 # qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell