mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
libxfce4ui: update REQUIRED_DISTRO_FEATURES
Refer [1], when DISTRO_FEATURES contains opengl, but not x11, world build will report: ERROR: Nothing PROVIDES 'libice' (but /build/layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.20.2.bb DEPENDS on or otherwise requires it) libice was skipped: using DISTRO 'poky', which is missing required DISTRO_FEATURES: 'x11' [1] https://git.openembedded.org/meta-openembedded/commit/?id=bd206048b6fabe22a67058aaf250a28d00d92135 Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
bd98b8e5cd
commit
4cb76735a5
@ -10,6 +10,7 @@ inherit xfce gtk-doc gobject-introspection features_check
|
||||
# xfce4 depends on libwnck3. gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
|
||||
# cairo would at least needed to be built with xlib.
|
||||
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||
REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','opengl', "", d)}"
|
||||
|
||||
# TODO: Check if 0001-... can go
|
||||
SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch"
|
||||
@ -19,7 +20,7 @@ EXTRA_OECONF += "--with-vendor-info=${DISTRO}"
|
||||
EXTRA_OECONF += "--disable-vala"
|
||||
|
||||
PACKAGECONFIG ??= " \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl','x11', "", d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11','x11', "", d)} \
|
||||
"
|
||||
PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade"
|
||||
PACKAGECONFIG[x11] = "--enable-startup-notification,--disable-startup-notification,libepoxy libice libsm startup-notification"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user