pesa 14/12/18 14:35:03 Modified: ChangeLog qt4-build-multilib.eclass Log: Fix breakage caused by recent multilib-build.eclass changes (bug 532510).
Revision Changes Path 1.1467 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1467&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1467&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1466&r2=1.1467 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1466 retrieving revision 1.1467 diff -u -r1.1466 -r1.1467 --- ChangeLog 17 Dec 2014 16:40:53 -0000 1.1466 +++ ChangeLog 18 Dec 2014 14:35:03 -0000 1.1467 @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1466 2014/12/17 16:40:53 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1467 2014/12/18 14:35:03 pesa Exp $ + + 18 Dec 2014; Davide Pesavento <[email protected]> qt4-build-multilib.eclass: + Fix breakage caused by recent multilib-build.eclass changes (bug 532510). + Patch by zorry, based on a previous patch by Greg Turner. Thanks also to + floppym and mgorny for the initial investigation and suggestions. 17 Dec 2014; Andreas K. Huettel <[email protected]> perl-module.eclass: Remove code paths that are not called anymore 1.3 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.2&r2=1.3 Index: qt4-build-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt4-build-multilib.eclass 17 Nov 2014 00:24:43 -0000 1.2 +++ qt4-build-multilib.eclass 18 Dec 2014 14:35:03 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.2 2014/11/17 00:24:43 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.3 2014/12/18 14:35:03 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -272,10 +272,14 @@ qt4_symlink_tools_to_build_dir - # toolchain setup - tc-export CC CXX OBJCOPY STRIP - export AR="$(tc-getAR) cqs" - export LD="$(tc-getCXX)" + # toolchain setup ('local -x' because of bug 532510) + local -x \ + AR="$(tc-getAR) cqs" \ + CC=$(tc-getCC) \ + CXX=$(tc-getCXX) \ + LD=$(tc-getCXX) \ + OBJCOPY=$(tc-getOBJCOPY) \ + STRIP=$(tc-getSTRIP) # convert tc-arch to the values supported by Qt local arch=
