mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 12:32:13 +02:00
at-spi2: Make X11 support truly optional
X11 support in at-spi2-core can be turned off at compile time, so leverage this and disable it when X11 is not present in DISTRO_FEATURES. (From OE-Core rev: be18dabdb28703c889f97faadbaec07e76d5e8bd) Signed-off-by: Philippe Normand <philn@igalia.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
fe44532408
commit
67edffa0ae
@@ -11,9 +11,6 @@ DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2"
|
||||
GNOMEBASEBUILDCLASS = "meson"
|
||||
inherit gnomebase distro_features_check upstream-version-is-even
|
||||
|
||||
# The at-spi2-core requires x11 in DISTRO_FEATURES
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
PACKAGES =+ "${PN}-gnome ${PN}-gtk2"
|
||||
|
||||
FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules"
|
||||
|
||||
@@ -18,7 +18,9 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '',
|
||||
inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection
|
||||
|
||||
EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \
|
||||
-Ddbus_daemon=${bindir}/dbus-daemon"
|
||||
-Ddbus_daemon=${bindir}/dbus-daemon \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-Dx11=yes', '-Dx11=no', d)} \
|
||||
"
|
||||
|
||||
GTKDOC_MESON_OPTION = "docs"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user