Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
Date: Fri, 30 Sep 2022 11:02:20
Message-Id: 1664534892.3e8c612e4e146c920f33595b95034ebee18ca031.ionen@gentoo
1 commit: 3e8c612e4e146c920f33595b95034ebee18ca031
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 09:08:16 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 10:48:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8c612e
7
8 x11-misc/xbatt: force gcc -E for imake's generation
9
10 Requires traditional cpp support and is broken in all sort of ways
11 with clang-cpp / -E. Can still use clang & friends for everything else.
12
13 Ideally these packages need to be built another way or last rited,
14 imake will just accumulate more problems.
15
16 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
17
18 x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild | 6 ++++--
19 1 file changed, 4 insertions(+), 2 deletions(-)
20
21 diff --git a/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
22 index 56d0ce5f7d91..1c3072e729f7 100644
23 --- a/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
24 +++ b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
25 @@ -26,7 +26,9 @@ RDEPEND="
26 DEPEND="
27 ${RDEPEND}
28 x11-base/xorg-proto"
29 -BDEPEND=">=x11-misc/imake-1.0.8-r1"
30 +BDEPEND="
31 + sys-devel/gcc
32 + >=x11-misc/imake-1.0.8-r1"
33
34 PATCHES=(
35 "${FILESDIR}"/${PN}-1.2.1-implicits.patch
36 @@ -34,7 +36,7 @@ PATCHES=(
37
38 src_configure() {
39 CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
40 - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
41 + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
42 }
43
44 src_compile() {