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 fc305a85652d2502570c31d7b64d6b8a0b2d978a..055ee31ee4c556ee7e755b19e067f7a46e926480 100644 (file)
--- 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 e6cd002c6cc1ded34627add2029f51f16aba7c3f..0ad9beb16784add728b6a4b7fdc717a21bd6e505 100644 (file)
--- 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 eebadf6d3f1226bdead931aced5d105d29d43f4f..acc80d3e347c3d19ea38f7bd9ca87034dd6bfc2d 100644 (file)
--- 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 d51911bd5bb3cec2452bfe10b6475254d7643667..f5b13368844b90d25b6a6494bc5b2ebff7466087 100644 (file)
--- 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'),