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-boot/elilo/
Date: Sat, 14 May 2022 00:47:32
Message-Id: 1652489131.b72e496529fc13862f2f5fc2b3871d93b485c0cd.sam@gentoo
1 commit: b72e496529fc13862f2f5fc2b3871d93b485c0cd
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 19 15:27:20 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 00:45:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72e4965
7
8 sys-boot/elilo: [QA] inline ESYSROOT
9
10 ESYSROOT is SYSROOT/EPREFIX in >= EAPI 7
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 sys-boot/elilo/elilo-3.16-r5.ebuild | 6 +++---
15 1 file changed, 3 insertions(+), 3 deletions(-)
16
17 diff --git a/sys-boot/elilo/elilo-3.16-r5.ebuild b/sys-boot/elilo/elilo-3.16-r5.ebuild
18 index fed811421390..1aa5387103e1 100644
19 --- a/sys-boot/elilo/elilo-3.16-r5.ebuild
20 +++ b/sys-boot/elilo/elilo-3.16-r5.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2021 Gentoo Authors
23 +# Copyright 1999-2022 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=8
27 @@ -62,7 +62,7 @@ src_compile() {
28 # "prefix" on the next line specifies where to find gcc, as, ld,
29 # etc. It's not the usual meaning of "prefix". By blanking it we
30 # allow PATH to be searched.
31 - local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
32 + local libdir="${ESYSROOT}/usr/$(get_libdir)"
33 emake -j1 \
34 prefix= \
35 AS="$(tc-getAS)" \
36 @@ -71,7 +71,7 @@ src_compile() {
37 OBJCOPY="$(tc-getOBJCOPY)" \
38 HOSTARCH=${iarch} \
39 ARCH=${iarch} \
40 - EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
41 + EFIINC="${ESYSROOT}/usr/include/efi" \
42 GNUEFILIB="${libdir}" \
43 EFILIB="${libdir}" \
44 EFICRT0="${libdir}" \