diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-12-14 09:15:35 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-14 21:06:21 +0000 |
| commit | e8eb19e224a8a4391161169ce70362dbc7b01d82 (patch) | |
| tree | ffc7239a982ade3f04823273eac54517f4f21621 | |
| parent | 04b94d86fbbbca82a3fba104dc0f33ab2277638b (diff) | |
sdk: support additional build scripts from qtbase
QtBase has several helper scripts available that can be used
to build other modules and tests. Patch those so they work
properly from the sdk.
Fixes: QTBUG-93342
Change-Id: If393d1a0abdebe21a70439190e49715bcd3e35a1
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 7297b1bee8f97e975b0abb55158a9766ef2cd135)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | classes/populate_sdk_qt6_base.bbclass | 1 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index 243a406..a792159 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/classes/populate_sdk_qt6_base.bbclass @@ -40,6 +40,7 @@ create_qt6_sdk_files () { # add qt.conf to both bin and libexec dirs cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/ cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_HOST_LIBEXECDIR}/ + cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/target_qt.conf install -d ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/qt6.sh diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index ae93426..f6e7172 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -153,6 +153,11 @@ do_install:append:class-nativesdk() { set(QT_HOST_PATH "\$ENV{OECORE_NATIVE_SYSROOT}/usr" CACHE PATH "") set(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING "TRUE" CACHE BOOL "") EOF + + sed -i ${D}${QT6_INSTALL_BINDIR}/* \ + -e 's|${RECIPE_SYSROOT_NATIVE}|${SDKPATHNATIVE}|' \ + -e '/^toolchain_path=/s|.*|toolchain_path=${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake|' + } INSANE_SKIP:${PN}-ptest += "arch" |