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-plugins/wmnet/
Date: Fri, 30 Sep 2022 11:02:24
Message-Id: 1664534894.3a42003924c50f31c331265b58e9881e92696980.ionen@gentoo
1 commit: 3a42003924c50f31c331265b58e9881e92696980
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 10:00:24 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 10:48:14 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a420039
7
8 x11-plugins/wmnet: 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-plugins/wmnet/wmnet-1.06-r2.ebuild | 9 +++++----
19 1 file changed, 5 insertions(+), 4 deletions(-)
20
21 diff --git a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
22 index 1b2ce83086b5..21e339edf295 100644
23 --- a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
24 +++ b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
25 @@ -18,17 +18,18 @@ IUSE=""
26 RDEPEND="x11-libs/libX11
27 x11-libs/libXext"
28 DEPEND="${RDEPEND}
29 + x11-base/xorg-proto
30 elibc_musl? ( net-libs/ppp-defs )"
31 BDEPEND="
32 - x11-base/xorg-proto
33 - >=x11-misc/imake-1.0.8-r1
34 - app-text/rman"
35 + app-text/rman
36 + sys-devel/gcc
37 + >=x11-misc/imake-1.0.8-r1"
38
39 PATCHES=( "${WORKDIR}"/${P}-misc.patch )
40
41 src_configure() {
42 CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
43 - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die "xmkmf failed"
44 + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die "xmkmf failed"
45 }
46
47 src_compile() {