diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2013-08-13 10:05:37 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2013-08-13 10:05:37 +0000 |
| commit | 263feab2e01fd9fe7e2dcd3c5e70765a516e923e (patch) | |
| tree | c01abbf46f624548a49b4b2e0b9284b109932302 | |
| parent | Fix for prefix and add ~arm-linux + ~x86-linux keywords. (diff) | |
| download | gentoo-2-263feab2e01fd9fe7e2dcd3c5e70765a516e923e.tar.gz gentoo-2-263feab2e01fd9fe7e2dcd3c5e70765a516e923e.tar.bz2 gentoo-2-263feab2e01fd9fe7e2dcd3c5e70765a516e923e.zip | |
Remove workarounds for very old and unsupported gcc-3 versions. Warn if trying to use gcc < 4.4 and USE=c++0x.
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 19 |
2 files changed, 8 insertions, 17 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 38e9473a4717..67b5d1449ccc 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.922 2013/08/11 16:20:23 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.923 2013/08/13 10:05:37 pesa Exp $ + + 13 Aug 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Remove workarounds for very old and unsupported gcc-3 versions. Warn if + trying to use gcc < 4.4 and USE=c++0x. 11 Aug 2013; Justin Lecher <jlec@gentoo.org> cuda.eclass: Add compatibility to latest cuda compiler; respect LDFLAGS diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index ba0ed38800a1..2fe464e71b3d 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.148 2013/07/27 23:47:20 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.149 2013/08/13 10:05:37 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -101,6 +101,8 @@ qt4-build_src_unpack() { if ! version_is_at_least 4.1 $(gcc-version); then ewarn "Using a GCC version lower than 4.1 is not supported." + elif use_if_iuse c++0x && ! version_is_at_least 4.4 $(gcc-version); then + ewarn "USE=c++0x requires GCC 4.4 or later." fi if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then @@ -185,25 +187,10 @@ qt4-build_src_prepare() { replace-flags -O[23] -O1 fi - # Bug 178652 - if [[ $(gcc-major-version) == 3 ]] && use amd64; then - ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" - append-flags -fno-gcse - fi - if use_if_iuse c++0x; then append-cxxflags -std=c++0x 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 - # Bug 253127 - sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ - -i mkspecs/common/g++.conf || die - fi - # Bug 261632 if use ppc64; then ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS" |