From f8908b147d888426811356d7ccd7547f3519fe29 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 4 Aug 2025 20:54:25 +0100 Subject: [PATCH] dbus: glib is only used in the test suite The glib/gio libraries are only used in a few of the tests: $ grep use_glib meson.build:use_glib = glib.found() and gio.found() test/meson.build:if use_glib test/meson.build:if message_bus and tools and platform_unix and use_glib test/meson.build:if use_glib test/meson.build:if message_bus and tools and platform_unix and use_glib So there's no need to depend on glib if we're not building the tests. Explicitly enable/disable the modular tests option to ensure that when the tests are not being installed we don't still need glib to build them. Signed-off-by: Ross Burton Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus_1.16.2.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/dbus/dbus_1.16.2.bb b/meta/recipes-core/dbus/dbus_1.16.2.bb index 909a209fc7..1876ea8a94 100644 --- a/meta/recipes-core/dbus/dbus_1.16.2.bb +++ b/meta/recipes-core/dbus/dbus_1.16.2.bb @@ -20,7 +20,6 @@ SRC_URI[sha256sum] = "0ba2a1a4b16afe7bceb2c07e9ce99a8c2c3508e5dec290dbb643384bd6 EXTRA_OEMESON = "-Dxml_docs=disabled \ -Ddoxygen_docs=disabled \ -Dsystem_socket=/run/dbus/system_bus_socket \ - -Dmodular_tests=enabled \ -Dchecks=true \ -Druntime_dir=${runtimedir} \ -Dtest_socket_dir=/tmp \ @@ -41,9 +40,9 @@ PACKAGECONFIG[user-session] = "-Duser_session=true -Dsystemd_user_unitdir=${syst PACKAGECONFIG[verbose-mode] = "-Dverbose_mode=true,-Dverbose_mode=false,," PACKAGECONFIG[audit] = "-Dlibaudit=enabled,-Dlibaudit=disabled,audit" PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" -PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" +PACKAGECONFIG[tests] = "-Dmodular_tests=enabled -Dinstalled_tests=true,-Dmodular_tests=disabled -Dinstalled_tests=false,glib-2.0" -DEPENDS = "expat virtual/libintl glib-2.0" +DEPENDS = "expat virtual/libintl" RDEPENDS:${PN} += "${PN}-common ${PN}-tools" RDEPENDS:${PN}:class-native = "" -- 2.47.2