commit: 19945b3429e7c2eb89b66c7ee4e054aec66d7cfe Author: Alexey Chernov <4ernov <AT> gmail <DOT> com> AuthorDate: Mon Aug 16 21:17:42 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Sep 28 01:45:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19945b34
sys-libs/newlib: fix `libm_nano.a` installation Add `libm_nano.a` installation in case of `nano` USE flag on, as it's now required in `nano.specs` for RISC V targets, in particular. See also: riscv/riscv-newlib@f289cef6be67da67b2d97a47d6576fa7e6b4c858 riscv/riscv-gnu-toolchain@2922650dd095747b07d6ced1b746d1faae07a01c Closes: https://github.com/gentoo/gentoo/pull/22007 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/newlib/{newlib-4.1.0.ebuild => newlib-4.1.0-r1.ebuild} | 4 ++-- sys-libs/newlib/newlib-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-libs/newlib/newlib-4.1.0.ebuild b/sys-libs/newlib/newlib-4.1.0-r1.ebuild similarity index 98% rename from sys-libs/newlib/newlib-4.1.0.ebuild rename to sys-libs/newlib/newlib-4.1.0-r1.ebuild index e16fd4c10b7..a5ec41db3c4 100644 --- a/sys-libs/newlib/newlib-4.1.0.ebuild +++ b/sys-libs/newlib/newlib-4.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -136,7 +136,7 @@ src_install() { emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install # Rename nano lib* files to lib*_nano and move to the real ${D} local nanolibfiles="" - nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|rdimon\)\.a" -print) + nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|m\|rdimon\)\.a" -print) for f in ${nanolibfiles}; do local l="${f##${NEWLIBNANOTMPINSTALL}}" mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die diff --git a/sys-libs/newlib/newlib-9999.ebuild b/sys-libs/newlib/newlib-9999.ebuild index e16fd4c10b7..a5ec41db3c4 100644 --- a/sys-libs/newlib/newlib-9999.ebuild +++ b/sys-libs/newlib/newlib-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -136,7 +136,7 @@ src_install() { emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install # Rename nano lib* files to lib*_nano and move to the real ${D} local nanolibfiles="" - nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|rdimon\)\.a" -print) + nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|m\|rdimon\)\.a" -print) for f in ${nanolibfiles}; do local l="${f##${NEWLIBNANOTMPINSTALL}}" mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die
