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 14919bfce9f8391fc07e39ddd5d02cd2fc7ffaf3..8f629df5b7ba23f285459664c8a2762ba70ed0c7 100644 (file)
--- 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 f9367ac2265f05396536eb5e65bd6b818ba47af8..59511425c1d26832473b4b8971f55a69350e330c 100644 (file)
--- 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,