diff --git a/meson.build b/meson.build index fc305a8565..3f50b58578 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. @@ -1688,7 +1687,7 @@ foreach tuple : [ ['timesyncd'], ['tmpfiles'], ['tpm'], - ['utmp'], + ['utmp', get_option('libc') != 'musl', 'musl does not support it'], ['userdb'], ['vconsole'], ['xdg-autostart'], diff --git a/src/include/musl/utmpx.h b/src/include/musl/utmpx.h deleted file mode 100644 index d95fc8f25e..0000000000 --- a/src/include/musl/utmpx.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -#pragma once - -#include_next - -#ifndef UTMPX_FILE -#define UTMPX_FILE "/run/utmp" -#endif - -#ifndef WTMPX_FILE -#define WTMPX_FILE "/var/log/wtmp" -#endif - -#ifndef ACCOUNTING -#define ACCOUNTING 9 -#endif diff --git a/src/login/meson.build b/src/login/meson.build index e6cd002c6c..0ad9beb167 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 eebadf6d3f..acc80d3e34 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 d51911bd5b..f5b1336884 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'),