From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 3 Jul 2026 02:12:43 +0000 (+0900)
Subject: meson: merge three glib cflags dependencies
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cff424864d78f8f1cbb6b00ff5866e440e879bfc;p=thirdparty%2Fsystemd.git

meson: merge three glib cflags dependencies

They are always used together, and only used by a unit test.
Fine-graded cflags dependencies are not necessary.
---

diff --git a/meson.build b/meson.build
index 8038ae61f3b..14919bfce9f 100644
--- a/meson.build
+++ b/meson.build
@@ -1353,9 +1353,13 @@ libgobject = dependency('gobject-2.0',
 libgio =     dependency('gio-2.0',
                         required : get_option('glib'))
 conf.set10('HAVE_GLIB', libglib.found() and libgobject.found() and libgio.found())
-libglib_cflags = libglib.partial_dependency(includes: true, compile_args: true)
-libgobject_cflags = libgobject.partial_dependency(includes: true, compile_args: true)
-libgio_cflags = libgio.partial_dependency(includes: true, compile_args: true)
+libglib_cflags = declare_dependency(
+        dependencies : [
+                libglib.partial_dependency(includes: true, compile_args: true),
+                libgobject.partial_dependency(includes: true, compile_args: true),
+                libgio.partial_dependency(includes: true, compile_args: true),
+        ],
+)
 
 libdbus = dependency('dbus-1',
                      version : '>= 1.3.2',
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index e393d7e86d8..cd3821bb8d6 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -226,9 +226,7 @@ libsystemd_tests += [
                 'sources' : files('sd-bus/test-bus-marshal.c'),
                 'dependencies' : [
                         libdbus_cflags,
-                        libgio_cflags,
                         libglib_cflags,
-                        libgobject_cflags,
                 ],
         },
         {