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-wm/larswm/
Date: Fri, 30 Sep 2022 11:02:25
Message-Id: 1664534895.94f9b8b6e9074bf601fbd12a04cd4f7342621405.ionen@gentoo
1 commit: 94f9b8b6e9074bf601fbd12a04cd4f7342621405
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 10:21:57 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 10:48:15 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f9b8b6
7
8 x11-wm/larswm: 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-wm/larswm/larswm-7.5.3-r2.ebuild | 14 +++++++-------
19 1 file changed, 7 insertions(+), 7 deletions(-)
20
21 diff --git a/x11-wm/larswm/larswm-7.5.3-r2.ebuild b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
22 index 6506e3b2921d..8adcdfe73021 100644
23 --- a/x11-wm/larswm/larswm-7.5.3-r2.ebuild
24 +++ b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
25 @@ -1,4 +1,4 @@
26 -# Copyright 1999-2021 Gentoo Authors
27 +# Copyright 1999-2022 Gentoo Authors
28 # Distributed under the terms of the GNU General Public License v2
29
30 EAPI=7
31 @@ -17,16 +17,16 @@ RDEPEND="x11-libs/libX11
32 x11-libs/libXmu
33 x11-libs/libXt
34 x11-libs/libXext"
35 -DEPEND="${RDEPEND}"
36 -BDEPEND="
37 - x11-base/xorg-proto
38 - >=x11-misc/imake-1.0.8-r1
39 +DEPEND="${RDEPEND}
40 + x11-base/xorg-proto"
41 +BDEPEND="app-text/rman
42 + sys-devel/gcc
43 x11-misc/gccmakedep
44 - app-text/rman"
45 + >=x11-misc/imake-1.0.8-r1"
46
47 src_configure() {
48 CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
49 - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
50 + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die
51 }
52
53 src_compile() {