Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/x11:master commit in: x11-libs/libX11/
Date: Wed, 30 Apr 2014 14:01:23
Message-Id: 1398866471.c1e1badb602a20e53b7fad0d499cf7074b4b9669.mgorny@gentoo
1 commit: c1e1badb602a20e53b7fad0d499cf7074b4b9669
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 30 14:01:11 2014 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 30 14:01:11 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c1e1badb
7
8 x11-libs/libX11: Use multilib_src_compile() rather than hackery on top of multilib_for_best_abi.
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 x11-libs/libX11/libX11-9999.ebuild | 16 ++++++++--------
14 1 file changed, 8 insertions(+), 8 deletions(-)
15
16 diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
17 index eceaa43..369e900 100644
18 --- a/x11-libs/libX11/libX11-9999.ebuild
19 +++ b/x11-libs/libX11/libX11-9999.ebuild
20 @@ -41,18 +41,18 @@ src_configure() {
21 xorg-2_src_configure
22 }
23
24 -src_compile() {
25 +multilib_src_compile() {
26 # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
27 if tc-is-cross-compiler; then
28 (
29 filter-flags -m*
30 - multilib_for_best_abi run_in_build_dir \
31 - emake -C src/util \
32 - CC=$(tc-getBUILD_CC) \
33 - CFLAGS="${CFLAGS}" \
34 - LDFLAGS="" \
35 - clean all || die
36 + emake -C src/util \
37 + CC=$(tc-getBUILD_CC) \
38 + CFLAGS="${CFLAGS}" \
39 + LDFLAGS="" \
40 + clean all || die
41 )
42 fi
43 - xorg-2_src_compile
44 +
45 + default
46 }