diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-10-25 21:02:24 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-10-25 21:02:24 +0000 |
| commit | 381609c8e83666f7a5239a1448e35fd8042e1ad9 (patch) | |
| tree | 1ce33c39b5c46d232dfc51023c18ce2680927236 /app-editors | |
| parent | Version bump (diff) | |
| download | gentoo-2-381609c8e83666f7a5239a1448e35fd8042e1ad9.tar.gz gentoo-2-381609c8e83666f7a5239a1448e35fd8042e1ad9.tar.bz2 gentoo-2-381609c8e83666f7a5239a1448e35fd8042e1ad9.zip | |
Filter -fstack-protector and -fstack-protector-all flags, bug 285778.
(Portage version: 2.1.9.21/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.4-r22.ebuild | 4 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-22.3-r6.ebuild | 4 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-23.2-r2.ebuild | 5 |
4 files changed, 13 insertions, 7 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 0ed0d5b4f0d2..952e7cf9cef1 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.390 2010/10/13 21:37:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.391 2010/10/25 21:02:24 ulm Exp $ + + 25 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-22.3-r6.ebuild, + emacs-23.2-r2.ebuild: + Filter -fstack-protector and -fstack-protector-all flags that cause + segmentation faults in hardened profiles. Bug 285778. 13 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r22.ebuild, emacs-22.3-r6.ebuild, emacs-23.2-r2.ebuild: diff --git a/app-editors/emacs/emacs-21.4-r22.ebuild b/app-editors/emacs/emacs-21.4-r22.ebuild index e67f1c4888ec..d6d0153a5aae 100644 --- a/app-editors/emacs/emacs-21.4-r22.ebuild +++ b/app-editors/emacs/emacs-21.4-r22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r22.ebuild,v 1.3 2010/10/13 21:37:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r22.ebuild,v 1.4 2010/10/25 21:02:24 ulm Exp $ EAPI=2 @@ -58,7 +58,7 @@ src_prepare() { src_configure() { # -fstack-protector gets internal compiler error at xterm.c (bug 33265) - filter-flags -fstack-protector + filter-flags -fstack-protector -fstack-protector-all # emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002) unset LDFLAGS diff --git a/app-editors/emacs/emacs-22.3-r6.ebuild b/app-editors/emacs/emacs-22.3-r6.ebuild index c0352626c804..01905d78ad7c 100644 --- a/app-editors/emacs/emacs-22.3-r6.ebuild +++ b/app-editors/emacs/emacs-22.3-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r6.ebuild,v 1.3 2010/10/13 21:37:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r6.ebuild,v 1.4 2010/10/25 21:02:24 ulm Exp $ EAPI=2 @@ -82,7 +82,7 @@ src_prepare() { src_configure() { ALLOWED_FLAGS="" strip-flags - #unset LDFLAGS + filter-flags -fstack-protector -fstack-protector-all #285778 replace-flags -O[3-9] -O2 sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die diff --git a/app-editors/emacs/emacs-23.2-r2.ebuild b/app-editors/emacs/emacs-23.2-r2.ebuild index 74e187260434..30eeee4e77a6 100644 --- a/app-editors/emacs/emacs-23.2-r2.ebuild +++ b/app-editors/emacs/emacs-23.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.3 2010/10/13 21:37:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.4 2010/10/25 21:02:24 ulm Exp $ EAPI=2 @@ -117,7 +117,8 @@ src_prepare() { src_configure() { ALLOWED_FLAGS="" strip-flags - #unset LDFLAGS + filter-flags -fstack-protector -fstack-protector-all #285778 + if use sh; then replace-flags -O[1-9] -O0 #262359 elif use ia64; then |