summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Bergin <peter@berginkonsult.se>2019-01-19 22:35:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-21 12:25:03 +0000
commite80bfa6bdfc1ad97c6232f8387d1bf8a8c7a8b20 (patch)
treece2491ceaa2a91731c58ac7b996a2893af8b1e92
parent4f93e037357be63253bdf060afedb2f35afc4bfa (diff)
downloadopenembedded-core-contrib-e80bfa6bdfc1ad97c6232f8387d1bf8a8c7a8b20.tar.gz
openembedded-core-contrib-e80bfa6bdfc1ad97c6232f8387d1bf8a8c7a8b20.tar.bz2
openembedded-core-contrib-e80bfa6bdfc1ad97c6232f8387d1bf8a8c7a8b20.zip
at-spi2-core: only depend of x11 if in DISTRO_FEATURES
Build system for at-spi2-core package have auto detection of x11 dependency since version 2.26.1. Remove the hardcoded dependency in the recipe and let DISTRO_FEATURES decide. Signed-off-by: Peter Bergin <peter@berginkonsult.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.30.0.bb9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb b/meta/recipes-support/atk/at-spi2-core_2.30.0.bb
index d7ea9be87f..7d2d406cbc 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.30.0.bb
@@ -11,11 +11,12 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5"
SRC_URI[sha256sum] = "0175f5393d19da51f4c11462cba4ba6ef3fa042abf1611a70bdfed586b7bfb2b"
-DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst"
+X11DEPENDS = "virtual/libx11 libxi libxtst"
-inherit meson gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection
-# depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"
+DEPENDS = "dbus glib-2.0"
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
+
+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"