From 5805c97a45b34e0ede4e6a481315ebbd4a95d4ba Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 24 Nov 2015 10:33:50 +0200 Subject: sdk: relocate paths in qt5 sdk .pri files mkspecs/qconfig.pri has envs for PKG_CONFIG which need to be relocated when SDK is installed. Change-Id: Ibeccb5c6b26f5f40ad5e515023eb259903c20fb8 Reviewed-by: Teemu Holappa --- recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb index c7bbcf9..15c8b97 100644 --- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb +++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb @@ -64,7 +64,11 @@ create_sdk_files_append () { qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf echo 'HostSpec = linux-g++' >> $qtconf echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf + + # change staging paths to target sdk paths, so they can be relocated at install time + sed -i -e 's:${STAGING_DIR_NATIVE}:${SDKPATHNATIVE}:g' ${SDK_MKSPEC_DIR}/*.pri + sed -i -e 's:${STAGING_DIR}/[^/]*:${SDKTARGETSYSROOT}:g' ${SDK_MKSPEC_DIR}/*.pri } SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \ - $target_sdk_dir/sysroots/@REAL_MULTIMACH_TARGET_SYS@/usr/lib/${QT_DIR_NAME}/mkspecs/qdevice.pri ;" + $target_sdk_dir/sysroots/@REAL_MULTIMACH_TARGET_SYS@/usr/lib/${QT_DIR_NAME}/mkspecs/*.pri ;" -- cgit v1.2.3-54-g00ecf