make: 4.2 -> 4.2.1
cover make: 4.2 -> 4.2.1
Hi RP and Ross,
This patch is based on master-next (make 4.2 is on master-next), the 4.2.1 is released on June 10 which contains a patch needed by us, otherwise git may fail to build with make-native:
[SV 47995] Ensure forced double-colon rules work with -j.
// Robert
The following changes since commit 6979749fd31baf20f19d3307bba510907016aa3f:
make: 4.1 -> 4.2 (2016-06-14 19:22:12 -0700)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/make
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/make
Robert Yang (1):
make: 4.2 -> 4.2.1
...-SV-43434-Handle-NULL-returns-from-ttynam.patch | 63 ----------------------
.../make/{make_4.2.bb => make_4.2.1.bb} | 4 +-
2 files changed, 2 insertions(+), 65 deletions(-)
delete mode 100644 meta/recipes-devtools/make/make-4.2/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch
rename meta/recipes-devtools/make/{make_4.2.bb => make_4.2.1.bb} (71%)Signature · 1 line
2.8.0
PATCH 1/1 make: 4.2 -> 4.2.1
1) Remove unused patch 0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch.
2) Here are the fixes since 4.2, the [SV 47995] is important for us.
* maintMakefile: TP recommends rsync for retrieving PO files.
* main.c (main): [SV 48009] Reset stack limit for make re-exec. [SV 47995] Ensure forced double-colon rules work with -j.
* DELETE_ON_ERROR: [SV 48061] Use "exit 1" for portability.
* w32/pathstuff.c: [SV 47996] Use ISBLANK() not isblank(). Fix printing time stamps on MS-Windows
[SV 48037] Fix MinGW build with Posix configury tools
---
...-SV-43434-Handle-NULL-returns-from-ttynam.patch | 63 ----------------------
.../make/{make_4.2.bb => make_4.2.1.bb} | 4 +-
2 files changed, 2 insertions(+), 65 deletions(-)
delete mode 100644 meta/recipes-devtools/make/make-4.2/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch
rename meta/recipes-devtools/make/{make_4.2.bb => make_4.2.1.bb} (71%)meta/recipes-devtools/make/make-4.2/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch deleted +0 -63
@@ -1,63 +0,0 @@ -From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001 -From: Paul Smith <[email protected]> -Date: Mon, 20 Oct 2014 01:54:56 -0400 -Subject: [PATCH] * main.c (main): [SV 43434] Handle NULL returns from - ttyname(). - -Upstream-Status: Backport - -From: http://git.savannah.gnu.org/cgit/make.git/commit/?id=292da6f6867b75a5af7ddbb639a1feae022f438f - ---- - main.c | 15 ++++++++++----- - makeint.h | 3 ++- - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/main.c b/main.c -index b2d169c..0cdb8a8 100644 ---- a/main.c -+++ b/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 a/makeint.h b/makeint.h -index 6223936..2009f41 100644 ---- a/makeint.h -+++ b/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 - - --- -1.9.1 -
meta/recipes-devtools/make/make_4.2.1.bb renamed from meta/recipes-devtools/make/make_4.2.bb +2 -2
@@ -6,7 +6,7 @@ require make.inc EXTRA_OECONF += "--without-guile" -SRC_URI[md5sum] = "85ad14d08766201ffe71efa866f4fb91" -SRC_URI[sha256sum] = "4e5ce3b62fe5d75ff8db92b7f6df91e476d10c3aceebf1639796dc5bfece655f" +SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" +SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.8.0