From 3d122c668c9330016bb057518cf825fbc80fc040 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 11 Mar 2022 10:18:09 +0000 Subject: [PATCH] qtbase: enable scripts for mingw toolchain Make sure the qt-cmake* helper scripts get correctly created for mingw toolchains. Pick-to: 6.3 6.2 Change-Id: I0ec6c4e12abf375677226ea32a6c36066a990f3b Reviewed-by: Mikko Gronoff --- recipes-qt/qt6/qtbase_git.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 8d1d067..abcd571 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -134,6 +134,10 @@ EXTRA_OECMAKE:append:class-target = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-DFEATURE_use_gold_linker=ON', '-DFEATURE_use_bfd_linker=ON', d)} \ " +EXTRA_OECMAKE:append:mingw32 = "\ + -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON \ +" + SYSROOT_DIRS += "${QT6_INSTALL_MKSPECSDIR}" do_install:append() { @@ -157,6 +161,7 @@ EOF RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_BINDIR'))}" sed -i ${D}${QT6_INSTALL_BINDIR}/* \ + -e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \ -e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|" RELPATH=${@os.path.relpath(d.getVar('prefix') + '/share/cmake/Qt6Toolchain.cmake', d.getVar('QT6_INSTALL_LIBDIR') + '/cmake/Qt6')}