diff options
author | Peter Bergin <peter@berginkonsult.se> | 2019-01-19 22:35:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-21 23:44:22 +0000 |
commit | e753fa037217b41e156ba9484dccf77965e72ef9 (patch) | |
tree | e238ae053a6263447dd289ca5d959b3541c276e2 | |
parent | ccce89d5c08739dbdb972da3fb0cbbb92f467799 (diff) | |
download | poky-e753fa037217b41e156ba9484dccf77965e72ef9.tar.gz |
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.
(From OE-Core rev: e80bfa6bdfc1ad97c6232f8387d1bf8a8c7a8b20)
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.bb | 9 |
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 \ | |||
11 | SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5" | 11 | SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5" |
12 | SRC_URI[sha256sum] = "0175f5393d19da51f4c11462cba4ba6ef3fa042abf1611a70bdfed586b7bfb2b" | 12 | SRC_URI[sha256sum] = "0175f5393d19da51f4c11462cba4ba6ef3fa042abf1611a70bdfed586b7bfb2b" |
13 | 13 | ||
14 | DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" | 14 | X11DEPENDS = "virtual/libx11 libxi libxtst" |
15 | 15 | ||
16 | inherit meson gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection | 16 | DEPENDS = "dbus glib-2.0" |
17 | # depends on virtual/libx11 | 17 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" |
18 | REQUIRED_DISTRO_FEATURES = "x11" | 18 | |
19 | inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection | ||
19 | 20 | ||
20 | EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ | 21 | EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ |
21 | -Ddbus_daemon=${bindir}/dbus-daemon" | 22 | -Ddbus_daemon=${bindir}/dbus-daemon" |