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/xautolock/
Date: Fri, 30 Sep 2022 11:02:19
Message-Id: 1664534891.0da382f0a5c38cce6e70a3724471a6c7981730d7.ionen@gentoo
1 commit: 0da382f0a5c38cce6e70a3724471a6c7981730d7
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 08:59:31 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 10:48:11 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da382f0
7
8 x11-misc/xautolock: 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/xautolock/xautolock-2.2_p7.ebuild | 9 ++++++---
19 1 file changed, 6 insertions(+), 3 deletions(-)
20
21 diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
22 index 03cb72de3b8f..fd84f8e1b114 100644
23 --- a/x11-misc/xautolock/xautolock-2.2_p7.ebuild
24 +++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
25 @@ -19,10 +19,13 @@ KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
26 RDEPEND="
27 x11-libs/libXScrnSaver
28 "
29 -DEPEND="${RDEPEND}"
30 +DEPEND="
31 + ${RDEPEND}
32 + x11-base/xorg-proto
33 +"
34 BDEPEND="
35 app-text/rman
36 - x11-base/xorg-proto
37 + sys-devel/gcc
38 >=x11-misc/imake-1.0.8-r1
39 "
40 PATCHES=(
41 @@ -38,7 +41,7 @@ src_prepare() {
42
43 src_configure() {
44 CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
45 - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
46 + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
47 }
48
49 src_compile() {