meson: merge two libelf-related clfags dependencies
Both libraries are used only by elf-utils.c. We can merge them.
This commit is contained in:
+6
-2
@@ -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',
|
||||
|
||||
@@ -405,7 +405,6 @@ libshared_deps = [libacl_cflags,
|
||||
libcrypt_cflags,
|
||||
libcryptsetup_cflags,
|
||||
libcurl_cflags,
|
||||
libdw_cflags,
|
||||
libelf_cflags,
|
||||
libfdisk_cflags,
|
||||
libfido2_cflags,
|
||||
|
||||
Reference in New Issue
Block a user