From de726faaee02c4d8eb7d5d31fa459f416393b716 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 24 Sep 2024 16:31:50 -0700 Subject: [PATCH] meson: demote two libraries to library static versions are not explicitly used anywhere. Signed-off-by: Rosen Penev --- libfdisk/meson.build | 12 +++--------- liblastlog2/meson.build | 2 +- libuuid/meson.build | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/libfdisk/meson.build b/libfdisk/meson.build index 58b2222e5..498102ad1 100644 --- a/libfdisk/meson.build +++ b/libfdisk/meson.build @@ -56,15 +56,7 @@ lib__fdisk = static_library( include_directories : lib_fdisk_includes, dependencies : build_libfdisk ? [] : disabler()) -lib_fdisk_static = static_library( - 'fdisk_static', - link_whole : lib__fdisk, - link_with : [lib_common, - lib_uuid.get_static_lib()], - dependencies : [blkid_static_dep], - install : false) - -lib_fdisk = library( +lib_fdisk = both_libraries( 'fdisk', link_whole : lib__fdisk, link_depends : libfdisk_sym, @@ -76,6 +68,8 @@ lib_fdisk = library( install : build_libfdisk) fdisk_dep = declare_dependency(link_with: lib_fdisk, include_directories: '.') +lib_fdisk_static = lib_fdisk.get_static_lib() + if build_libfdisk pkgconfig.generate(lib_fdisk, description : 'fdisk library', diff --git a/liblastlog2/meson.build b/liblastlog2/meson.build index 6f8db53cf..2448c7f19 100644 --- a/liblastlog2/meson.build +++ b/liblastlog2/meson.build @@ -11,7 +11,7 @@ liblastlog2_sym = 'src/liblastlog2.sym' liblastlog2_sym_path = '@0@/@1@'.format(meson.current_source_dir(), liblastlog2_sym) if build_liblastlog2 - lib_lastlog2 = both_libraries( + lib_lastlog2 = library( 'lastlog2', lib_lastlog2_sources, include_directories : [dir_include], diff --git a/libuuid/meson.build b/libuuid/meson.build index a4d62d225..7fa541079 100644 --- a/libuuid/meson.build +++ b/libuuid/meson.build @@ -31,7 +31,7 @@ endif thread_dep = dependency('threads') -lib_uuid = both_libraries( +lib_uuid = library( 'uuid', list_h, lib_uuid_sources, -- 2.47.3