Gentoo Archives: gentoo-commits

From: "Gordon Malm (gengor)" <gengor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass
Date: Sat, 28 Mar 2009 00:33:35
Message-Id: E1LnMUP-0001nv-9g@stork.gentoo.org
1 gengor 09/03/28 00:33:33
2
3 Modified: qt4-build.eclass
4 Log:
5 Refactor gcc-3 stack-protector filtering a bit more
6
7 Revision Changes Path
8 1.30 eclass/qt4-build.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.30&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.30&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.29&r2=1.30
13
14 Index: qt4-build.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
17 retrieving revision 1.29
18 retrieving revision 1.30
19 diff -u -r1.29 -r1.30
20 --- qt4-build.eclass 28 Mar 2009 00:21:13 -0000 1.29
21 +++ qt4-build.eclass 28 Mar 2009 00:33:33 -0000 1.30
22 @@ -1,6 +1,6 @@
23 # Copyright 2007-2009 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.29 2009/03/28 00:21:13 gengor Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.30 2009/03/28 00:33:33 gengor Exp $
27
28 # @ECLASS: qt4-build.eclass
29 # @MAINTAINER:
30 @@ -135,20 +135,17 @@
31 replace-flags -O3 -O2
32 fi
33
34 - # Unsupported old gcc versions - hardened needs this :(
35 - if [[ $(gcc-major-version) -lt "4" ]] ; then
36 - ewarn "Appending -fno-stack-protector to CXXFLAGS"
37 - append-cxxflags -fno-stack-protector
38 - fi
39 -
40 # Bug 178652
41 if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
42 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
43 append-flags -fno-gcse
44 fi
45
46 - # Bug 253127
47 + # Unsupported old gcc versions - hardened needs this :(
48 if [[ $(gcc-major-version) -lt "4" ]] ; then
49 + ewarn "Appending -fno-stack-protector to CXXFLAGS"
50 + append-cxxflags -fno-stack-protector
51 + # Bug 253127
52 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
53 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
54 fi