[gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass

[Gordon Malm (gengor)]

gengor      09/03/28 00:21:13

  Modified:             qt4-build.eclass
  Log:
  Add fix for bug 253127 dropped in qt4-build.eclass revision 1.21

Revision  Changes    Path
1.29                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.28&r2=1.29

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- qt4-build.eclass	16 Mar 2009 08:21:18 -0000	1.28
+++ qt4-build.eclass	28 Mar 2009 00:21:13 -0000	1.29
@@ -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 @@
 		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 @@
 		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}:" \