mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2025-12-10 07:34:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libunistring: fix compilation error with MUSL

Browse source 
MUSL doesn't provide PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP as
it's only glibc and as the MACRO say, it's NP (not portable).

Add patch to check for this and disable overwriting the function
accordingly.

Fixes: 9bdf723476 ("libunistring: update to 1.4.1")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2025-11-25 13:39:59 +01:00
parent b0e9371cb1
commit 41541bf30e
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
1 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
package/libs/libunistring/patches/100-tests-pthread-rwlock-better-support-MUSL.patch Normal file
View file

@ -0,0 +1,36 @@
From bdd92b59fe63553712fba57cc64cf8fe6e3e824a Mon Sep 17 00:00:00 2001
From: Christian Marangi <ansuelsmth@gmail.com>
Date: Tue, 25 Nov 2025 13:25:28 +0100
Subject: [PATCH] tests: pthread-rwlock: better support MUSL
MUSL doesn't provide PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP as
it's only glibc and as the MACRO say, it's NP (not portable).
Check for the presence of it and disable overwriting the function
accordingly.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
tests/pthread-rwlock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/tests/pthread-rwlock.c
+++ b/tests/pthread-rwlock.c
@@ -49,7 +49,7 @@ pthread_rwlockattr_destroy (_GL_UNUSED p
return 0;
}
-#elif PTHREAD_RWLOCK_BAD_WAITQUEUE
+#elif PTHREAD_RWLOCK_BAD_WAITQUEUE && defined PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
/* Override pthread_rwlockattr_init, to use the kind PREFER_WRITER_NONRECURSIVE
(or possibly PREFER_WRITER) instead of the kind DEFAULT. */
@@ -388,7 +388,7 @@ pthread_rwlock_destroy (pthread_rwlock_t
# else
-# if PTHREAD_RWLOCK_BAD_WAITQUEUE
+# if PTHREAD_RWLOCK_BAD_WAITQUEUE && defined PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
/* Override pthread_rwlock_init, to use the kind PREFER_WRITER_NONRECURSIVE
(or possibly PREFER_WRITER) instead of the default, when no