summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2009-12-06 09:34:36 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2009-12-06 09:34:36 +0000
commite609b5e68b4b7002c658ae8edf16ef76262fc874 (patch)
tree820e37d92dc5225aca4ce260512a3a2952576ad6 /eclass/qt4-build.eclass
parentVersion bump #290370 by Jochen. (diff)
downloadhistorical-e609b5e68b4b7002c658ae8edf16ef76262fc874.tar.gz
historical-e609b5e68b4b7002c658ae8edf16ef76262fc874.tar.bz2
historical-e609b5e68b4b7002c658ae8edf16ef76262fc874.zip
Use ':' as delimiter. Fixes bug 295530
Diffstat (limited to 'eclass/qt4-build.eclass')
-rw-r--r--eclass/qt4-build.eclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 40c07e0a3eac..a41af4887727 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.53 2009/11/19 12:01:35 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.54 2009/12/06 09:34:36 hwoarang Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -195,10 +195,10 @@ qt4-build_src_prepare() {
symlink_binaries_to_buildtree
fi
- # Bug 282984
- sed -e "s/\(^SYSTEM_VARIABLES\)/CC=$(tc-getCC)\nCXX=$(tc-getCXX)\n\1/" \
+ # Bug 282984 && Bug 295530
+ 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)/" \
+ 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