From 70f36ebae41a7f4445d8bc94ded78ba4a04613de Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 10 Nov 2017 08:44:36 +0200 Subject: qt5: use correct HostPrefix Different HostPrefix was used when building Qt and in external SDK's qt.conf. This caused e.g., wrong path in qmodule.pri for PKG_CONFIG_EXECUTABLE. Task-number: QTBUG-63097 Signed-off-by: Samuli Piippo Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 8e1fe206..d1e0e579 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -88,7 +88,7 @@ generate_qt_config_file_effective_paths() { [EffectivePaths] HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} HostData = ${OE_QMAKE_PATH_HOST_DATA} -HostPrefix = ${STAGING_DIR_NATIVE}${prefix_native} +HostPrefix = ${STAGING_DIR_NATIVE} EOF } # diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 69245e81..bf9540b7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -214,7 +214,7 @@ do_install_append() { touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri # Replace host paths with qmake built-in properties - sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \ + sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \ -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri } -- cgit v1.2.3-54-g00ecf