diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2008-10-24 10:15:51 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2008-10-24 10:15:51 +0000 |
| commit | 0ed9e0d4719387a718b7b93344d2655f87a5686f (patch) | |
| tree | fc5dab915d82cd7fcce18ca7b6212048e3edc597 | |
| parent | remove old (diff) | |
| download | gentoo-2-0ed9e0d4719387a718b7b93344d2655f87a5686f.tar.gz gentoo-2-0ed9e0d4719387a718b7b93344d2655f87a5686f.tar.bz2 gentoo-2-0ed9e0d4719387a718b7b93344d2655f87a5686f.zip | |
Improve CFLAGS filtering for gcc 3.4.x, thanks to Gordon Malm <gengor@gentoo.org>
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo i686)
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.0.0.ebuild | 16 |
2 files changed, 13 insertions, 10 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index ee0c02c00ae1..6cf5b5d1a84c 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.434 2008/10/20 18:27:52 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.435 2008/10/24 10:15:51 suka Exp $ + + 24 Oct 2008; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.0.0.ebuild: + Improve CFLAGS filtering for gcc 3.4.x, thanks to Gordon Malm + <gengor@gentoo.org> 20 Oct 2008; Andreas Proschofsky <suka@gentoo.org> files/gentoo-3.0.0.diff, openoffice-3.0.0.ebuild: diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild index a33b220cc1bd..b040785e2c78 100644 --- a/app-office/openoffice/openoffice-3.0.0.ebuild +++ b/app-office/openoffice/openoffice-3.0.0.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.13 2008/10/20 18:27:52 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.14 2008/10/24 10:15:51 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" EAPI="1" -inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib +inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs IUSE="cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates" @@ -324,16 +324,14 @@ src_compile() { filter-flags "-fstack-protector" filter-flags "-fstack-protector-all" filter-flags "-ftracer" - - if has_version <=sys-devel/gcc-3.4.7 ; then - use hardened || filter-flags "-fforce-addr" - is-flag -fomit-frame-pointer && append-flags "-momit-leaf-frame-pointer" - else - filter-flags "-fforce-addr" - fi + filter-flags "-fforce-addr" filter-flags "-O[s2-9]" + if [[ $(gcc-major-version) -lt 4 ]]; then + replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer" + fi + # Build with NVidia cards breaks otherwise use opengl && append-flags "-DGL_GLEXT_PROTOTYPES" |