mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
wxwidgets: enable webkit only with x11 or wayland
* otherwise webkit enabled by default in 7c3dccab64 will
conflict with no_gui PACKAGECONFIG which is enabled in DISTROs without x11 and wayland
* fixes:
ERROR: meta-oe/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb:
wxwidgets: PACKAGECONFIG[webkit] Conflict package config 'no_gui' set in PACKAGECONFIG.
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
b687e952d5
commit
1a2fb37a4c
|
|
@ -46,7 +46,7 @@ EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"'
|
|||
PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
|
||||
"
|
||||
PACKAGECONFIG:append:class-target = " mediactrl webkit"
|
||||
PACKAGECONFIG:append:class-target = " mediactrl ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'webkit', '', d)}"
|
||||
|
||||
PACKAGECONFIG:remove:class-native = "opengl"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user