diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-05-28 08:58:32 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-29 21:07:17 +0100 |
commit | 43f7ea8d0d90180370234899f81995f51bf05e88 (patch) | |
tree | dfdb98e572bb70919941b827d410250fb9182584 /meta/recipes-core/systemd/systemd | |
parent | bed11ee92a7ac871909a04f751732dbf02ab7c85 (diff) | |
download | poky-43f7ea8d0d90180370234899f81995f51bf05e88.tar.gz |
systemd: Define basename() for musl
(From OE-Core rev: 167098cdd875a02221ff6d15f443c02c1bcdc33f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch new file mode 100644 index 0000000000..736d525ad3 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 5f1f064c81ea30acf93cfa0fb466b38f094f488c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 27 May 2018 08:36:44 -0700 | ||
4 | Subject: [PATCH] Define glibc compatible basename() for non-glibc systems | ||
5 | |||
6 | Fixes builds with musl, even though systemd is adamant about | ||
7 | using non-posix basename implementation, we have a way out | ||
8 | |||
9 | Upstream-Status: Inappropriate [musl specific] | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | src/machine/machine-dbus.c | 4 ++++ | ||
14 | 1 file changed, 4 insertions(+) | ||
15 | |||
16 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c | ||
17 | index 2d7806491b..9a3bdb1d76 100644 | ||
18 | --- a/src/machine/machine-dbus.c | ||
19 | +++ b/src/machine/machine-dbus.c | ||
20 | @@ -29,6 +29,10 @@ | ||
21 | #include <libgen.h> | ||
22 | #undef basename | ||
23 | |||
24 | +#if !defined(__GLIBC__) | ||
25 | +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) | ||
26 | +#endif | ||
27 | + | ||
28 | #include "alloc-util.h" | ||
29 | #include "bus-common-errors.h" | ||
30 | #include "bus-internal.h" | ||
31 | -- | ||
32 | 2.17.0 | ||
33 | |||