Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/newlib/
Date: Tue, 31 May 2022 22:03:33
Message-Id: 1654034589.eb0d76851e8d1c9ffba568763945888bd2fb9c2d.sam@gentoo
1 commit: eb0d76851e8d1c9ffba568763945888bd2fb9c2d
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 31 22:03:09 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue May 31 22:03:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb0d7685
7
8 sys-libs/newlib: fix installation on prefix
9
10 Closes: https://bugs.gentoo.org/848837
11 Thanks-to: Christian Ludwig <chrissicool <AT> gmail.com>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 sys-libs/newlib/newlib-4.2.0.20211231.ebuild | 8 ++++----
15 sys-libs/newlib/newlib-9999.ebuild | 8 ++++----
16 2 files changed, 8 insertions(+), 8 deletions(-)
17
18 diff --git a/sys-libs/newlib/newlib-4.2.0.20211231.ebuild b/sys-libs/newlib/newlib-4.2.0.20211231.ebuild
19 index a6ad7b9c65d1..92cb0eb38425 100644
20 --- a/sys-libs/newlib/newlib-4.2.0.20211231.ebuild
21 +++ b/sys-libs/newlib/newlib-4.2.0.20211231.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2021 Gentoo Authors
24 +# Copyright 1999-2022 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI="7"
28 @@ -143,9 +143,9 @@ src_install() {
29 done
30
31 # Move newlib-nano's version of newlib.h to newlib-nano/newlib.h
32 - mkdir -p "${D}/usr/${CTARGET}/include/newlib-nano" || die
33 - mv "${NEWLIBNANOTMPINSTALL}/usr/${CTARGET}/include/newlib.h" \
34 - "${D}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die
35 + mkdir -p "${ED}/usr/${CTARGET}/include/newlib-nano" || die
36 + mv "${NEWLIBNANOTMPINSTALL}/${EPREFIX}/usr/${CTARGET}/include/newlib.h" \
37 + "${ED}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die
38 fi
39
40 # minor hack to keep things clean
41
42 diff --git a/sys-libs/newlib/newlib-9999.ebuild b/sys-libs/newlib/newlib-9999.ebuild
43 index a6ad7b9c65d1..92cb0eb38425 100644
44 --- a/sys-libs/newlib/newlib-9999.ebuild
45 +++ b/sys-libs/newlib/newlib-9999.ebuild
46 @@ -1,4 +1,4 @@
47 -# Copyright 1999-2021 Gentoo Authors
48 +# Copyright 1999-2022 Gentoo Authors
49 # Distributed under the terms of the GNU General Public License v2
50
51 EAPI="7"
52 @@ -143,9 +143,9 @@ src_install() {
53 done
54
55 # Move newlib-nano's version of newlib.h to newlib-nano/newlib.h
56 - mkdir -p "${D}/usr/${CTARGET}/include/newlib-nano" || die
57 - mv "${NEWLIBNANOTMPINSTALL}/usr/${CTARGET}/include/newlib.h" \
58 - "${D}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die
59 + mkdir -p "${ED}/usr/${CTARGET}/include/newlib-nano" || die
60 + mv "${NEWLIBNANOTMPINSTALL}/${EPREFIX}/usr/${CTARGET}/include/newlib.h" \
61 + "${ED}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die
62 fi
63
64 # minor hack to keep things clean