mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 00:14:32 +09:00
Revert "musl: meson: add libutmps support"
This reverts commit bf9bc5beb0.
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.
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -49,7 +49,6 @@ executables += [
|
||||
'include_directories' : [libexec_template['include_directories'], include_directories('.')],
|
||||
'extract' : systemd_logind_extract_sources,
|
||||
'dependencies' : [
|
||||
libutmps,
|
||||
threads,
|
||||
],
|
||||
},
|
||||
|
||||
@@ -385,7 +385,6 @@ libshared_deps = [threads,
|
||||
librt,
|
||||
libseccomp_cflags,
|
||||
libselinux_cflags,
|
||||
libutmps,
|
||||
libxenctrl_cflags,
|
||||
libxz_cflags,
|
||||
libzstd_cflags,
|
||||
|
||||
@@ -473,7 +473,6 @@ executables += [
|
||||
test_template + {
|
||||
'sources' : files('test-utmp.c'),
|
||||
'conditions' : ['ENABLE_UTMP'],
|
||||
'dependencies' : libutmps,
|
||||
},
|
||||
test_template + {
|
||||
'sources' : files('test-varlink.c'),
|
||||
|
||||
Reference in New Issue
Block a user