diff options
| author |   Ingmar Vanhassel <ingmar@gentoo.org> | 2008-03-11 16:51:15 +0000 |
|---|---|---|
| committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-03-11 16:51:15 +0000 |
| commit | 7f2712b2c1fd1a21ae526699e72fada02d0a4599 (patch) | |
| tree | ac5a28d8bf3d08f1081e5f79dce0d3ef723275a9 /x11-libs/qt | |
| parent | Drop to ~mips due to unstable deps (diff) | |
| download | gentoo-2-7f2712b2c1fd1a21ae526699e72fada02d0a4599.tar.gz gentoo-2-7f2712b2c1fd1a21ae526699e72fada02d0a4599.tar.bz2 gentoo-2-7f2712b2c1fd1a21ae526699e72fada02d0a4599.zip | |
"append-flags -fno-gcse" on amd64 with gcc 3, bug 178652.
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.3.2-r1.ebuild | 8 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.3.4.ebuild | 8 |
3 files changed, 19 insertions, 3 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 2eb94a7d3b1e..e20a04535dbc 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.523 2008/03/09 21:45:56 zlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.524 2008/03/11 16:51:15 ingmar Exp $ + + 11 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-4.3.2-r1.ebuild, + qt-4.3.4.ebuild: + "append-flags -fno-gcse" on amd64 with gcc 3, bug 178652. 09 Mar 2008; Bo Ørsted Andresen <zlin@gentoo.org> qt-4.4.0_beta1.ebuild: Revert last commit. diff --git a/x11-libs/qt/qt-4.3.2-r1.ebuild b/x11-libs/qt/qt-4.3.2-r1.ebuild index d2d1cb98d7ea..01b545f94c46 100644 --- a/x11-libs/qt/qt-4.3.2-r1.ebuild +++ b/x11-libs/qt/qt-4.3.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2-r1.ebuild,v 1.8 2008/03/05 16:40:05 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2-r1.ebuild,v 1.9 2008/03/11 16:51:15 ingmar Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -135,6 +135,12 @@ src_unpack() { append-flags -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 + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ diff --git a/x11-libs/qt/qt-4.3.4.ebuild b/x11-libs/qt/qt-4.3.4.ebuild index 59624660b250..4b5d6f56e312 100644 --- a/x11-libs/qt/qt-4.3.4.ebuild +++ b/x11-libs/qt/qt-4.3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.4.ebuild,v 1.2 2008/03/05 16:40:05 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.4.ebuild,v 1.3 2008/03/11 16:51:15 ingmar Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -133,6 +133,12 @@ src_unpack() { append-flags -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 + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |