diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-06 12:32:13 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-10 18:16:10 +0200 |
| commit | 65028944ee13f5fa7939aa0b669ecc8ad358012d (patch) | |
| tree | b0bd5fcacb9b26cdfbcdbe8b9cf5568f59a8a729 /recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | |
| parent | eb59ee61d4bc967673346bc16f6585f7ab7cee55 (diff) | |
| parent | 5114e3057ceb4afc7f2ae9f71bb351f9e5c7f553 (diff) | |
Merge "Merge remote-tracking branch 'qt/5.14' into 5.15"
Diffstat (limited to 'recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb')
| -rwxr-xr-x | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index ef5cb01e..8c8bed30 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -3,16 +3,11 @@ DESCRIPTION = "Target packages for Qt5 SDK" LICENSE = "MIT" -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" -# Requires Ruby to work -USE_RUBY ?= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-dev', '', d)} \ -" - # Requires Wayland to work USE_WAYLAND = " \ qtwayland-dev \ @@ -90,7 +85,6 @@ RDEPENDS_${PN} += " \ qttools-staticdev \ qttools-tools \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \ - ${USE_RUBY} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \ qtwebsockets-dev \ qtwebsockets-mkspecs \ |