diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2020-08-15 11:18:13 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-11-03 17:01:34 +0100 |
commit | b39d7973dd8566bd9a6670f29b3a483f182d3395 (patch) | |
tree | cfdf9e67363156671f3b4168774dd169cd453f24 /recipes-qt/qt5/qttools_git.bb | |
parent | bca5326e4561960c09a238d01e33ce4794b01d2b (diff) |
qttools: Force build of native help-tools when clang is set in PACKAGECONFIG
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 <schnitzeltony@gmail.com>
(cherry picked from commit f30c4ba364030ad1c92d24c6f5ee3bc7e479dc65)
Diffstat (limited to 'recipes-qt/qt5/qttools_git.bb')
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 52e2f3c0..ab40a28c 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 = "9d5d92a49256af65a85fa69b58e6744c2722321b" |