From 868542315f8c914f96ee55713f7a3e0d0154c3ae Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 13 Dec 2023 12:40:53 -0800 Subject: [PATCH] systemd: Fix build with latest musl musl has removed basename from string.h [1] which leads to build failures now as declaration is gone and it should be coming from libgen.h [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...patible-basename-for-non-glibc-syste.patch | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch index 7d74cfcc245..24dd6b0df17 100644 --- a/meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -13,22 +13,16 @@ Signed-off-by: Khem Raj src/machine/machine-dbus.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 45bc056326..aee51d5da5 100644 ---- a/src/machine/machine-dbus.c -+++ b/src/machine/machine-dbus.c -@@ -4,6 +4,11 @@ - #include - #include +--- a/src/basic/string-util.h ++++ b/src/basic/string-util.h +@@ -26,6 +26,10 @@ + #define URI_UNRESERVED ALPHANUMERICAL "-._~" /* [RFC3986] */ + #define URI_VALID URI_RESERVED URI_UNRESERVED /* [RFC3986] */ +#if !defined(__GLIBC__) -+#include +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + - #include "alloc-util.h" - #include "bus-common-errors.h" - #include "bus-get-properties.h" --- -2.39.2 - + static inline char* strstr_ptr(const char *haystack, const char *needle) { + if (!haystack || !needle) + return NULL; -- 2.47.3