From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 3 Jul 2026 07:38:47 +0000 (+0900)
Subject: meson: merge two libelf-related clfags dependencies
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c5cbc970a976999d07664984599e6661f8ccd30;p=thirdparty%2Fsystemd.git

meson: merge two libelf-related clfags dependencies

Both libraries are used only by elf-utils.c.
We can merge them.
---

diff --git a/meson.build b/meson.build
index 14919bfce9f..8f629df5b7b 100644
--- a/meson.build
+++ b/meson.build
@@ -1258,10 +1258,14 @@ conf.set('TPM2_NVPCR_BASE', get_option('tpm2-nvpcr-base'))
 libdw = dependency('libdw',
                    version : '>=0.177',
                    required : get_option('elfutils'))
-libdw_cflags = libdw.partial_dependency(includes: true, compile_args: true)
 libelf = dependency('libelf',
                     required : get_option('elfutils'))
-libelf_cflags = libelf.partial_dependency(includes: true, compile_args: true)
+libelf_cflags = declare_dependency(
+        dependencies : [
+                libelf.partial_dependency(includes: true, compile_args: true),
+                libdw.partial_dependency(includes: true, compile_args: true),
+        ],
+)
 conf.set10('HAVE_ELFUTILS', libdw.found() and libelf.found())
 
 libz = dependency('zlib',
diff --git a/src/shared/meson.build b/src/shared/meson.build
index f9367ac2265..59511425c1d 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -405,7 +405,6 @@ libshared_deps = [libacl_cflags,
                   libcrypt_cflags,
                   libcryptsetup_cflags,
                   libcurl_cflags,
-                  libdw_cflags,
                   libelf_cflags,
                   libfdisk_cflags,
                   libfido2_cflags,