diff options
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build-multilib.eclass | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index bf9067b1d901..6b2b20f6df83 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1661 2015/06/13 22:13:24 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1662 2015/06/13 22:57:59 pesa Exp $ + + 13 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass: + Export MAKEFLAGS and OBJDUMP. 13 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass: sh is "supported", don't fallback to generic. Also, don't die when tc-arch is diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 54d225a6e7ff..9f10d72a8819 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -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/eclass/qt4-build-multilib.eclass,v 1.24 2015/06/13 22:13:24 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.25 2015/06/13 22:57:59 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -296,7 +296,9 @@ qt4_multilib_src_configure() { CC=$(tc-getCC) \ CXX=$(tc-getCXX) \ LD=$(tc-getCXX) \ + MAKEFLAGS=${MAKEOPTS} \ OBJCOPY=$(tc-getOBJCOPY) \ + OBJDUMP=$(tc-getOBJDUMP) \ STRIP=$(tc-getSTRIP) # convert tc-arch to the values supported by Qt |