musl: meson: add libutmps support

musl only provides fake functions, hence even with -Dutmp=true,
utmp/wtmp functionalities do not work. Let's allow to build with
libutmps.

diff --git a/meson.build b/meson.build
index 055ee31ee4c556ee7e755b19e067f7a46e926480..fc305a85652d2502570c31d7b64d6b8a0b2d978a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1028,6 +1028,7 @@ 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 0ad9beb16784add728b6a4b7fdc717a21bd6e505..e6cd002c6cc1ded34627add2029f51f16aba7c3f 100644 (file)
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -49,6 +49,7 @@ 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 acc80d3e347c3d19ea38f7bd9ca87034dd6bfc2d..eebadf6d3f1226bdead931aced5d105d29d43f4f 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -385,6 +385,7 @@ 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 9f89ce8e58a20978dece8acb9004cb13716a39a0..919d622ac660ba5429aa25fe8108c29c8bd67b6e 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -472,6 +472,7 @@ executables += [
         test_template + {
                 'sources' : files('test-utmp.c'),
                 'conditions' : ['ENABLE_UTMP'],
+                'dependencies' : libutmps,
         },
         test_template + {
                 'sources' : files('test-varlink.c'),