diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-08-14 18:00:38 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-08-14 18:00:38 +0000 |
| commit | c975eb732210797bc9f99cc8d8a257a0afc89e69 (patch) | |
| tree | 4600375f2e563f3eb2fca62bf8826da6e7926c40 /eclass | |
| parent | alpha/ia64/sparc stable wrt #314899 (diff) | |
| download | historical-c975eb732210797bc9f99cc8d8a257a0afc89e69.tar.gz historical-c975eb732210797bc9f99cc8d8a257a0afc89e69.tar.bz2 historical-c975eb732210797bc9f99cc8d8a257a0afc89e69.zip | |
Quote CC,CXX,LD,LINK. Bug #332669. Thanks to Harald van Dijk
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt4-build.eclass | 6 | ||||
| -rw-r--r-- | eclass/qt4-r2.eclass | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 996ae66bc112..6f2ce8aa3e39 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.80 2010/08/13 16:36:10 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.81 2010/08/14 18:00:38 hwoarang Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -224,13 +224,13 @@ qt4-build_src_prepare() { fi # Bug 282984 && Bug 295530 - sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ + 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" # bug 321335 if version_is_at_least 4.6; then 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" \ + sed -e "s:\(\$MAKE\):\1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" "LINK=$(tc-getCXX)":g" \ -i || die "sed test compilers failed" fi diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass index 086af3767347..b56cd90f9908 100644 --- a/eclass/qt4-r2.eclass +++ b/eclass/qt4-r2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.7 2010/07/31 14:40:14 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.8 2010/08/14 18:00:38 hwoarang Exp $ # @ECLASS: qt4-r2.eclass # @MAINTAINER: @@ -249,9 +249,9 @@ eqmake4() { -config ${CONFIG_ADD} \ QTDIR="${EPREFIX}"/usr/$(get_libdir) \ QMAKE="${EPREFIX}"/usr/bin/qmake \ - QMAKE_CC=$(tc-getCC) \ - QMAKE_CXX=$(tc-getCXX) \ - QMAKE_LINK=$(tc-getCXX) \ + QMAKE_CC="$(tc-getCC)" \ + QMAKE_CXX="$(tc-getCXX)" \ + QMAKE_LINK="$(tc-getCXX)" \ QMAKE_CFLAGS_RELEASE="${CFLAGS}" \ QMAKE_CFLAGS_DEBUG="${CFLAGS}" \ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \ |