blob: 67d5041917ff720d5ff15c56a0c2b147363b38ae [file] [log] [blame]
Andrew Geissler706d5aa2021-02-12 15:55:30 -06001From ec335ef3bb903a7eaf054103cc51411e71e6448c Mon Sep 17 00:00:00 2001
Brad Bishop19323692019-04-05 15:28:33 -04002From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 27 May 2018 08:36:44 -0700
Andrew Geissler706d5aa2021-02-12 15:55:30 -06004Subject: [PATCH] Define glibc compatible basename() for non-glibc systems
Brad Bishop19323692019-04-05 15:28:33 -04005
6Fixes builds with musl, even though systemd is adamant about
7using non-posix basename implementation, we have a way out
8
9Upstream-Status: Inappropriate [musl specific]
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
Andrew Geissler706d5aa2021-02-12 15:55:30 -060012
Brad Bishop19323692019-04-05 15:28:33 -040013---
Andrew Geissler82c905d2020-04-13 13:39:40 -050014 src/machine/machine-dbus.c | 5 +++++
15 1 file changed, 5 insertions(+)
Brad Bishop19323692019-04-05 15:28:33 -040016
Andrew Geissler706d5aa2021-02-12 15:55:30 -060017Index: systemd-stable/src/machine/machine-dbus.c
18===================================================================
19--- systemd-stable.orig/src/machine/machine-dbus.c
20+++ systemd-stable/src/machine/machine-dbus.c
Andrew Geissler82c905d2020-04-13 13:39:40 -050021@@ -11,6 +11,11 @@
Brad Bishop19323692019-04-05 15:28:33 -040022 #include <libgen.h>
23 #undef basename
24
25+#if !defined(__GLIBC__)
Andrew Geissler82c905d2020-04-13 13:39:40 -050026+#include <string.h>
Brad Bishop19323692019-04-05 15:28:33 -040027+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
28+#endif
29+
30 #include "alloc-util.h"
31 #include "bus-common-errors.h"
Andrew Geissler635e0e42020-08-21 15:58:33 -050032 #include "bus-get-properties.h"