Fix breakage caused by recent multilib-build.eclass changes (bug 532510).

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 6efff6217d8b7a1459cea7cca9edbef335ede119..121bd8293a1395c25bcaa61ce1cd141ca0800e80 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -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 <pesa@gentoo.org> 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 <dilfridge@gentoo.org> perl-module.eclass:
   Remove code paths that are not called anymore

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index c8459245f1f47ec5c294e41513d810f0ecaa71a0..8d32832785fc18ee33dd1a3bdd437e70b06851c7 100644 (file)
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -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_multilib_src_configure() {
 
        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=