From 97185add29d6ff94196617934eadfcb3b7ff5d8a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 12 Sep 2025 04:59:26 +0000 Subject: [PATCH] qttools: don't fail on unsupported clang oe-core might have too recent version of clang which is not supported by qttools. Don't force qttools to use clang, but let it determine if the version is suitable. For 6.8, amend the change with additional check for maximum supported version and skip clang from oe-core. Change-Id: I8a141ec01f3556d33b3037ba27adc250b99855b5 Reviewed-by: Ari Parkkila (cherry picked from commit 4df44780d19196b8a21dca8c592f65ec357dfdae) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit fb8737c59a9016dffaa96e9cd9f82424432a9f46) (cherry picked from commit c7d71f4cece4d1fe3110c945b9bd40ca82960e05) Reviewed-by: Mikko Gronoff --- recipes-qt/qt6/qttools_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index 50a8ecd..ed92c2b 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -24,15 +24,15 @@ SRC_URI += " \ DEPENDS += "qtbase qtdeclarative qttools-native" -CAN_USE_CLANG = "${@True if bb.utils.vercmp_string_op(d.getVar('LLVMVERSION') or '', '17', '>') or \ - os.path.exists(os.path.join(d.getVar('COREBASE'),'meta/recipes-devtools/clang')) else False}" +CAN_USE_CLANG = "${@True if bb.utils.vercmp_string_op(d.getVar('LLVMVERSION') or '', '17', '>') and \ + bb.utils.vercmp_string_op(d.getVar('LLVMVERSION') or '', '21', '<') else False}" CAN_USE_CLANG:mingw32 = "False" QTTOOLS_USE_CLANG ?= "${@ 'clang' if bb.utils.to_boolean(d.getVar('CAN_USE_CLANG')) else ''}" PACKAGECONFIG:class-native = "${QTTOOLS_USE_CLANG}" PACKAGECONFIG:class-nativesdk = "${QTTOOLS_USE_CLANG}" -PACKAGECONFIG[clang] = "-DFEATURE_clang=ON,-DFEATURE_clang=OFF,clang" +PACKAGECONFIG[clang] = ",-DFEATURE_clang=OFF,clang" FILES:${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"