On Fri, 2021-10-29 at 10:10 -0700, Khem Raj wrote: > 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 <raj.k...@gmail.com> > --- > v2: Rebased on master-next > > ...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 > > diff --git > a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch > > b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch > new file mode 100644 > index 0000000000..6f0dea2e9c > --- /dev/null > +++ > b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch > @@ -0,0 +1,34 @@ > +From 06321f1a2aa89b8e028946e793344657eaad0165 Mon Sep 17 00:00:00 2001 > +From: Khem Raj <raj.k...@gmail.com> > +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
Can we submit this upstream? It is a bit unfortunate that it looks like you can't build with old and new musl at the same time :( Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157644): https://lists.openembedded.org/g/openembedded-core/message/157644 Mute This Topic: https://lists.openembedded.org/mt/86681917/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
