mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
util-linux: Fix build with latest musl
Musl has removed basename declaration in string.h which exposes this error. (From OE-Core rev: c9ac0d6136bfb126c022d13fcafb94f8ee16052e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -36,6 +36,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
|
|||||||
file://display_testname_for_subtest.patch \
|
file://display_testname_for_subtest.patch \
|
||||||
file://avoid_parallel_tests.patch \
|
file://avoid_parallel_tests.patch \
|
||||||
file://0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch \
|
file://0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch \
|
||||||
|
file://0001-login-utils-include-libgen.h-for-basename-API.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f"
|
SRC_URI[sha256sum] = "87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f"
|
||||||
|
|||||||
+57
@@ -0,0 +1,57 @@
|
|||||||
|
From 6581cf8ac95b99b5a35fea88c52646558d05b5e7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sun, 3 Dec 2023 19:59:46 -0800
|
||||||
|
Subject: [PATCH] login-utils: include libgen.h for basename API
|
||||||
|
|
||||||
|
musl has removed the non-prototype declaration of basename from string.h [1] which now results in build errors with clang-17+ compiler
|
||||||
|
|
||||||
|
include libgen.h for using the posix declaration of the funciton.
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
|
||||||
|
../util-linux-2.39.2/login-utils/su-common.c:847:20: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
|
||||||
|
847 | shell_basename = basename(shell);
|
||||||
|
| ^
|
||||||
|
|
||||||
|
[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2615]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
login-utils/su-common.c | 8 ++++++--
|
||||||
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
--- a/login-utils/su-common.c
|
||||||
|
+++ b/login-utils/su-common.c
|
||||||
|
@@ -26,6 +26,7 @@
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <pwd.h>
|
||||||
|
#include <grp.h>
|
||||||
|
+#include <libgen.h>
|
||||||
|
#include <security/pam_appl.h>
|
||||||
|
#ifdef HAVE_SECURITY_PAM_MISC_H
|
||||||
|
# include <security/pam_misc.h>
|
||||||
|
@@ -840,17 +841,20 @@ static void run_shell(
|
||||||
|
su->simulate_login ? " login" : "",
|
||||||
|
su->fast_startup ? " fast-start" : ""));
|
||||||
|
|
||||||
|
+ char* tmp = xstrdup(shell);
|
||||||
|
if (su->simulate_login) {
|
||||||
|
char *arg0;
|
||||||
|
char *shell_basename;
|
||||||
|
|
||||||
|
- shell_basename = basename(shell);
|
||||||
|
+ shell_basename = basename(tmp);
|
||||||
|
arg0 = xmalloc(strlen(shell_basename) + 2);
|
||||||
|
arg0[0] = '-';
|
||||||
|
strcpy(arg0 + 1, shell_basename);
|
||||||
|
args[0] = arg0;
|
||||||
|
- } else
|
||||||
|
- args[0] = basename(shell);
|
||||||
|
+ } else {
|
||||||
|
+ args[0] = basename(tmp);
|
||||||
|
+ }
|
||||||
|
+ free(tmp);
|
||||||
|
|
||||||
|
if (su->fast_startup)
|
||||||
|
args[argno++] = "-f";
|
||||||
Reference in New Issue
Block a user