summaryrefslogtreecommitdiffstats
path: root/recipes-qt/meta
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-11-24 10:33:50 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-11-26 13:22:37 +0000
commit5805c97a45b34e0ede4e6a481315ebbd4a95d4ba (patch)
treea712cb8e9e4daca51d2fc63b0503597f9520e643 /recipes-qt/meta
parentd2559ef8fabecae7f8e352c8345eb6e685af925d (diff)
downloadmeta-boot2qt-5805c97a45b34e0ede4e6a481315ebbd4a95d4ba.tar.gz
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 <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'recipes-qt/meta')
-rw-r--r--recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb6
1 files changed, 5 insertions, 1 deletions
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 () {
64 qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf 64 qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
65 echo 'HostSpec = linux-g++' >> $qtconf 65 echo 'HostSpec = linux-g++' >> $qtconf
66 echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf 66 echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf
67
68 # change staging paths to target sdk paths, so they can be relocated at install time
69 sed -i -e 's:${STAGING_DIR_NATIVE}:${SDKPATHNATIVE}:g' ${SDK_MKSPEC_DIR}/*.pri
70 sed -i -e 's:${STAGING_DIR}/[^/]*:${SDKTARGETSYSROOT}:g' ${SDK_MKSPEC_DIR}/*.pri
67} 71}
68 72
69SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \ 73SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \
70 $target_sdk_dir/sysroots/@REAL_MULTIMACH_TARGET_SYS@/usr/lib/${QT_DIR_NAME}/mkspecs/qdevice.pri ;" 74 $target_sdk_dir/sysroots/@REAL_MULTIMACH_TARGET_SYS@/usr/lib/${QT_DIR_NAME}/mkspecs/*.pri ;"