diff options
| author |   Dominik Kapusta <ayoy@gentoo.org> | 2009-11-09 19:35:44 +0000 |
|---|---|---|
| committer | Dominik Kapusta <ayoy@gentoo.org> | 2009-11-09 19:35:44 +0000 |
| commit | eb1f9a1c7e8c315bc08c14a81ca6c5991167a1f9 (patch) | |
| tree | ba35b3c4774f5f76dbb6a69c5323e870750a681b /eclass | |
| parent | Version bump wrt #292242, thanks to Jean-Noël Rivasseau for reporting. (diff) | |
| download | gentoo-2-eb1f9a1c7e8c315bc08c14a81ca6c5991167a1f9.tar.gz gentoo-2-eb1f9a1c7e8c315bc08c14a81ca6c5991167a1f9.tar.bz2 gentoo-2-eb1f9a1c7e8c315bc08c14a81ca6c5991167a1f9.zip | |
Fix cross-compilation with distcc for qt ebuilds - bug #282984
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt4-build.eclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 237d7880a545..443427cdd7c8 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 2007-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.49 2009/11/09 19:30:40 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.50 2009/11/09 19:35:44 ayoy Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -178,6 +178,12 @@ qt4-build_src_prepare() { symlink_binaries_to_buildtree fi + # Bug 282984 + sed -e "s/\(^SYSTEM_VARIABLES\)/CC=$(tc-getCC)\nCXX=$(tc-getCXX)\n\1/" \ + -i configure || die "sed qmake compilers failed" + sed -e "s/\(\$MAKE\)/\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX)/" \ + -i config.tests/unix/compile.test || die "sed test compilers failed" + # Bug 178652 if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" |