summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2012-05-07 21:28:01 +0000
committerDavide Pesavento <pesa@gentoo.org>2012-05-07 21:28:01 +0000
commit13b8db31dceb4dd6e410d98a47029bb684efff98 (patch)
tree30460b96d318147a392df2aa300a1181b51081df /eclass/qt4-build.eclass
parentVersion bump. (diff)
downloadhistorical-13b8db31dceb4dd6e410d98a47029bb684efff98.tar.gz
historical-13b8db31dceb4dd6e410d98a47029bb684efff98.tar.bz2
historical-13b8db31dceb4dd6e410d98a47029bb684efff98.zip
Stop stripping upstream CFLAGS from g++.conf for Qt 4.8 and later (see bug 352778 comment #6).
Diffstat (limited to 'eclass/qt4-build.eclass')
-rw-r--r--eclass/qt4-build.eclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 9909c1db4f0c..be72e71689fb 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.127 2012/05/02 17:09:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.128 2012/05/07 21:28:01 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -283,8 +283,10 @@ qt4-build_src_prepare() {
'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
|| die "sed config.tests failed"
- # Strip predefined CFLAGS from mkspecs (bug 312689)
- sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
+ if ! version_is_at_least 4.8; then
+ # Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778)
+ sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
+ fi
# Bug 172219
sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die