diff options
| author |   Gordon Malm <gengor@gentoo.org> | 2009-03-28 00:21:13 +0000 |
|---|---|---|
| committer | Gordon Malm <gengor@gentoo.org> | 2009-03-28 00:21:13 +0000 |
| commit | e6cff90a64f0f908d94192860dc109496e764bb6 (patch) | |
| tree | a474a796024842b7b3561f6d66ed2711531ad912 /eclass | |
| parent | Add a patch to build under Solaris (for Prefix). (diff) | |
| download | historical-e6cff90a64f0f908d94192860dc109496e764bb6.tar.gz historical-e6cff90a64f0f908d94192860dc109496e764bb6.tar.bz2 historical-e6cff90a64f0f908d94192860dc109496e764bb6.zip | |
Add fix for bug 253127 dropped in qt4-build.eclass revision 1.21
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt4-build.eclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 35ad778d2823..ff9a1113e3e0 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.28 2009/03/16 08:21:18 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.29 2009/03/28 00:21:13 gengor Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -135,7 +135,6 @@ qt4-build_src_prepare() { replace-flags -O3 -O2 fi - # Bug 253127 # Unsupported old gcc versions - hardened needs this :( if [[ $(gcc-major-version) -lt "4" ]] ; then ewarn "Appending -fno-stack-protector to CXXFLAGS" @@ -148,6 +147,12 @@ qt4-build_src_prepare() { append-flags -fno-gcse fi + # Bug 253127 + if [[ $(gcc-major-version) -lt "4" ]] ; then + sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ + -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed" + fi + # Bug 172219 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |