vapier 15/07/23 03:43:25 Modified: libX11-1.6.2.ebuild libX11-1.6.3.ebuild ChangeLog Log: Fix cross-compiling logic with the makekeys tool by using the proper env vars. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.15 x11-libs/libX11/libX11-1.6.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild?r1=1.14&r2=1.15 Index: libX11-1.6.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libX11-1.6.2.ebuild 22 Feb 2015 02:21:24 -0000 1.14 +++ libX11-1.6.2.ebuild 23 Jul 2015 03:43:25 -0000 1.15 @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.14 2015/02/22 02:21:24 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild,v 1.15 2015/07/23 03:43:25 vapier Exp $ EAPI=5 @@ -8,7 +8,7 @@ # needs automake-1.14 without eautoreconf XORG_EAUTORECONF=yes XORG_MULTILIB=yes -inherit xorg-2 toolchain-funcs flag-o-matic +inherit xorg-2 toolchain-funcs DESCRIPTION="X.Org X11 library" @@ -44,16 +44,14 @@ } multilib_src_compile() { - # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys' if tc-is-cross-compiler; then - ( - filter-flags -m* - emake -C src/util \ - CC=$(tc-getBUILD_CC) \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="" \ - clean all || die - ) + # Make sure the build-time tool "makekeys" uses build settings. + tc-export_build_env BUILD_CC + emake -C src/util \ + CC="${BUILD_CC}" \ + CFLAGS="${BUILD_CFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + clean all fi default 1.2 x11-libs/libX11/libX11-1.6.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild?r1=1.1&r2=1.2 Index: libX11-1.6.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libX11-1.6.3.ebuild 11 Mar 2015 00:30:30 -0000 1.1 +++ libX11-1.6.3.ebuild 23 Jul 2015 03:43:25 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild,v 1.1 2015/03/11 00:30:30 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.3.ebuild,v 1.2 2015/07/23 03:43:25 vapier Exp $ EAPI=5 @@ -8,7 +8,7 @@ # needs automake-1.14 without eautoreconf XORG_EAUTORECONF=yes XORG_MULTILIB=yes -inherit xorg-2 toolchain-funcs flag-o-matic +inherit xorg-2 toolchain-funcs DESCRIPTION="X.Org X11 library" @@ -44,16 +44,14 @@ } multilib_src_compile() { - # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys' if tc-is-cross-compiler; then - ( - filter-flags -m* - emake -C src/util \ - CC=$(tc-getBUILD_CC) \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="" \ - clean all || die - ) + # Make sure the build-time tool "makekeys" uses build settings. + tc-export_build_env BUILD_CC + emake -C src/util \ + CC="${BUILD_CC}" \ + CFLAGS="${BUILD_CFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + clean all fi default 1.224 x11-libs/libX11/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/ChangeLog?rev=1.224&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/ChangeLog?rev=1.224&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/ChangeLog?r1=1.223&r2=1.224 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- ChangeLog 11 Mar 2015 00:30:30 -0000 1.223 +++ ChangeLog 23 Jul 2015 03:43:25 -0000 1.224 @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libX11 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.223 2015/03/11 00:30:30 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.224 2015/07/23 03:43:25 vapier Exp $ + + 23 Jul 2015; Mike Frysinger <[email protected]> libX11-1.6.2.ebuild, + libX11-1.6.3.ebuild: + Fix cross-compiling logic with the makekeys tool by using the proper env vars. *libX11-1.6.3 (11 Mar 2015)
