diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-12-05 11:04:25 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-12-09 12:11:33 +0100 |
| commit | 2a2055fab9af0f2d69177ef76485f312e6d1c36b (patch) | |
| tree | f2e0c0851abb47174eb68264768f59b8ca5c9e0a | |
| parent | 25039161c1646ce1b6cc30303d4588e43b9b714a (diff) | |
| download | meta-qt5-2a2055fab9af0f2d69177ef76485f312e6d1c36b.tar.gz | |
recipes: Disable clang dependent recipes for riscv64/32
Since clang is not buildable for RISC-V, as yet, these should be
disabled as well.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rwxr-xr-x | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 5 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt5-creator_git.bb | 3 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 3 | ||||
| -rw-r--r-- | recipes-qt/qwt/qwt-qt5_6.1.4.bb | 3 |
4 files changed, 14 insertions, 0 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index b912d891..5753a3eb 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | |||
| @@ -108,8 +108,13 @@ RDEPENDS_${PN} += " \ | |||
| 108 | qtquickcontrols2-dev \ | 108 | qtquickcontrols2-dev \ |
| 109 | qtquickcontrols2-mkspecs \ | 109 | qtquickcontrols2-mkspecs \ |
| 110 | " | 110 | " |
| 111 | RDEPENDS_${PN}_remove_toolchain-clang_riscv32 = "qttools-dev qttools-mkspecs qttools-staticdev qttools-tools" | ||
| 112 | RDEPENDS_${PN}_remove_toolchain-clang_riscv64 = "qttools-dev qttools-mkspecs qttools-staticdev qttools-tools" | ||
| 111 | 113 | ||
| 112 | RRECOMMENDS_${PN} += " \ | 114 | RRECOMMENDS_${PN} += " \ |
| 113 | qtquickcontrols-qmlplugins \ | 115 | qtquickcontrols-qmlplugins \ |
| 114 | qttools-plugins \ | 116 | qttools-plugins \ |
| 115 | " | 117 | " |
| 118 | |||
| 119 | RRECOMMENDS_${PN}_remove_toolchain-clang_riscv32 = "qttools-plugins" | ||
| 120 | RRECOMMENDS_${PN}_remove_toolchain-clang_riscv64 = "qttools-plugins" | ||
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index a2717ee6..e76aa6aa 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb | |||
| @@ -35,6 +35,9 @@ EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" | |||
| 35 | 35 | ||
| 36 | EXTRANATIVEPATH += "chrpath-native" | 36 | EXTRANATIVEPATH += "chrpath-native" |
| 37 | 37 | ||
| 38 | COMPATIBLE_HOST_toolchain-clang_riscv32 = "null" | ||
| 39 | COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" | ||
| 40 | |||
| 38 | do_configure_append() { | 41 | do_configure_append() { |
| 39 | # Find native tools | 42 | # Find native tools |
| 40 | sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile | 43 | sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index fd6de101..1f1d7090 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -30,6 +30,9 @@ PACKAGECONFIG_append_toolchain-clang = " clang" | |||
| 30 | PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | 30 | PACKAGECONFIG[qtwebkit] = ",,qtwebkit" |
| 31 | PACKAGECONFIG[clang] = ",,clang" | 31 | PACKAGECONFIG[clang] = ",,clang" |
| 32 | 32 | ||
| 33 | COMPATIBLE_HOST_toolchain-clang_riscv32 = "null" | ||
| 34 | COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" | ||
| 35 | |||
| 33 | export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" | 36 | export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" |
| 34 | 37 | ||
| 35 | EXTRA_QMAKEVARS_PRE += " \ | 38 | EXTRA_QMAKEVARS_PRE += " \ |
diff --git a/recipes-qt/qwt/qwt-qt5_6.1.4.bb b/recipes-qt/qwt/qwt-qt5_6.1.4.bb index d8e1dcd2..623b45e5 100644 --- a/recipes-qt/qwt/qwt-qt5_6.1.4.bb +++ b/recipes-qt/qwt/qwt-qt5_6.1.4.bb | |||
| @@ -8,6 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" | |||
| 8 | 8 | ||
| 9 | DEPENDS = "qtbase qtsvg qttools" | 9 | DEPENDS = "qtbase qtsvg qttools" |
| 10 | 10 | ||
| 11 | COMPATIBLE_HOST_toolchain-clang_riscv32 = "null" | ||
| 12 | COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" | ||
| 13 | |||
| 11 | inherit qmake5 | 14 | inherit qmake5 |
| 12 | 15 | ||
| 13 | SRC_URI = " \ | 16 | SRC_URI = " \ |
