CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

sdk: support additional build scripts from qtbase

Browse Source 
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
Pick-to: 6.3 6.2
Change-Id: If393d1a0abdebe21a70439190e49715bcd3e35a1
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
This commit is contained in:
Samuli Piippo 2021-12-14 09:15:35 +02:00
parent 90dd254455
commit 7297b1bee8
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classes/populate_sdk_qt6_base.bbclass
View File

@ -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

5
recipes-qt/qt6/qtbase_git.bb
View File

@ -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"