NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/mraa: fix build with musl >= 1.2.5

Browse Source 
Fix the following build failure with musl >= 1.2.5 (raised since commit
f7f03445cf):

/home/autobuild/autobuild/instance-9/output-1/build/mraa-2.2.0/src/mraa.c: In function 'mraa_count_iio_devices':
/home/autobuild/autobuild/instance-9/output-1/build/mraa-2.2.0/src/mraa.c:341:38: error: implicit declaration of function 'basename'; did you mean 'rename'? [-Werror=implicit-function-declaration]
  341 |     if (fnmatch(IIO_DEVICE_WILDCARD, basename(path), 0) == 0) {
      |                                      ^~~~~~~~
      |                                      rename

Fixes: f7f03445cf
 - http://autobuild.buildroot.org/results/1f16df70e49a9f8823a791c0fcc677de07136835

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Pieterjan Camerlynck <pieterjanca@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine 2024-03-17 15:47:01 +01:00 committed by Arnout Vandecappelle
parent 3d8e92e318
commit 752ab5a9e6
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
package/mraa/0002-mraa-Use-posix-basename.patch Normal file
View File

@ -0,0 +1,45 @@
From 47c3850cddd63cebd9dc48e411963314449118f1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 31 Dec 2023 19:16:35 -0800
Subject: [PATCH] mraa: Use posix basename
Musl has removed the declaration from string.h [1] which exposes the
problem especially with clang-17+ compiler where implicit function
declaration is flagged as error. Use posix basename and make a copy of
string to operate on to emulate GNU basename behaviour.
[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream: https://github.com/eclipse/mraa/commit/47c3850cddd63cebd9dc48e411963314449118f1
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/mraa.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/mraa.c b/src/mraa.c
index 653ea1fa7..b556d0455 100644
--- a/src/mraa.c
+++ b/src/mraa.c
@@ -12,6 +12,7 @@
#endif
#include <dlfcn.h>
+#include <libgen.h>
#include <pwd.h>
#include <sched.h>
#include <stddef.h>
@@ -341,9 +342,11 @@ static int
mraa_count_iio_devices(const char* path, const struct stat* sb, int flag, struct FTW* ftwb)
{
// we are only interested in files with specific names
- if (fnmatch(IIO_DEVICE_WILDCARD, basename(path), 0) == 0) {
+ char* tmp = strdup(path);
+ if (fnmatch(IIO_DEVICE_WILDCARD, basename(tmp), 0) == 0) {
num_iio_devices++;
}
+ free(tmp);
return 0;
}