summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2025-07-14 11:18:06 +0200
committerKhem Raj <raj.khem@gmail.com>2025-07-15 00:25:31 -0700
commit1a2fb37a4cb169ceed379c0a2d4e481fca11adf3 (patch)
treeecf19803656fc202e9d7b923fdd29538753e871e
parentb687e952d5eb6f24add5a511434dd48b86654108 (diff)
downloadmeta-openembedded-1a2fb37a4cb169ceed379c0a2d4e481fca11adf3.tar.gz
wxwidgets: enable webkit only with x11 or wayland
* otherwise webkit enabled by default in 7c3dccab64f2c1733169d6fcba56eeb139a05b45 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>
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb
index ce45d366c0..4a531f30ae 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb
@@ -46,7 +46,7 @@ EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"'
46PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \ 46PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ 47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
48" 48"
49PACKAGECONFIG:append:class-target = " mediactrl webkit" 49PACKAGECONFIG:append:class-target = " mediactrl ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'webkit', '', d)}"
50 50
51PACKAGECONFIG:remove:class-native = "opengl" 51PACKAGECONFIG:remove:class-native = "opengl"
52 52