diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2022-04-01 20:26:42 -0700 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-04-06 20:25:33 -0400 |
| commit | 6c422afeea818f186a65c408247a630bc5322050 (patch) | |
| tree | 37443a133c500d2edf80d9e97fba723179767c72 /meta-oe/recipes-extended | |
| parent | 28006d9af1120c49be497c118767a1b84a6f3438 (diff) | |
| download | meta-openembedded-contrib-6c422afeea818f186a65c408247a630bc5322050.tar.gz | |
wxwidgets: Fix checking for PACKAGECONFIG and DISTRO_FEATURES
The PACKAGECONFIG depends on DISTRO_FEATURES, not DISTRO_FEATURES depends on
PACKAGECONFIG. And the REQUIRED_DISTRO_FEATURES is not needed since it can work
with gtk or x11.
Fixed when x11 is not in DISTRO_FEATURES:
$ bitbake wxwidgets
ERROR: Nothing PROVIDES 'wxwidgets'
wxwidgets was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb index f9349b02ab..b10742eac6 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb @@ -10,10 +10,7 @@ LICENSE = "WXwindows" LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=981f50a934828620b08f44d75db557c6" inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt', 'cmake_qt5', 'cmake', d)} -inherit features_check lib_package binconfig pkgconfig - -# All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" +inherit lib_package binconfig pkgconfig DEPENDS += " \ jpeg \ @@ -46,7 +43,11 @@ EXTRA_OECMAKE:append:libc-musl = " \ -DHAVE_LOCALE_T=OFF \ " -PACKAGECONFIG ?= "gtk ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" +# All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', 'no_gui', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ +" + PACKAGECONFIG:remove:class-native = "opengl" # Note on toolkit-PACKAGECONFIGs: select exactly one of 'no_gui' / 'gtk' / 'qt' |