forked from mirrors/nixpkgs
Adding patches for cdecl to build. I picked them from:
http://gentoo-overlays.zugaina.org/gentoo/portage/dev-util/cdecl/files/ svn path=/nixpkgs/trunk/; revision=32866
This commit is contained in:
parent
11f64b0449
commit
f1f834f260
29
pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch
Normal file
29
pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch
Normal file
|
@ -0,0 +1,29 @@
|
|||
--- a/cdecl.c 2009-07-07 13:20:37.000000000 +0200
|
||||
+++ a/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;
|
|
@ -0,0 +1,12 @@
|
|||
Index: cdecl-2.5/cdecl.c
|
||||
===================================================================
|
||||
--- cdecl-2.5.orig/cdecl.c
|
||||
+++ cdecl-2.5/cdecl.c
|
||||
@@ -204,6 +204,7 @@ int DebugFlag = 0; /* -d, output debugg
|
||||
#define ANSI 4 /* combo not allowed anymore in ANSI compiler */
|
||||
#define A ANSI
|
||||
|
||||
+extern char **completion_matches PARAMS((char *, rl_compentry_func_t *));
|
||||
/* This is an lower left triangular array. If we needed */
|
||||
/* to save 9 bytes, the "long" row can be removed. */
|
||||
char crosscheck[9][9] = {
|
|
@ -7,7 +7,7 @@ stdenv.mkDerivation {
|
|||
md5 = "29895dab52e85b2474a59449e07b7996";
|
||||
};
|
||||
|
||||
patches = [ ./cdecl-2.5.patch ];
|
||||
patches = [ ./cdecl-2.5-implicit-pointer.patch ./cdecl-2.5.patch ./cdecl-2.5-gentoo.patch ];
|
||||
preBuild = "
|
||||
makeFlags=\"PREFIX=$out\"
|
||||
";
|
||||
|
|
Loading…
Reference in a new issue