Use a single PACKAGECONFIG instead of a number of location conditionals.
Signed-off-by: Ross Burton <[email protected]>
---
meta/recipes-support/atk/at-spi2-core_2.46.0.bb | 10 ++++------
1 file 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 5ab501908d5..f815a5eeb21 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"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#174541):
https://lists.openembedded.org/g/openembedded-core/message/174541
Mute This Topic: https://lists.openembedded.org/mt/95647795/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
