diff options
| author |   Ross Burton <ross.burton@arm.com> | 2022-12-13 16:17:30 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-21 10:16:25 +0000 |
| commit | 15bad54d61f9a9151dd4a2bace5d5feb3e7adc7a (patch) | |
| tree | d8c54bd562695783e93f1cc400a20340f0127b2d /meta/recipes-support/atk | |
| parent | f59ac932a6114eb662109ba958e591c34c93801c (diff) | |
| download | openembedded-core-15bad54d61f9a9151dd4a2bace5d5feb3e7adc7a.tar.gz | |
at-spi2-core: clean up x11 enabling
Use a single PACKAGECONFIG instead of a number of location conditionals.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/atk')
| -rw-r--r-- | meta/recipes-support/atk/at-spi2-core_2.46.0.bb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-support/atk/at-spi2-core_2.46.0.bb b/meta/recipes-support/atk/at-spi2-core_2.46.0.bb index 5ab501908d..f815a5eeb2 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.46.0.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.46.0.bb @@ -13,10 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "aa0c86c79f7a8d67bae49a5b7a5ab08430c608cffe6e33bf47a72f41ab03c3d0" -X11DEPENDS = "virtual/libx11 libxi libxtst" - DEPENDS = "dbus glib-2.0 libxml2" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" # For backwards compatibility PROVIDES += "atk at-spi2-atk" @@ -25,9 +22,10 @@ RPROVIDES:${PN} += "atk at-spi2-atk" 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 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-Dx11=yes', '-Dx11=no', d)} \ -" + -Ddbus_daemon=${bindir}/dbus-daemon" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "-Dx11=yes,-Dx11=no,virtual/libx11 libxi libxtst" GTKDOC_MESON_OPTION = "docs" |