| 1 |
gengor 09/01/21 08:55:28 |
| 2 |
|
| 3 |
Modified: qt4-build.eclass |
| 4 |
Log: |
| 5 |
Append -fno-stack-protector-all to creation of internal qmake, bug 253127 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.18 eclass/qt4-build.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.18&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.18&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.17&r2=1.18 |
| 13 |
|
| 14 |
Index: qt4-build.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
| 17 |
retrieving revision 1.17 |
| 18 |
retrieving revision 1.18 |
| 19 |
diff -u -r1.17 -r1.18 |
| 20 |
--- qt4-build.eclass 12 Jan 2009 23:47:16 -0000 1.17 |
| 21 |
+++ qt4-build.eclass 21 Jan 2009 08:55:28 -0000 1.18 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 2007-2008 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.17 2009/01/12 23:47:16 yngwin Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.18 2009/01/21 08:55:28 gengor Exp $ |
| 27 |
|
| 28 |
# @ECLASS: qt4-build.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -93,6 +93,12 @@ |
| 31 |
symlink_binaries_to_buildtree |
| 32 |
fi |
| 33 |
|
| 34 |
+ # Bug 253127 |
| 35 |
+ if [[ $(gcc-major-version) -lt "4" ]] ; then |
| 36 |
+ sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ |
| 37 |
+ -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed" |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
| 41 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
| 42 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 43 |
@@ -111,9 +117,9 @@ |
| 44 |
strip-flags |
| 45 |
replace-flags -O3 -O2 |
| 46 |
|
| 47 |
- if [[ $(gcc-fullversion) == "3.4.6" && gcc-specs-ssp ]] ; then |
| 48 |
- ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" |
| 49 |
- append-flags -fno-stack-protector |
| 50 |
+ if [[ $(gcc-major-version) -lt "4" ]] ; then |
| 51 |
+ ewarn "Appending -fno-stack-protector to CXXFLAGS" |
| 52 |
+ append-cxxflags -fno-stack-protector |
| 53 |
fi |
| 54 |
|
| 55 |
# Bug 178652 |
Archives