summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2009-07-07 18:40:44 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2009-07-07 18:40:44 +0000
commita7c4c1621279efabc59072c618d7e5666c0445e6 (patch)
treefbe9d534ceea8ccff323d0970baa3a81972c0eb3 /dev-util/cdecl
parentversion bump to 0.5, bug 276949 (diff)
downloadgentoo-2-a7c4c1621279efabc59072c618d7e5666c0445e6.tar.gz
gentoo-2-a7c4c1621279efabc59072c618d7e5666c0445e6.tar.bz2
gentoo-2-a7c4c1621279efabc59072c618d7e5666c0445e6.zip
Fixing build with glibc-2.10, see bug #276068.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'dev-util/cdecl')
-rw-r--r--dev-util/cdecl/ChangeLog5
-rw-r--r--dev-util/cdecl/files/cdecl-2.5.patch37
2 files changed, 37 insertions, 5 deletions
diff --git a/dev-util/cdecl/ChangeLog b/dev-util/cdecl/ChangeLog
index 0744624b15a0..c2898fe9313b 100644
--- a/dev-util/cdecl/ChangeLog
+++ b/dev-util/cdecl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/cdecl
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdecl/ChangeLog,v 1.14 2009/01/11 20:56:37 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdecl/ChangeLog,v 1.15 2009/07/07 18:40:43 phosphan Exp $
+
+ 07 Jul 2009; Patrick Kursawe <phosphan@gentoo.org> files/cdecl-2.5.patch:
+ Fixing build with glibc-2.10, see bug #276068.
11 Jan 2009; Patrick Kursawe <phosphan@gentoo.org> cdecl-2.5-r1.ebuild:
Bug #243984: Respecting CC variable from now on.
diff --git a/dev-util/cdecl/files/cdecl-2.5.patch b/dev-util/cdecl/files/cdecl-2.5.patch
index 62a8a9ffdba9..f6fad3948720 100644
--- a/dev-util/cdecl/files/cdecl-2.5.patch
+++ b/dev-util/cdecl/files/cdecl-2.5.patch
@@ -1,5 +1,5 @@
---- cdecl-2.5.orig/Makefile
-+++ cdecl-2.5/Makefile
+--- Makefile
++++ Makefile.new
@@ -15,9 +15,9 @@
#
# add -DUSE_READLINE To compile in support for the GNU readline library.
@@ -12,8 +12,8 @@
ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
BINDIR= /usr/bin
MANDIR= /usr/man/man1
---- cdecl-2.5.orig/cdecl.c
-+++ cdecl-2.5/cdecl.c
+--- cdecl.c
++++ cdecl.c.new
@@ -67,6 +67,7 @@
# include <stddef.h>
# include <string.h>
@@ -31,3 +31,32 @@
int yywrap(void);
int dostdin(void);
+--- cdecl.c 2009-07-07 13:20:37.000000000 +0200
++++ cdecl.c.new 2009-07-07 13:25:00.000000000 +0200
+@@ -91,7 +91,7 @@
+ #ifdef USE_READLINE
+ # include <readline/readline.h>
+ /* prototypes for functions related to readline() */
+- char * getline();
++ char * mygetline();
+ char ** attempt_completion(char *, int, int);
+ char * keyword_completion(char *, int);
+ char * command_completion(char *, int);
+@@ -375,7 +375,7 @@
+ static char *line_read = NULL;
+
+ /* Read a string, and return a pointer to it. Returns NULL on EOF. */
+-char * getline ()
++char * mygetline ()
+ {
+ /* If the buffer has already been allocated, return the memory
+ to the free pool. */
+@@ -887,7 +887,7 @@
+
+ if (!quiet) (void) printf("Type `help' or `?' for help\n");
+ ret = 0;
+- while ((line = getline())) {
++ while ((line = mygetline())) {
+ if (!strcmp(line, "quit") || !strcmp(line, "exit")) {
+ free(line);
+ return ret;