summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Kennedy <mkennedy@gentoo.org>2004-05-17 06:30:04 +0000
committerMatthew Kennedy <mkennedy@gentoo.org>2004-05-17 06:30:04 +0000
commitf752a4c1398246f4764c4ee1266cf3440bbfdb16 (patch)
treec60c63f57b75041a5069acf61be67ef380869214 /app-editors
parentInitial import (Manifest recommit) (diff)
downloadgentoo-2-f752a4c1398246f4764c4ee1266cf3440bbfdb16.tar.gz
gentoo-2-f752a4c1398246f4764c4ee1266cf3440bbfdb16.tar.bz2
gentoo-2-f752a4c1398246f4764c4ee1266cf3440bbfdb16.zip
*** empty log message ***
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/files/emacs-18.59-gcc-gentoo.patch29
2 files changed, 5 insertions, 30 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 23f3bd65ee7d..e21c3ca80cc9 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.26 2004/05/13 19:30:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.27 2004/05/17 06:30:04 mkennedy Exp $
+
+ 17 May 2004; <mkennedy@gentoo.org> files/emacs-18.59-gcc-gentoo.patch:
+ Remove compiler option adjustments which made the build incompatible with GCC
+ 2.95
13 May 2004; Michael Sterrett <mr_bones_@gentoo.org> emacs-21.3-r3.ebuild:
don't use deprecated ? : use syntax
diff --git a/app-editors/emacs/files/emacs-18.59-gcc-gentoo.patch b/app-editors/emacs/files/emacs-18.59-gcc-gentoo.patch
index ac825f7896c0..c7197a9b5c3e 100644
--- a/app-editors/emacs/files/emacs-18.59-gcc-gentoo.patch
+++ b/app-editors/emacs/files/emacs-18.59-gcc-gentoo.patch
@@ -144,32 +144,3 @@ Only in emacs-18.59/src: pre-crt0.o
Only in emacs-18.59/src: print.o
Only in emacs-18.59/src: process.o
Only in emacs-18.59/src: regex.o
-diff -ur emacs-18.59.orig/src/s-linux.h emacs-18.59/src/s-linux.h
---- emacs-18.59.orig/src/s-linux.h 2004-05-12 19:51:09.959521160 -0500
-+++ emacs-18.59/src/s-linux.h 2004-05-12 20:03:12.614660880 -0500
-@@ -253,7 +253,7 @@
-
- #define C_COMPILER gcc
- #define C_DEBUG_SWITCH -g
--#define C_OPTIMIZE_SWITCH -O2 -malign-loops=2 -malign-jumps=2 -malign-functions=2
-+#define C_OPTIMIZE_SWITCH -O2 -falign-loops=2 -falign-jumps=2 -falign-functions=2
- #define OLDXMENU_OPTIONS CFLAGS=-O2 EXTRA=insque.o
- #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
- #define LIBS_DEBUG /* override in config.h to include -lg */
-Only in emacs-18.59/src: s-linux.h~
-Only in emacs-18.59/src: scroll.o
-Only in emacs-18.59/src: search.o
-Only in emacs-18.59/src: syntax.o
-Only in emacs-18.59/src: sysdep.o
-Only in emacs-18.59/src: temacs
-Only in emacs-18.59/src: term.o
-Only in emacs-18.59/src: terminfo.o
-Only in emacs-18.59/src: undo.o
-Only in emacs-18.59/src: unexelf.o
-Only in emacs-18.59/src: window.o
-Only in emacs-18.59/src: x11fns.o
-Only in emacs-18.59/src: x11term.o
-Only in emacs-18.59/src: xdisp.o
-Only in emacs-18.59/src: xemacs
-Only in emacs-18.59/src: xmakefile
-Only in emacs-18.59/src: xmakefile~