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/xxkb/
Date: Fri, 30 Sep 2022 04:05:48
Message-Id: 1664510714.a384d56453397172dff9faab2beff6bf47ab9e16.ionen@gentoo
1 commit: a384d56453397172dff9faab2beff6bf47ab9e16
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 03:45:19 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 04:05:14 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a384d564
7
8 x11-misc/xxkb: 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 Closes: https://bugs.gentoo.org/870739
17 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
18
19 x11-misc/xxkb/xxkb-1.11.1-r1.ebuild | 5 +++--
20 1 file changed, 3 insertions(+), 2 deletions(-)
21
22 diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
23 index b0977944da0a..1b5ae5edd57f 100644
24 --- a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
25 +++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
26 @@ -1,4 +1,4 @@
27 -# Copyright 1999-2021 Gentoo Authors
28 +# Copyright 1999-2022 Gentoo Authors
29 # Distributed under the terms of the GNU General Public License v2
30
31 EAPI=7
32 @@ -31,6 +31,7 @@ RDEPEND="
33 DEPEND="${RDEPEND}"
34 BDEPEND="
35 app-text/rman
36 + sys-devel/gcc
37 >=x11-misc/imake-1.0.8-r1
38 svg? ( virtual/pkgconfig )
39 "
40 @@ -49,7 +50,7 @@ src_prepare() {
41
42 src_configure() {
43 CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
44 - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" \
45 + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" \
46 xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die
47 }