diff mbox series

[2024.0(5|8).x,1/1] package/bluez-alsa: Fix compilation with GCC 14 on musl

Message ID 20241031100108.3431-1-nicolas.cavallari@green-communications.fr
State Accepted
Headers show
Series [2024.0(5|8).x,1/1] package/bluez-alsa: Fix compilation with GCC 14 on musl | expand

Commit Message

Nicolas Cavallari Oct. 31, 2024, 9:57 a.m. UTC
bluez-alsa 4.1.1 uses the glibc basename() function, which is not
available on musl.  On GCC < 14, it would probably compile with a
warning, but GCC 14 now rejects this.

Backport an upstream fix to switch to the posix basename() on musl.

Fixes: https://autobuild.buildroot.org/results/8ada292393185328677b58a69c9e370c3118880f
Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
---
2024.02 does not have GCC 14 and bluez-alsa was bumped in 2024.11

 ...ompilation-on-strict-POSIX-platforms.patch | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 package/bluez-alsa/0001-Fix-compilation-on-strict-POSIX-platforms.patch

Comments

Peter Korsgaard Dec. 7, 2024, 1:54 p.m. UTC | #1
>>>>> "Nicolas" == Nicolas Cavallari <nicolas.cavallari@green-communications.fr> writes:

 > bluez-alsa 4.1.1 uses the glibc basename() function, which is not
 > available on musl.  On GCC < 14, it would probably compile with a
 > warning, but GCC 14 now rejects this.

 > Backport an upstream fix to switch to the posix basename() on musl.

 > Fixes: https://autobuild.buildroot.org/results/8ada292393185328677b58a69c9e370c3118880f
 > Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
 > ---
 > 2024.02 does not have GCC 14 and bluez-alsa was bumped in 2024.11

Committed to 2024.08.x, thanks.
diff mbox series

Patch

diff --git a/package/bluez-alsa/0001-Fix-compilation-on-strict-POSIX-platforms.patch b/package/bluez-alsa/0001-Fix-compilation-on-strict-POSIX-platforms.patch
new file mode 100644
index 0000000000..b1c8bfaab0
--- /dev/null
+++ b/package/bluez-alsa/0001-Fix-compilation-on-strict-POSIX-platforms.patch
@@ -0,0 +1,90 @@ 
+From ef85a335ad8919930f62d80ae99a74a5e766fc3b Mon Sep 17 00:00:00 2001
+From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
+Date: Sun, 25 Aug 2024 08:42:39 +0200
+Subject: [PATCH] Fix compilation on strict POSIX platforms
+
+Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
+Upstream: https://github.com/arkq/bluez-alsa/commit/070ed35ac5cef8138ed4
+---
+ src/main.c            | 2 +-
+ test/mock/mock.c      | 2 +-
+ utils/aplay/aplay.c   | 1 +
+ utils/cli/cli.c       | 1 +
+ utils/rfcomm/rfcomm.c | 1 +
+ 5 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index e93cb33..597ac01 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -13,12 +13,12 @@
+ #endif
+ 
+ #include <getopt.h>
++#include <libgen.h>
+ #include <signal.h>
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <string.h>
+ #include <strings.h>
+ #include <time.h>
+ 
+diff --git a/test/mock/mock.c b/test/mock/mock.c
+index 83a8ab5..b5bcedd 100644
+--- a/test/mock/mock.c
++++ b/test/mock/mock.c
+@@ -16,12 +16,12 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <getopt.h>
++#include <libgen.h>
+ #include <signal.h>
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <string.h>
+ #include <strings.h>
+ #include <sys/stat.h>
+ 
+diff --git a/utils/aplay/aplay.c b/utils/aplay/aplay.c
+index 999d1ef..49b0d65 100644
+--- a/utils/aplay/aplay.c
++++ b/utils/aplay/aplay.c
+@@ -15,6 +15,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <getopt.h>
++#include <libgen.h>
+ #include <math.h>
+ #include <poll.h>
+ #include <pthread.h>
+diff --git a/utils/cli/cli.c b/utils/cli/cli.c
+index d480ef1..299c44c 100644
+--- a/utils/cli/cli.c
++++ b/utils/cli/cli.c
+@@ -13,6 +13,7 @@
+ #endif
+ 
+ #include <getopt.h>
++#include <libgen.h>
+ #include <stdarg.h>
+ #include <stdbool.h>
+ #include <stdint.h>
+diff --git a/utils/rfcomm/rfcomm.c b/utils/rfcomm/rfcomm.c
+index 9eba57f..20c1214 100644
+--- a/utils/rfcomm/rfcomm.c
++++ b/utils/rfcomm/rfcomm.c
+@@ -15,6 +15,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <getopt.h>
++#include <libgen.h>
+ #include <poll.h>
+ #include <stdbool.h>
+ #include <stdint.h>
+-- 
+2.45.2
+