From: Chris Hofstaedtler <zeha@debian.org>
Date: Sun, 18 Dec 2022 18:55:01 +0000 (+0000)
Subject: meson: fix build with -Dselinux=enabled
X-Git-Tag: v2.39-rc1~360^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c07f7b4e4f40996ee72031651bd99a603bb276ab;p=thirdparty%2Futil-linux.git

meson: fix build with -Dselinux=enabled

Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
---

diff --git a/disk-utils/meson.build b/disk-utils/meson.build
index c1419e66dc..2bf3558346 100644
--- a/disk-utils/meson.build
+++ b/disk-utils/meson.build
@@ -14,6 +14,9 @@ mkswap_sources = files(
   'mkswap.c',
 ) + \
   ismounted_c
+if lib_selinux.found()
+  mkswap_sources += selinux_utils_c
+endif
 
 swaplabel_sources = files(
   'swaplabel.c',
diff --git a/lib/meson.build b/lib/meson.build
index 6d08dfe4ab..57833aa748 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -57,6 +57,7 @@ logindefs_c = static_library('logindefs',
   include_directories : dir_include,
   dependencies : lib_econf,
 )
+selinux_utils_c = files('selinux-utils.c')
 
 if LINUX
   lib_common_sources += '''
diff --git a/libmount/meson.build b/libmount/meson.build
index 6f2bba6ace..d454e9f9a2 100644
--- a/libmount/meson.build
+++ b/libmount/meson.build
@@ -72,6 +72,11 @@ lib_mount_static = static_library(
   dependencies : [realtime_libs],
   install : false)
 
+lib__mount_deps = [
+  lib_selinux,
+  get_option('cryptsetup-dlopen').enabled() ? lib_dl : lib_cryptsetup,
+  realtime_libs
+]
 lib_mount = library(
   'mount',
   link_whole : lib__mount,
@@ -83,9 +88,7 @@ lib_mount = library(
   link_args : ['-Wl,--version-script=@0@'.format(libmount_sym_path)],
   link_with : [lib_common,
                lib_blkid],
-  dependencies : [lib_selinux,
-                  get_option('cryptsetup-dlopen').enabled() ? lib_dl : lib_cryptsetup,
-                  realtime_libs],
+  dependencies : lib__mount_deps,
   install : build_libmount)
 mount_dep = declare_dependency(link_with: lib_mount, include_directories: '.')
 
@@ -124,7 +127,7 @@ foreach libmount_test: libmount_tests
     'src/' + libmount_test_src_override.get(libmount_test, libmount_test) + '.c',
     include_directories : [dir_include, dir_libblkid],
     link_with : [lib__mount, lib_common, lib_blkid_static],
-    dependencies : [lib_cryptsetup],
+    dependencies : lib__mount_deps,
     c_args : ['-DTEST_PROGRAM'],
   )
   # the test-setup expects the helpers in the toplevel build-directory
diff --git a/login-utils/meson.build b/login-utils/meson.build
index 647f568cd3..14d7b39efe 100644
--- a/login-utils/meson.build
+++ b/login-utils/meson.build
@@ -31,10 +31,7 @@ else
 endif
 
 if lib_selinux.found()
-  chfn_chsh_sources += files(
-    'selinux_utils.c',
-    'selinux_utils.h',
-  )
+  chfn_chsh_sources += selinux_utils_c
   chfn_chsh_deps += [lib_selinux]
 endif
 
diff --git a/meson.build b/meson.build
index 38e59bd9ae..ac385e8b25 100644
--- a/meson.build
+++ b/meson.build
@@ -2449,6 +2449,7 @@ exe = executable(
   'namei',
   namei_sources,
   include_directories : includes,
+  dependencies : [lib_selinux],
   install_dir : usrbin_exec_dir,
   install : true)
 exes += exe