diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-05-07 21:28:01 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-05-07 21:28:01 +0000 |
| commit | 0172039e2f7709c3768f5930a295fcead5c1d51a (patch) | |
| tree | 0525817d7f89aa8f8f07f686c5eb4c51a3875dd7 /eclass | |
| parent | Version bump. (diff) | |
| download | gentoo-2-0172039e2f7709c3768f5930a295fcead5c1d51a.tar.gz gentoo-2-0172039e2f7709c3768f5930a295fcead5c1d51a.tar.bz2 gentoo-2-0172039e2f7709c3768f5930a295fcead5c1d51a.zip | |
Stop stripping upstream CFLAGS from g++.conf for Qt 4.8 and later (see bug 352778 comment #6).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 51ae68cb9611..57cde8baba8a 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.241 2012/05/06 10:41:48 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.242 2012/05/07 21:28:01 pesa Exp $ + + 07 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Stop stripping upstream CFLAGS from g++.conf for Qt 4.8 and later (see bug + 352778 comment #6). 06 May 2012; Fabian Groffen <grobian@gentoo.org> +ELT-patches/sol2-conf/2.4.2, libtool.eclass: 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 |