musl: Update to tip of trunk
PATCH v2 1/3 musl: Update to tip of trunk
This brings following fixes
* b76f37fd add qsort_r and make qsort a wrapper around it
* 7be59733 add SPE FPU support to powerpc-sf
* e3e7189c fix undefined behavior in getdelim via null pointer arithmetic and memcpy
* b713b8b2 fix excessively slow TLS performance on some mips models
* 3eed6a6f fix error checking in pthread_getname_np
Signed-off-by Khem Raj <[email protected]>
---
v2: No change
meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/musl/musl_git.bb +1 -1
@@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "3f701faace7addc75d16dea8a6cd769fa5b3f260" +SRCREV = "b76f37fd5625d038141b52184956fb4b7838e9a5" BASEVER = "1.2.2"
Signature · 1 line
2.33.1
PATCH 2/3 libsolv: Enable correct qsort_r on musl
Newer musl now has this function implemented and signatures are same as glibc, current codepaths forces it on BSD path which is wrong for musl and results in random segfaults in apps using libsolv e.g. opkg
Signed-off-by Khem Raj <[email protected]>
--- ...s-Conside-musl-when-wrapping-qsort_r.patch | 34 +++++++++++++++++++ .../libsolv/libsolv_0.7.20.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch
meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 06321f1a2aa89b8e028946e793344657eaad0165 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 28 Oct 2021 22:28:45 -0700 +Subject: [PATCH] utils: Conside musl when wrapping qsort_r + +musl now has implemented qsort_r, the signature however matches glibc +and not BSD, current check makes it such that it falls into BSD case +when building for musl, which clearly is wrong, therefore instead of +just checking for glibc check for linux to decide which qsort_r +signature to use. This covers both glibc and musl + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + src/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util.c b/src/util.c +index 72426e09..8f29bc5a 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -159,7 +159,7 @@ solv_setcloexec(int fd, int state) + + see also: http://sources.redhat.com/ml/libc-alpha/2008-12/msg00003.html + */ +-#if (defined(__GLIBC__) || defined(__NEWLIB__)) && (defined(HAVE_QSORT_R) || defined(HAVE___QSORT_R)) ++#if (defined(__linux__) || defined(__NEWLIB__)) && (defined(HAVE_QSORT_R) || defined(HAVE___QSORT_R)) + + void + solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) +-- +2.33.1 +
meta/recipes-extended/libsolv/libsolv_0.7.20.bb +1 -0
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git \ + file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ " SRCREV = "f618e6aae1d44be633b2ab91d4fd4f4f974f4d40"
Signature · 1 line
2.33.1
PATCH 3/3 site/common-musl: Enable qsort_r in glib
In reply to Khem Rajmusl now has qsort_r
Signed-off-by Khem Raj <[email protected]>
--- meta/site/common-musl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/site/common-musl +1 -1
@@ -23,7 +23,7 @@ ac_cv_func_snprintf_c99=${ac_cv_func_snprintf_c99=yes} ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes} glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1} glib_cv_long_long_format=${glib_cv_long_long_format=ll} -glib_cv_have_qsort_r=${glib_cv_have_qsort_r=no} +glib_cv_have_qsort_r=${glib_cv_have_qsort_r=yes} #dbus-glib ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
Signature · 1 line
2.33.1