From ad6dfe6b1474da24884c469f78bdab8c080e936d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 Jan 2016 10:05:17 +0200 Subject: qt5: use qmake built-in variables instead of patching Change the host paths during SDK build to qmake build-in variables, so that we don't need to patch anything during SDK installation. Change-Id: I9273d85f10da5aa1897f35f1866abb4d80a625fd Reviewed-by: Teemu Holappa Reviewed-by: David Schulz --- recipes-qt/meta/b2qt-sdk.inc | 15 ++++----------- recipes-qt/qt5/qtbase_git.bbappend | 7 +++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/recipes-qt/meta/b2qt-sdk.inc b/recipes-qt/meta/b2qt-sdk.inc index 87ceb96..4a3a00b 100644 --- a/recipes-qt/meta/b2qt-sdk.inc +++ b/recipes-qt/meta/b2qt-sdk.inc @@ -50,20 +50,13 @@ create_sdk_files_append () { static_cxxflags=$(echo $static_cxxflags | sed -e "s/$i //") done echo "MACHINE = ${MACHINE}" > ${SDK_DEVICE_PRI} - echo "CROSS_COMPILE = ${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI} - echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${static_cflags}" >> ${SDK_DEVICE_PRI} - echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${static_cxxflags}" >> ${SDK_DEVICE_PRI} - echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI} + echo "CROSS_COMPILE = \$\$[QT_HOST_PREFIX]${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI} + echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${static_cflags}" >> ${SDK_DEVICE_PRI} + echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${static_cxxflags}" >> ${SDK_DEVICE_PRI} + echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI} # Setup qt.conf to point at the device mkspec by default 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/*.pri ;" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 4e9057a..d83db2e 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -49,3 +49,10 @@ SRCREV = "3880f41e683f02b905c8cbc3c578c3f3a0a1eb2e" # Temporarily here, until merged upstream PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" + +do_install_append() { + # Temporarily here, until merged upstream + sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX]|g' \ + -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ + ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri +} -- cgit v1.2.3-54-g00ecf