From: Jonathan Liu <net147@gmail.com>
To: openembedded-devel@lists.openembedded.org
Date: Sun, 30 Aug 2015 18:47:32 +1000
Message-Id: <1440924452-5208-1-git-send-email-net147@gmail.com>
Subject: [meta-qt5][PATCH] qtbase: replace ${STAGING_DIR_HOST} instead of ${STAGING_EXECPREFIXDIR}
Precedence: list
Reply-To: openembedded-devel@lists.openembedded.org

Replacing ${STAGING_EXECPREFIXDIR} with the $$[QT_INSTALL_PREFIX] qmake
built-in variable only covers ${STAGING_DIR_HOST}/usr and misses the
following additional host paths:
${STAGING_DIR_HOST}/lib
${STAGING_DIR_HOST}

Replace ${STAGING_DIR_HOST} instead with $$[QT_SYSROOT] so that sed
replaces all the host paths contained in qconfig.pri instead of only
some of them. This avoids host paths being referenced on the SDK host
when using the Qt SDK.

Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 recipes-qt/qt5/qtbase_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 6843070..f4287cc 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -239,7 +239,7 @@ do_install_append() {
 
     # Replace host paths with qmake built-in properties
     sed -i -e 's| ${STAGING_DIR_NATIVE}${prefix_native}| $$[QT_HOST_PREFIX]|g' \
-        -e 's| ${STAGING_EXECPREFIXDIR}| $$[QT_INSTALL_PREFIX]|g' \
+        -e 's| ${STAGING_DIR_HOST}| $$[QT_SYSROOT]|g' \
         ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/qconfig.pri
 }
 
-- 
2.5.0