From: Karel Zak <kzak@redhat.com>
Date: Mon, 9 Mar 2026 10:03:54 +0000 (+0100)
Subject: lib/meson: move caputils.c from lib_common to per-binary sources
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=163b874561eccb5aa9d4bb11d1126cb32c6c3adf;p=thirdparty%2Futil-linux.git

lib/meson: move caputils.c from lib_common to per-binary sources

caputils.c is GPL-licensed, and libcommon should only contain LGPL
or public domain code (as stated in lib/Makemodule.am). Move it out
of lib_common_sources and add it directly to the sources of binaries
that use it (unshare, nsenter, setpriv), matching autotools.

Addresses: https://github.com/util-linux/util-linux/issues/4085
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/meson.build b/lib/meson.build
index f7ba093e3..35c6b2ca1 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -58,9 +58,10 @@ logindefs_c = static_library('logindefs',
 )
 selinux_utils_c = files('selinux-utils.c')
 
+caputils_c = files('caputils.c')
+
 if LINUX
   lib_common_sources += '''
-    caputils.c
     linux_version.c
     loopdev.c
 '''.split()
diff --git a/sys-utils/meson.build b/sys-utils/meson.build
index d9817f922..1614220ca 100644
--- a/sys-utils/meson.build
+++ b/sys-utils/meson.build
@@ -221,18 +221,21 @@ switch_root_manadocs = files('switch_root.8.adoc')
 unshare_sources = files(
   'unshare.c',
 ) + \
+    caputils_c + \
     exec_shell_c
 unshare_manadocs = files('unshare.1.adoc')
 
 nsenter_sources = files(
   'nsenter.c',
 ) + \
+    caputils_c + \
     exec_shell_c
 nsenter_manadocs = files('nsenter.1.adoc')
 
 setpriv_sources = files(
   'setpriv.c',
-)
+) + \
+    caputils_c
 if LINUX and conf.get('HAVE_LINUX_LANDLOCK_H').to_string() == '1'
   setpriv_sources += files('setpriv-landlock.c')
 endif