Skip to contentSkip to conversation

qtbase: replace ${STAGING_DIR_HOST} instead of ${STAGING_EXECPREFIXDIR}

PATCH New Jonathan Liu 1 participant 1 message Aug 30, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qtbase: replace ${STAGING_DIR_HOST} instead of ${STAGING_EXECPREFIXDIR}

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.

---
 recipes-qt/qt5/qtbase_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtbase_git.bb +1 -1
index 6843070..f4287cc 100644
@@ -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
 }
 
Signature · 1 line
2.5.0