| 1 |
commit: 19945b3429e7c2eb89b66c7ee4e054aec66d7cfe |
| 2 |
Author: Alexey Chernov <4ernov <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Aug 16 21:17:42 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 28 01:45:15 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19945b34 |
| 7 |
|
| 8 |
sys-libs/newlib: fix `libm_nano.a` installation |
| 9 |
|
| 10 |
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. |
| 11 |
|
| 12 |
See also: |
| 13 |
riscv/riscv-newlib@f289cef6be67da67b2d97a47d6576fa7e6b4c858 |
| 14 |
riscv/riscv-gnu-toolchain@2922650dd095747b07d6ced1b746d1faae07a01c |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/22007 |
| 16 |
|
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
sys-libs/newlib/{newlib-4.1.0.ebuild => newlib-4.1.0-r1.ebuild} | 4 ++-- |
| 20 |
sys-libs/newlib/newlib-9999.ebuild | 4 ++-- |
| 21 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-libs/newlib/newlib-4.1.0.ebuild b/sys-libs/newlib/newlib-4.1.0-r1.ebuild |
| 24 |
similarity index 98% |
| 25 |
rename from sys-libs/newlib/newlib-4.1.0.ebuild |
| 26 |
rename to sys-libs/newlib/newlib-4.1.0-r1.ebuild |
| 27 |
index e16fd4c10b7..a5ec41db3c4 100644 |
| 28 |
--- a/sys-libs/newlib/newlib-4.1.0.ebuild |
| 29 |
+++ b/sys-libs/newlib/newlib-4.1.0-r1.ebuild |
| 30 |
@@ -1,4 +1,4 @@ |
| 31 |
-# Copyright 1999-2020 Gentoo Authors |
| 32 |
+# Copyright 1999-2021 Gentoo Authors |
| 33 |
# Distributed under the terms of the GNU General Public License v2 |
| 34 |
|
| 35 |
EAPI="7" |
| 36 |
@@ -136,7 +136,7 @@ src_install() { |
| 37 |
emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install |
| 38 |
# Rename nano lib* files to lib*_nano and move to the real ${D} |
| 39 |
local nanolibfiles="" |
| 40 |
- nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|rdimon\)\.a" -print) |
| 41 |
+ nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|m\|rdimon\)\.a" -print) |
| 42 |
for f in ${nanolibfiles}; do |
| 43 |
local l="${f##${NEWLIBNANOTMPINSTALL}}" |
| 44 |
mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die |
| 45 |
|
| 46 |
diff --git a/sys-libs/newlib/newlib-9999.ebuild b/sys-libs/newlib/newlib-9999.ebuild |
| 47 |
index e16fd4c10b7..a5ec41db3c4 100644 |
| 48 |
--- a/sys-libs/newlib/newlib-9999.ebuild |
| 49 |
+++ b/sys-libs/newlib/newlib-9999.ebuild |
| 50 |
@@ -1,4 +1,4 @@ |
| 51 |
-# Copyright 1999-2020 Gentoo Authors |
| 52 |
+# Copyright 1999-2021 Gentoo Authors |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
|
| 55 |
EAPI="7" |
| 56 |
@@ -136,7 +136,7 @@ src_install() { |
| 57 |
emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install |
| 58 |
# Rename nano lib* files to lib*_nano and move to the real ${D} |
| 59 |
local nanolibfiles="" |
| 60 |
- nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|rdimon\)\.a" -print) |
| 61 |
+ nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|m\|rdimon\)\.a" -print) |
| 62 |
for f in ${nanolibfiles}; do |
| 63 |
local l="${f##${NEWLIBNANOTMPINSTALL}}" |
| 64 |
mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die |
Archives