diff options
| author |   Mamoru Komachi <usata@gentoo.org> | 2004-09-23 04:45:55 +0000 |
|---|---|---|
| committer | Mamoru Komachi <usata@gentoo.org> | 2004-09-23 04:45:55 +0000 |
| commit | 87bc42c76b6749109dbac0739f07b254ce1ea1bc (patch) | |
| tree | 8ad3b623c4f7441a24d04dcfa09dc77413ae3c54 /app-editors | |
| parent | security stable (Manifest recommit) (diff) | |
| download | gentoo-2-87bc42c76b6749109dbac0739f07b254ce1ea1bc.tar.gz gentoo-2-87bc42c76b6749109dbac0739f07b254ce1ea1bc.tar.bz2 gentoo-2-87bc42c76b6749109dbac0739f07b254ce1ea1bc.zip | |
Filtered out -O[3-9] if gcc-3.4 detected; bug #64832, bug #64790 and bug #64286.
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.3-r3.ebuild | 11 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.3-r4.ebuild | 9 |
3 files changed, 21 insertions, 6 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index c1a0b64c11fa..f0daa0a450bc 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.34 2004/09/07 14:29:18 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.35 2004/09/23 04:45:55 usata Exp $ + + 23 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> emacs-21.3-r3.ebuild, + emacs-21.3-r4.ebuild: + Filtered out -O[3-9] if gcc-3.4 detected; bug #64832, bug #64790 + and bug #64286. 07 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> emacs-21.3-r4.ebuild: Added nosendmail USE flag. This closes bug #11104. diff --git a/app-editors/emacs/emacs-21.3-r3.ebuild b/app-editors/emacs/emacs-21.3-r3.ebuild index f6d19c3eb9b4..0c656e8e0b63 100644 --- a/app-editors/emacs/emacs-21.3-r3.ebuild +++ b/app-editors/emacs/emacs-21.3-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r3.ebuild,v 1.7 2004/07/04 14:15:47 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r3.ebuild,v 1.8 2004/09/23 04:45:55 usata Exp $ -inherit flag-o-matic eutils +inherit flag-o-matic eutils gcc DESCRIPTION="An incredibly powerful, extensible text editor" HOMEPAGE="http://www.gnu.org/software/emacs" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc -alpha arm -hppa ~amd64 -ia64 ~s390" +KEYWORDS="x86 ppc ~sparc -alpha arm -hppa ~amd64 -ia64 ~s390" IUSE="X nls motif leim gnome Xaw3d lesstif" RDEPEND="sys-libs/ncurses @@ -43,6 +43,11 @@ src_compile() { # -fstack-protector gets internal compiler error at xterm.c (bug 33265) filter-flags -fstack-protector + # gcc 3.4 with -O3 or stronger flag spoils emacs + if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then + replace-flags -O[3-9] -O2 + fi + epatch ${FILESDIR}/${P}-amd64.patch epatch ${FILESDIR}/${P}-hppa.patch diff --git a/app-editors/emacs/emacs-21.3-r4.ebuild b/app-editors/emacs/emacs-21.3-r4.ebuild index cef032e276d7..dc7b41898feb 100644 --- a/app-editors/emacs/emacs-21.3-r4.ebuild +++ b/app-editors/emacs/emacs-21.3-r4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r4.ebuild,v 1.4 2004/09/07 14:29:18 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r4.ebuild,v 1.5 2004/09/23 04:45:55 usata Exp $ -inherit flag-o-matic eutils alternatives +inherit flag-o-matic eutils alternatives gcc DESCRIPTION="An incredibly powerful, extensible text editor" HOMEPAGE="http://www.gnu.org/software/emacs" @@ -44,6 +44,11 @@ src_compile() { # -fstack-protector gets internal compiler error at xterm.c (bug 33265) filter-flags -fstack-protector + # gcc 3.4 with -O3 or stronger flag spoils emacs + if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then + replace-flags -O[3-9] -O2 + fi + epatch ${FILESDIR}/${P}-amd64.patch epatch ${FILESDIR}/${P}-hppa.patch use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch |