1From 06321f1a2aa89b8e028946e793344657eaad0165 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 28 Oct 2021 22:28:45 -0700
4Subject: [PATCH] utils: Conside musl when wrapping qsort_r
5
6musl now has implemented qsort_r, the signature however matches glibc
7and not BSD, current check makes it such that it falls into BSD case
8when building for musl, which clearly is wrong, therefore instead of
9just checking for glibc check for linux to decide which qsort_r
10signature to use. This covers both glibc and musl
11
12Upstream-Status: Pending
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 src/util.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/util.c b/src/util.c
20index 72426e09..8f29bc5a 100644
21--- a/src/util.c
22+++ b/src/util.c
23@@ -159,7 +159,7 @@ solv_setcloexec(int fd, int state)
24
25    see also: http://sources.redhat.com/ml/libc-alpha/2008-12/msg00003.html
26  */
27-#if (defined(__GLIBC__) || defined(__NEWLIB__)) && (defined(HAVE_QSORT_R) || defined(HAVE___QSORT_R))
28+#if (defined(__linux__) || defined(__NEWLIB__)) && (defined(HAVE_QSORT_R) || defined(HAVE___QSORT_R))
29
30 void
31 solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard)
32--
332.33.1
34
35