summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2006-10-30 18:20:20 +0000
committerCaleb Tennis <caleb@gentoo.org>2006-10-30 18:20:20 +0000
commit86a0c888f5ddb8012fa1421871da8bce8b9ccc04 (patch)
tree651c586dc2c05457db34c477463ac3f78ae968b8 /x11-libs
parenttouchups (diff)
downloadgentoo-2-86a0c888f5ddb8012fa1421871da8bce8b9ccc04.tar.gz
gentoo-2-86a0c888f5ddb8012fa1421871da8bce8b9ccc04.tar.bz2
gentoo-2-86a0c888f5ddb8012fa1421871da8bce8b9ccc04.zip
Fix icc detection per bug #152366
(Portage version: 2.1.2_pre3-r7)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt/ChangeLog5
-rw-r--r--x11-libs/qt/qt-3.3.6-r4.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 33568db4acfe..3f03df0bd4c4 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.379 2006/10/30 18:18:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.380 2006/10/30 18:20:20 caleb Exp $
+
+ 30 Oct 2006; Caleb Tennis <caleb@gentoo.org> qt-3.3.6-r4.ebuild:
+ Fix icc detection per bug #152366
30 Oct 2006; Caleb Tennis <caleb@gentoo.org> qt-4.1.4-r2.ebuild,
qt-4.2.1.ebuild:
diff --git a/x11-libs/qt/qt-3.3.6-r4.ebuild b/x11-libs/qt/qt-3.3.6-r4.ebuild
index 369c754b458b..08bc3226672f 100644
--- a/x11-libs/qt/qt-3.3.6-r4.ebuild
+++ b/x11-libs/qt/qt-3.3.6-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r4.ebuild,v 1.8 2006/10/29 19:59:54 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r4.ebuild,v 1.9 2006/10/30 18:20:20 caleb Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -68,8 +68,8 @@ pkg_setup() {
CXX=$(tc-getCXX)
if [[ ${CXX/g++/} != ${CXX} ]]; then
PLATCXX="g++"
- elif [[ ${CXX/icc/} != ${CXX} ]]; then
- PLATCXX="icpc"
+ elif [[ ${CXX/icpc/} != ${CXX} ]]; then
+ PLATCXX="icc"
else
die "Unknown compiler ${CXX}."
fi