From 3ed820535438a47cf65d5f2015512d4ee99b27b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 15 Aug 2020 11:14:55 +0200 Subject: qttools: Remove unused variables/configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Grepped around in sources of qttools and qtbase: there is not a single hint that these settings cause any effect. For the clang_config.. variables [1] was found: Seems the variables set were removed a while back. [1] https://code.qt.io/cgit/qt/qttools.git/commit/?id=e181ec2c20ede6b878187f3123d190e8b952deb1 Signed-off-by: Andreas Müller --- recipes-qt/qt5/qttools_git.bb | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'recipes-qt/qt5/qttools_git.bb') diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 913a0f8d..2943db97 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -34,21 +34,10 @@ COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" -TOOLSTOBUILD += "linguist/lconvert linguist/lrelease linguist/lupdate pixeltool qtdiag qtpaths qtplugininfo" -TOOLSTOBUILD += "${@bb.utils.contains('PACKAGECONFIG', 'clang', 'qdoc', '', d)}" -TOOLSFORTARGET = "pixeltool qtdiag qtpaths qtplugininfo" -TOOLSFORHOST = "linguist ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'qdoc', '', d)}" - EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath', 'CONFIG+=noqdoc', d)} \ " -EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang" -EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang" -EXTRA_QMAKEVARS_PRE_append_class-target = "\ - ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ -" - SRCREV = "6a85b6150554111f7d473d56addfe5a8b5da4400" BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3 From f30c4ba364030ad1c92d24c6f5ee3bc7e479dc65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 15 Aug 2020 11:18:13 +0200 Subject: qttools: Force build of native help-tools when clang is set in PACKAGECONFIG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Am working on recipes for kdevelop and musescore. These require native help tools - at least because cmake configs reference them. * Have tried other - patch-less - ways to achieve this without success * Tested multiple combinations with and without clang in PACKAGECONFIG * gcc/clang toolchain with expected result: For clang set, native tools are build for clang misssing tools are not build. * Target build remained unchanged because it was buildung help tools with clang in PACKAGECONFIG * Tried also to add the patch to nativesdk but help tools were not build. Stopped further investigation - that is not a use case for me - sorry Note for clang-toolchain users (confused me a bit - now it's obvious): For qttools-native clang has to be set explicitly in PACKAGECONFIG, otherwise native help tools are not build (same as behaviour as before). Signed-off-by: Andreas Müller --- recipes-qt/qt5/qttools_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qttools_git.bb') diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 2943db97..117b9143 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -19,6 +19,7 @@ SRC_URI += " \ file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ file://0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch \ " +SRC_URI_append_class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'file://0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch', '', d)}" FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks" FILES_${PN}-examples = "${datadir}${QT_DIR_NAME}/examples" @@ -36,7 +37,7 @@ export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath', 'CONFIG+=noqdoc', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ " SRCREV = "6a85b6150554111f7d473d56addfe5a8b5da4400" -- cgit v1.2.3