public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glibc: Update rpcgen-path.patch

Browse Source
This commit is contained in:
Eelco Dolstra 2012-12-29 00:49:21 +01:00
parent db418fce3d
commit d3d3cea6bd
1 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkgs/development/libraries/glibc/2.17/rpcgen-path.patch
View File

@ -1,19 +1,16 @@
By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths diff -ru glibc-2.17-orig/sunrpc/rpc_main.c glibc-2.17/sunrpc/rpc_main.c
(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This --- glibc-2.17-orig/sunrpc/rpc_main.c 2012-12-25 04:02:13.000000000 +0100
patch makes it run any `cpp' command found in $PATH. +++ glibc-2.17/sunrpc/rpc_main.c 2012-12-29 00:21:04.124698455 +0100
@@ -77,7 +77,7 @@
--- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100
+++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200
@@ -79,7 +79,7 @@ static const char *cmdname;
static const char *svcclosetime = "120"; static const char *svcclosetime = "120";
static int cppDefined; /* explicit path for C preprocessor */ static int cppDefined; /* explicit path for C preprocessor */
-static const char *CPP = SUNOS_CPP; -static const char *CPP = "/lib/cpp";
+static const char *CPP = "cpp"; +static const char *CPP = "cpp";
static const char CPPFLAGS[] = "-C"; static const char CPPFLAGS[] = "-C";
static char *pathbuf; static char *pathbuf;
static int cpp_pid; static int cpp_pid;
@@ -108,7 +108,6 @@ static char *extendfile (const char *fil @@ -106,7 +106,6 @@
static void open_output (const char *infile, const char *outfile); static void open_output (const char *infile, const char *outfile);
static void add_warning (void); static void add_warning (void);
static void clear_args (void); static void clear_args (void);
@ -21,7 +18,7 @@ patch makes it run any `cpp' command found in $PATH.
static void open_input (const char *infile, const char *define); static void open_input (const char *infile, const char *define);
static int check_nettype (const char *name, const char *list_to_check[]); static int check_nettype (const char *name, const char *list_to_check[]);
static void c_output (const char *infile, const char *define, static void c_output (const char *infile, const char *define,
@@ -327,31 +326,6 @@ clear_args (void) @@ -318,25 +317,6 @@
argcount = FIXEDARGS; argcount = FIXEDARGS;
} }
@ -31,29 +28,23 @@ patch makes it run any `cpp' command found in $PATH.
-{ -{
- struct stat buf; - struct stat buf;
- -
- if (stat (CPP, &buf) < 0) - if (stat (CPP, &buf) == 0)
- { /* /lib/cpp or explicit cpp does not exist */ - return;
- if (cppDefined) -
- if (cppDefined) /* user specified cpp but it does not exist */
- { - {
- fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); - fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
- crash (); - crash ();
- } - }
- else -
- { /* try the other one */ - /* fall back to system CPP */
- CPP = SVR4_CPP; - CPP = "cpp";
- if (stat (CPP, &buf) < 0)
- { /* can't find any cpp */
- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout);
- crash ();
- }
- }
- }
-} -}
- -
/* /*
* Open input file with given define for C-preprocessor * Open input file with given define for C-preprocessor
*/ */
@@ -370,7 +344,6 @@ open_input (const char *infile, const ch @@ -355,7 +335,6 @@
switch (cpp_pid) switch (cpp_pid)
{ {
case 0: case 0:
@ -61,12 +52,3 @@ patch makes it run any `cpp' command found in $PATH.
putarg (0, CPP); putarg (0, CPP);
putarg (1, CPPFLAGS); putarg (1, CPPFLAGS);
addarg (define); addarg (define);
@@ -380,7 +353,7 @@ open_input (const char *infile, const ch
close (1);
dup2 (pd[1], 1);
close (pd[0]);
- execv (arglist[0], (char **) arglist);
+ execvp (arglist[0], (char **) arglist);
perror ("execv");
exit (1);
case -1: