tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From ae7ecfc9487756659077e126bfd296146125a59d Mon Sep 17 00:00:00 2001
2From: Alyssa Ross <hi@alyssa.is>
3Date: Sun, 13 Oct 2024 18:03:47 +0200
4Subject: [PATCH] Add missing musl_missing.h includes for basename
5
6Link: https://github.com/elogind/elogind/pull/292
7---
8 src/basic/cgroup-util.c | 1 +
9 src/libelogind/sd-bus/test-bus-watch-bind.c | 2 ++
10 src/login/logind-inhibit.c | 2 ++
11 src/login/logind-seat.c | 2 ++
12 src/login/logind-session.c | 1 +
13 src/test/test-fileio.c | 2 ++
14 src/test/test-mountpoint-util.c | 1 +
15 src/test/test-path-util.c | 2 ++
16 8 files changed, 13 insertions(+)
17
18diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
19index 90cfeb570..c57fe54d0 100644
20--- a/src/basic/cgroup-util.c
21+++ b/src/basic/cgroup-util.c
22@@ -40,6 +40,7 @@
23 //#include "xattr-util.h"
24 /// Additional includes needed by elogind
25 #include "env-file.h"
26+#include "musl_missing.h"
27
28 static int cg_enumerate_items(const char *controller, const char *path, FILE **ret, const char *item) {
29 _cleanup_free_ char *fs = NULL;
30diff --git a/src/libelogind/sd-bus/test-bus-watch-bind.c b/src/libelogind/sd-bus/test-bus-watch-bind.c
31index d6938a7f0..3227c17d7 100644
32--- a/src/libelogind/sd-bus/test-bus-watch-bind.c
33+++ b/src/libelogind/sd-bus/test-bus-watch-bind.c
34@@ -17,6 +17,8 @@
35 #include "string-util.h"
36 #include "tmpfile-util.h"
37 #include "tests.h"
38+/// Additional includes needed by elogind
39+#include "musl_missing.h"
40
41 static int method_foobar(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
42 log_info("Got Foobar() call.");
43diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
44index 86d1f84b3..4140f1aae 100644
45--- a/src/login/logind-inhibit.c
46+++ b/src/login/logind-inhibit.c
47@@ -26,6 +26,8 @@
48 #include "string-util.h"
49 #include "tmpfile-util.h"
50 #include "user-util.h"
51+/// Additional includes needed by elogind
52+#include "musl_missing.h"
53
54 static void inhibitor_remove_fifo(Inhibitor *i);
55
56diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
57index bef542d94..f520562ad 100644
58--- a/src/login/logind-seat.c
59+++ b/src/login/logind-seat.c
60@@ -24,6 +24,8 @@
61 #include "string-util.h"
62 #include "terminal-util.h"
63 #include "tmpfile-util.h"
64+/// Additional includes needed by elogind
65+#include "musl_missing.h"
66
67 int seat_new(Seat** ret, Manager *m, const char *id) {
68 _cleanup_(seat_freep) Seat *s = NULL;
69diff --git a/src/login/logind-session.c b/src/login/logind-session.c
70index ea69c2e6c..90ddec899 100644
71--- a/src/login/logind-session.c
72+++ b/src/login/logind-session.c
73@@ -42,6 +42,7 @@
74 /// Additional includes needed by elogind
75 #include "cgroup-setup.h"
76 #include "extract-word.h"
77+#include "musl_missing.h"
78
79 #define RELEASE_USEC (20*USEC_PER_SEC)
80
81diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
82index b9b82e7ff..db981bd41 100644
83--- a/src/test/test-fileio.c
84+++ b/src/test/test-fileio.c
85@@ -25,6 +25,8 @@
86 #include "strv.h"
87 #include "tests.h"
88 #include "tmpfile-util.h"
89+/// Additional includes needed by elogind
90+#include "musl_missing.h"
91
92 #if 0 /// elogind does not need load_/write_/merge_env_file()
93 TEST(parse_env_file) {
94diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c
95index de526100f..9d37ce77d 100644
96--- a/src/test/test-mountpoint-util.c
97+++ b/src/test/test-mountpoint-util.c
98@@ -16,6 +16,7 @@
99 #include "string-util.h"
100 #include "tests.h"
101 /// Addition includes needed by elogind
102+#include "musl_missing.h"
103 #include "virt.h"
104 #include "tmpfile-util.h"
105
106diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
107index 76fda746a..1df305d30 100644
108--- a/src/test/test-path-util.c
109+++ b/src/test/test-path-util.c
110@@ -16,6 +16,8 @@
111 #include "strv.h"
112 #include "tests.h"
113 #include "tmpfile-util.h"
114+/// Additional includes needed by elogind
115+#include "musl_missing.h"
116
117 TEST(print_paths) {
118 log_info("DEFAULT_PATH=%s", DEFAULT_PATH);
119--
1202.46.0
121