From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 17 Nov 2025 17:45:28 +0000 (+0900)
Subject: Revert "musl: meson: add libutmps support"
X-Git-Tag: v259-rc1~5^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ecff590656eb29d2a747d405fbd132f69f4cc01;p=thirdparty%2Fsystemd.git

Revert "musl: meson: add libutmps support"

This reverts commit bf9bc5beb090bb35184caf34cc641e708615e83a.

libutmps does not support utmpxname(), the function always fails
with ENOSYS, and always uses their own file.
However, our code relies on the funtion needs to succeed.

Let's revert the change now, and revisit later when musl users
request to support libutmps.
---

diff --git a/meson.build b/meson.build
index fc305a85652..055ee31ee4c 100644
--- a/meson.build
+++ b/meson.build
@@ -1028,7 +1028,6 @@ threads = dependency('threads')
 librt = cc.find_library('rt')
 libm = cc.find_library('m')
 libdl = cc.find_library('dl')
-libutmps = dependency('libutmps', required : false)
 
 # On some distributions that use musl (e.g. Alpine), libintl.h may be provided by gettext rather than musl.
 # In that case, we need to explicitly link with libintl.so.
diff --git a/src/login/meson.build b/src/login/meson.build
index e6cd002c6cc..0ad9beb1678 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -49,7 +49,6 @@ executables += [
                 'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                 'extract' : systemd_logind_extract_sources,
                 'dependencies' : [
-                        libutmps,
                         threads,
                 ],
         },
diff --git a/src/shared/meson.build b/src/shared/meson.build
index eebadf6d3f1..acc80d3e347 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -385,7 +385,6 @@ libshared_deps = [threads,
                   librt,
                   libseccomp_cflags,
                   libselinux_cflags,
-                  libutmps,
                   libxenctrl_cflags,
                   libxz_cflags,
                   libzstd_cflags,
diff --git a/src/test/meson.build b/src/test/meson.build
index d51911bd5bb..f5b13368844 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -473,7 +473,6 @@ executables += [
         test_template + {
                 'sources' : files('test-utmp.c'),
                 'conditions' : ['ENABLE_UTMP'],
-                'dependencies' : libutmps,
         },
         test_template + {
                 'sources' : files('test-varlink.c'),