diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-04-30 13:58:02 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-04-30 13:58:02 +0000 |
| commit | 3a09e5cc1a5d2b6f9af42fa5bfb4e03eac935990 (patch) | |
| tree | 8cfbb221d82aa97b4a038e10d8d3812cf2fbebe4 /x11-libs/libX11 | |
| parent | Fix typo in function name. (diff) | |
| download | gentoo-2-3a09e5cc1a5d2b6f9af42fa5bfb4e03eac935990.tar.gz gentoo-2-3a09e5cc1a5d2b6f9af42fa5bfb4e03eac935990.tar.bz2 gentoo-2-3a09e5cc1a5d2b6f9af42fa5bfb4e03eac935990.zip | |
Use multilib_src_compile() rather than hackery on top of multilib_for_best_abi.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'x11-libs/libX11')
| -rw-r--r-- | x11-libs/libX11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libX11/libX11-1.6.2.ebuild | 20 |
2 files changed, 15 insertions, 11 deletions
diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog index 80a3a02823ad..b641e5eedf60 100644 --- a/x11-libs/libX11/ChangeLog +++ b/x11-libs/libX11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libX11 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.218 2014/03/26 12:23:40 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.219 2014/04/30 13:58:02 mgorny Exp $ + + 30 Apr 2014; Michał Górny <mgorny@gentoo.org> libX11-1.6.2.ebuild: + Use multilib_src_compile() rather than hackery on top of + multilib_for_best_abi. 26 Mar 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> -libX11-1.5.0-r1.ebuild, -libX11-1.5.0.ebuild, -libX11-1.6.0.ebuild, diff --git a/x11-libs/libX11/libX11-1.6.2.ebuild b/x11-libs/libX11/libX11-1.6.2.ebuild index c62de711c62d..e43bbe5c75b5 100644 --- a/x11-libs/libX11/libX11-1.6.2.ebuild +++ b/x11-libs/libX11/libX11-1.6.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild,v 1.10 2013/10/08 05:07:29 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild,v 1.11 2014/04/30 13:58:02 mgorny Exp $ EAPI=5 @@ -43,18 +43,18 @@ src_configure() { xorg-2_src_configure } -src_compile() { +multilib_src_compile() { # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys' if tc-is-cross-compiler; then ( filter-flags -m* - multilib_for_best_abi run_in_build_dir \ - emake -C src/util \ - CC=$(tc-getBUILD_CC) \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="" \ - clean all || die + emake -C src/util \ + CC=$(tc-getBUILD_CC) \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="" \ + clean all || die ) fi - xorg-2_src_compile + + default } |