summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDror Levin <spatz@gentoo.org>2011-01-20 23:08:09 +0000
committerDror Levin <spatz@gentoo.org>2011-01-20 23:08:09 +0000
commit8b1b9ba8f685fe91f364ce12fa89ee186bd0ff4e (patch)
tree50a4404bf9f1300e88eb14da427fd7f6a67c8af9 /eclass
parentVersion bump, bug 331637. Migrated to qt4-r2 eclass and to EAPI 3. Drop old (diff)
downloadhistorical-8b1b9ba8f685fe91f364ce12fa89ee186bd0ff4e.tar.gz
historical-8b1b9ba8f685fe91f364ce12fa89ee186bd0ff4e.tar.bz2
historical-8b1b9ba8f685fe91f364ce12fa89ee186bd0ff4e.zip
Fix escaping of quotes in qt4-build.eclass, bug 332669.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/qt4-build.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 3f4165da3067..c1f3db52b8e7 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.87 2010/11/13 20:50:57 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.88 2011/01/20 23:08:09 spatz Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -220,13 +220,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