[gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/

[Sam James]

commit:     83bad4f1e73ca2051e518d58fda63f90fd251b5a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 23:44:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 23:44:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83bad4f1

dev-libs/elfutils: add 0.186

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/elfutils/elfutils-0.186.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dev-libs/elfutils/elfutils-0.186.ebuild 
b/dev-libs/elfutils/elfutils-0.186.ebuild
index c40baf26562..d7c479481a3 100644
--- a/dev-libs/elfutils/elfutils-0.186.ebuild
+++ b/dev-libs/elfutils/elfutils-0.186.ebuild
@@ -45,12 +45,20 @@ src_prepare() {
        default
 
        if use elibc_musl; then
-               eapply "${FILESDIR}"/musl/
+               mkdir -p "${T}"/musl || die
+               cp -rv "${FILESDIR}"/musl/*.patch "${T}"/musl || die
+
+               # Delete patches upstreamed in 0.186
+               rm "${T}/musl/${PN}-0.185-error-h.patch" || die
+               rm "${T}/musl/${PN}-0.185-strndupa.patch" || die
+
+               eapply "${T}"/musl/
        fi
 
        if ! use static-libs; then
                sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' 
lib{asm,dw,elf}/Makefile.in || die
        fi
+
        # https://sourceware.org/PR23914
        sed -i 's:-Werror::' */Makefile.in || die
 }