diff options
| author |   Dror Levin <spatz@gentoo.org> | 2010-05-24 22:03:30 +0000 |
|---|---|---|
| committer | Dror Levin <spatz@gentoo.org> | 2010-05-24 22:03:30 +0000 |
| commit | fe4ab92b7c647866a4cc91cb830b81054135f882 (patch) | |
| tree | 3ca865b055e75e1ecd7fe6d11e9a509cb088581c /eclass | |
| parent | Fixing krbplugin install, and server examples location, bug #320953 , patch t... (diff) | |
| download | gentoo-2-fe4ab92b7c647866a4cc91cb830b81054135f882.tar.gz gentoo-2-fe4ab92b7c647866a4cc91cb830b81054135f882.tar.bz2 gentoo-2-fe4ab92b7c647866a4cc91cb830b81054135f882.zip | |
Fix CC, CXX, LD and LINK in all test files, bug 321335.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt4-build.eclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index ae6a19e0d0b5..09ec0229cf18 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-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.69 2010/05/24 14:27:13 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.70 2010/05/24 22:03:30 spatz Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -213,8 +213,11 @@ qt4-build_src_prepare() { # Bug 282984 && Bug 295530 sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ -i configure || die "sed qmake compilers failed" - sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):" \ - -i config.tests/unix/compile.test || die "sed test compilers failed" + # bug 321335 + find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ + xargs -0 \ + sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):g" \ + -i || die "sed test compilers failed" # Bug 172219 sed -e "s:X11R6/::" \ |