qtbase: Don't use immediate expansion for OE_QMAKE_QMAKE_ORIG
authorMartin Jansa <Martin.Jansa@gmail.com>
Fri, 24 May 2013 17:50:00 +0000 (19:50 +0200)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:44:35 +0000 (08:44 -0800)
* 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>
meta-qt5/recipes-qt/qt5/qtbase.inc

index 5d4334a..cabe0b7 100644 (file)
@@ -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