diff options
| author |   Gordon Malm <gengor@gentoo.org> | 2009-03-28 00:33:33 +0000 |
|---|---|---|
| committer | Gordon Malm <gengor@gentoo.org> | 2009-03-28 00:33:33 +0000 |
| commit | 80fef227b0cac1f3fd6f1578c24f9b448de5599f (patch) | |
| tree | 1438585963c12b4c4806fb8d6cf05ac2601a1daf /eclass | |
| parent | Add fix for bug 253127 dropped in qt4-build.eclass revision 1.21 (diff) | |
| download | gentoo-2-80fef227b0cac1f3fd6f1578c24f9b448de5599f.tar.gz gentoo-2-80fef227b0cac1f3fd6f1578c24f9b448de5599f.tar.bz2 gentoo-2-80fef227b0cac1f3fd6f1578c24f9b448de5599f.zip | |
Refactor gcc-3 stack-protector filtering a bit more
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt4-build.eclass | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index ff9a1113e3e0..3451e07a9efe 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.29 2009/03/28 00:21:13 gengor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.30 2009/03/28 00:33:33 gengor Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -135,20 +135,17 @@ qt4-build_src_prepare() { replace-flags -O3 -O2 fi - # Unsupported old gcc versions - hardened needs this :( - if [[ $(gcc-major-version) -lt "4" ]] ; then - ewarn "Appending -fno-stack-protector to CXXFLAGS" - append-cxxflags -fno-stack-protector - fi - # Bug 178652 if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" append-flags -fno-gcse fi - # Bug 253127 + # Unsupported old gcc versions - hardened needs this :( if [[ $(gcc-major-version) -lt "4" ]] ; then + ewarn "Appending -fno-stack-protector to CXXFLAGS" + append-cxxflags -fno-stack-protector + # Bug 253127 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 |