diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-12 10:09:41 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-12 10:09:41 +0200 |
commit | 6899c7fdb989ce02f877ce5c0490a20ac4a64bf0 (patch) | |
tree | 68a2e9b25d3b4f0d0a70343b38d10bdc0111f20d /pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch | |
parent | 9bcee1051a94d6ba2be64a19665f017542122b83 (diff) | |
parent | e207d1f04ad262f53e387e9e3956a2a9c421a66a (diff) | |
download | nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar.gz nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar.bz2 nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar.lz nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar.xz nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.tar.zst nixlib-6899c7fdb989ce02f877ce5c0490a20ac4a64bf0.zip |
Merge branch 'master' into gcc-6
Diffstat (limited to 'pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch')
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch b/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch deleted file mode 100644 index a84d7ab49d04..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001 -From: Paul Smith <psmith@gnu.org> -Date: Mon, 20 Oct 2014 05:54:56 +0000 -Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname(). - ---- -diff --git main.c main.c -index b2d169c..0cdb8a8 100644 ---- main.c -+++ main.c -@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp) - #ifdef HAVE_ISATTY - if (isatty (fileno (stdout))) - if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT"))) -- define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)), -- o_default, 0)->export = v_export; -- -+ { -+ const char *tty = TTYNAME (fileno (stdout)); -+ define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME, -+ o_default, 0)->export = v_export; -+ } - if (isatty (fileno (stderr))) - if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR"))) -- define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)), -- o_default, 0)->export = v_export; -+ { -+ const char *tty = TTYNAME (fileno (stderr)); -+ define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME, -+ o_default, 0)->export = v_export; -+ } - #endif - - /* Reset in case the switches changed our minds. */ -diff --git makeint.h makeint.h -index 6223936..2009f41 100644 ---- makeint.h -+++ makeint.h -@@ -436,10 +436,11 @@ extern struct rlimit stack_limit; - /* The number of bytes needed to represent the largest integer as a string. */ - #define INTSTR_LENGTH CSTRLEN ("18446744073709551616") - -+#define DEFAULT_TTYNAME "true" - #ifdef HAVE_TTYNAME - # define TTYNAME(_f) ttyname (_f) - #else --# define TTYNAME(_f) "true" -+# define TTYNAME(_f) DEFAULT_TTYNAME - #endif - - --- -cgit v0.9.0.2 |