From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 28 Oct 2022 23:58:25 +0000 (-0700)
Subject: meson: remove some unused variables
X-Git-Tag: v2.39-rc1~449^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7da59534f846681c9f13af36378383395ebe7639;p=thirdparty%2Futil-linux.git

meson: remove some unused variables

Found with muon's analyze.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/libblkid/meson.build b/libblkid/meson.build
index 6e9d28208d..01572af75a 100644
--- a/libblkid/meson.build
+++ b/libblkid/meson.build
@@ -4,7 +4,7 @@ defs = configuration_data()
 defs.set('LIBBLKID_DATE', libblkid_date)
 defs.set('LIBBLKID_VERSION', pc_version)
 
-blkid_h = configure_file(
+configure_file(
   input : 'src/blkid.h.in',
   output : 'blkid.h',
   configuration : defs,
diff --git a/libfdisk/meson.build b/libfdisk/meson.build
index 26c6f95fcc..eaab9e1389 100644
--- a/libfdisk/meson.build
+++ b/libfdisk/meson.build
@@ -6,7 +6,7 @@ defs.set('LIBFDISK_MAJOR_VERSION', pc_version.split('.')[0])
 defs.set('LIBFDISK_MINOR_VERSION', pc_version.split('.')[1])
 defs.set('LIBFDISK_PATCH_VERSION', pc_version.split('.')[2])
 
-libfdisk_h = configure_file(
+configure_file(
   input : 'src/libfdisk.h.in',
   output : 'libfdisk.h',
   configuration : defs,
diff --git a/libmount/meson.build b/libmount/meson.build
index c66ceb8e28..bb8fe13f6f 100644
--- a/libmount/meson.build
+++ b/libmount/meson.build
@@ -6,7 +6,7 @@ defs.set('LIBMOUNT_MAJOR_VERSION', pc_version.split('.')[0])
 defs.set('LIBMOUNT_MINOR_VERSION', pc_version.split('.')[1])
 defs.set('LIBMOUNT_PATCH_VERSION', pc_version.split('.')[2])
 
-libmount_h = configure_file(
+configure_file(
   input : 'src/libmount.h.in',
   output : 'libmount.h',
   configuration : defs,
diff --git a/libsmartcols/meson.build b/libsmartcols/meson.build
index 3692c03ecc..122b1e8a85 100644
--- a/libsmartcols/meson.build
+++ b/libsmartcols/meson.build
@@ -3,7 +3,7 @@ dir_libsmartcols = include_directories('.', 'src')
 defs = configuration_data()
 defs.set('LIBSMARTCOLS_VERSION', pc_version)
 
-libsmartcols_h = configure_file(
+configure_file(
   input : 'src/libsmartcols.h.in',
   output : 'libsmartcols.h',
   configuration : defs,
diff --git a/meson.build b/meson.build
index 5e920e6e53..e6f7ad05db 100644
--- a/meson.build
+++ b/meson.build
@@ -25,8 +25,6 @@ runstatedir = '/run'
 execprefixdir = prefixdir
 usrbin_exec_dir = join_paths(execprefixdir, bindir)
 usrsbin_exec_dir = join_paths(execprefixdir, sbindir)
-sysconfdir = '/etc'
-localstatedir = '/var'
 bash_completion = dependency('bash-completion', required : get_option('build-bash-completion'))
 
 vendordir = get_option('vendordir')
@@ -211,11 +209,6 @@ lib_tinfo = dependency(
   'tinfo',
   required : get_option('tinfo'))
 
-lib_tinfo_static = dependency(
-  'tinfo',
-  static : true,
-  required : need_static_libs ? get_option('tinfo') : disabler())
-
 lib_ncursesw = dependency(
   'ncursesw',
   required : get_option('ncursesw'))
@@ -777,7 +770,7 @@ bison_gen = generator(
 meson_make_symlink = meson.current_source_dir() + '/tools/meson-make-symlink.sh'
 meson_make_manpage_stub = meson.current_source_dir() + '/tools/meson-make-manpage-stub.sh'
 
-config_h = configure_file(
+configure_file(
   output : 'config.h',
   configuration : conf)