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-apps/s6-rc/
Date: Fri, 28 Jan 2022 08:00:17
Message-Id: 1643356745.ca28a27a81a6fc1e71a281942a537c1720a48172.sam@gentoo
1 commit: ca28a27a81a6fc1e71a281942a537c1720a48172
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Sun Jan 23 11:49:01 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 28 07:59:05 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca28a27a
7
8 sys-apps/s6-rc: respect AR, CC and RANLIB
9
10 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild | 8 +++++++-
14 1 file changed, 7 insertions(+), 1 deletion(-)
15
16 diff --git a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
17 index 6f0a3d47a42a..d260c7317805 100644
18 --- a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
19 +++ b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
20 @@ -1,8 +1,10 @@
21 -# Copyright 1999-2020 Gentoo Authors
22 +# Copyright 1999-2022 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26
27 +inherit toolchain-funcs
28 +
29 DESCRIPTION="Service manager for the s6 supervision suite"
30 HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
31 SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
32 @@ -28,9 +30,13 @@ src_prepare() {
33 # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
34 sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
35 configure || die
36 +
37 + sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
38 }
39
40 src_configure() {
41 + tc-export AR CC RANLIB
42 +
43 econf \
44 --bindir=/bin \
45 --dynlibdir=/usr/$(get_libdir) \