mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
frr: Fix build on newer musl
provide GNU like basename on non-glibc systems Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
704e3e0a3d
commit
3f08151bf4
|
|
@ -0,0 +1,34 @@
|
|||
From 49aeccbec4bf620bb594999bbd4a9de669a3984c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 15 Mar 2024 14:34:06 -0700
|
||||
Subject: [PATCH] zebra: Mimic GNU basename() API for non-glibc library e.g.
|
||||
musl musl only provides POSIX version of basename and it has also removed
|
||||
providing it via string.h header [1] which now results in compile errors with
|
||||
newer compilers e.g. clang-18
|
||||
|
||||
[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/15561/]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
zebra/zebra_netns_notify.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c
|
||||
index 1bb1292e34..d55df2f62d 100644
|
||||
--- a/zebra/zebra_netns_notify.c
|
||||
+++ b/zebra/zebra_netns_notify.c
|
||||
@@ -41,6 +41,10 @@
|
||||
#define ZEBRA_NS_POLLING_INTERVAL_MSEC 1000
|
||||
#define ZEBRA_NS_POLLING_MAX_RETRIES 200
|
||||
|
||||
+#if !defined(__GLIBC__)
|
||||
+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
|
||||
+#endif
|
||||
+
|
||||
DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo");
|
||||
static struct event *zebra_netns_notify_current;
|
||||
|
||||
--
|
||||
2.44.0
|
||||
|
||||
|
|
@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a
|
|||
|
||||
SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \
|
||||
file://frr.pam \
|
||||
file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \
|
||||
"
|
||||
|
||||
SRCREV = "ca2d6f0f1e000951224a18973cc1827f7f5215b5"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user