Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xearth/
Date: Thu, 15 Apr 2021 06:40:06
Message-Id: 1618468736.5a880e7bea3684dff80b9cf962560039cfa811d8.juippis@gentoo
1 commit: 5a880e7bea3684dff80b9cf962560039cfa811d8
2 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
3 AuthorDate: Wed Apr 14 12:42:19 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 06:38:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a880e7b
7
8 x11-misc/xearth: fix build with -native-symlinks
9
10 Closes: https://bugs.gentoo.org/726222
11 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 x11-misc/xearth/xearth-1.1-r1.ebuild | 12 +++++++-----
15 1 file changed, 7 insertions(+), 5 deletions(-)
16
17 diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
18 index 52016d87ae1..cbd3a60f818 100644
19 --- a/x11-misc/xearth/xearth-1.1-r1.ebuild
20 +++ b/x11-misc/xearth/xearth-1.1-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2020 Gentoo Authors
23 +# Copyright 1999-2021 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=5
27 @@ -22,7 +22,7 @@ RDEPEND="
28 "
29 DEPEND="${RDEPEND}
30 x11-base/xorg-proto
31 - x11-misc/imake
32 + >=x11-misc/imake-1.0.8-r1
33 app-text/rman
34 "
35
36 @@ -31,12 +31,14 @@ src_prepare() {
37 }
38
39 src_configure() {
40 - xmkmf || die
41 + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
42 + IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
43 }
44
45 src_compile() {
46 - emake CC=$(tc-getCC) \
47 - CCOPTIONS="${CFLAGS}" \
48 + emake \
49 + CC="$(tc-getCC)" \
50 + CDEBUGFLAGS="${CFLAGS}" \
51 EXTRA_LDOPTIONS="${LDFLAGS}"
52 }