<div dir="ltr">There are also some backwards incompatible changes introduced in this release.<div><br></div><div>Link to whole announcement:<a href="https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html">https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html</a></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jan 21, 2020 at 5:47 PM Jens Rehsack <<a href="mailto:sno@netbsd.org">sno@netbsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch<br>
and 0002-glob-Do-not-assume-glibc-glob-internals.patch.<br>
<br>
2) License has been changed to GPLv3 only<br>
<br>
3) Important bug-fix is<br>
* <a href="https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html" rel="noreferrer" target="_blank">https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html</a><br>
<br>
Signed-off-by: Jens Rehsack <<a href="mailto:sno@netbsd.org" target="_blank">sno@netbsd.org</a>><br>
---<br>
meta/recipes-devtools/make/make.inc | 4 +-<br>
...b-Do-not-assume-glibc-glob-internals.patch | 70 -------------------<br>
...b-Do-not-assume-glibc-glob-internals.patch | 38 ----------<br>
meta/recipes-devtools/make/<a href="http://make_4.2.1.bb" rel="noreferrer" target="_blank">make_4.2.1.bb</a> | 12 ----<br>
meta/recipes-devtools/make/<a href="http://make_4.3.bb" rel="noreferrer" target="_blank">make_4.3.bb</a> | 10 +++<br>
5 files changed, 11 insertions(+), 123 deletions(-)<br>
delete mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch<br>
delete mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch<br>
delete mode 100644 meta/recipes-devtools/make/<a href="http://make_4.2.1.bb" rel="noreferrer" target="_blank">make_4.2.1.bb</a><br>
create mode 100644 meta/recipes-devtools/make/<a href="http://make_4.3.bb" rel="noreferrer" target="_blank">make_4.3.bb</a><br>
<br>
diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc<br>
index b8905bc6d3..4142cf23d3 100644<br>
--- a/meta/recipes-devtools/make/make.inc<br>
+++ b/meta/recipes-devtools/make/make.inc<br>
@@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute<br>
HOMEPAGE = "<a href="http://www.gnu.org/software/make/" rel="noreferrer" target="_blank">http://www.gnu.org/software/make/</a>"<br>
SECTION = "devel"<br>
<br>
-SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \<br>
- file://0001-glob-Do-not-assume-glibc-glob-internals.patch \<br>
- file://0002-glob-Do-not-assume-glibc-glob-internals.patch \<br>
+SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \<br>
"<br>
<br>
inherit autotools gettext pkgconfig texinfo<br>
diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch<br>
deleted file mode 100644<br>
index 2b6e4d40c3..0000000000<br>
--- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch<br>
+++ /dev/null<br>
@@ -1,70 +0,0 @@<br>
-From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001<br>
-From: Paul Eggert <<a href="mailto:eggert@cs.ucla.edu" target="_blank">eggert@cs.ucla.edu</a>><br>
-Date: Sun, 24 Sep 2017 09:12:58 -0400<br>
-Subject: [PATCH 1/2] glob: Do not assume glibc glob internals.<br>
-<br>
-It has been proposed that glibc glob start using gl_lstat,<br>
-which the API allows it to do. GNU 'make' should not get in<br>
-the way of this. See:<br>
-<a href="https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html" rel="noreferrer" target="_blank">https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html</a><br>
-<br>
-* dir.c (local_lstat): New function, like local_stat.<br>
-(dir_setup_glob): Use it to initialize gl_lstat too, as the API<br>
-requires.<br>
----<br>
-Upstream-Status: Backport<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
-<br>
- dir.c | 29 +++++++++++++++++++++++++++--<br>
- 1 file changed, 27 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/dir.c b/dir.c<br>
-index f34bbf5..12eef30 100644<br>
---- a/dir.c<br>
-+++ b/dir.c<br>
-@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)<br>
- }<br>
- #endif<br>
- <br>
-+/* Similarly for lstat. */<br>
-+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)<br>
-+# ifndef VMS<br>
-+# ifndef HAVE_SYS_STAT_H<br>
-+int lstat (const char *path, struct stat *sbuf);<br>
-+# endif<br>
-+# else<br>
-+ /* We are done with the fake lstat. Go back to the real lstat */<br>
-+# ifdef lstat<br>
-+# undef lstat<br>
-+# endif<br>
-+# endif<br>
-+# define local_lstat lstat<br>
-+#elif defined(WINDOWS32)<br>
-+/* Windows doesn't support lstat(). */<br>
-+# define local_lstat local_stat<br>
-+#else<br>
-+static int<br>
-+local_lstat (const char *path, struct stat *buf)<br>
-+{<br>
-+ int e;<br>
-+ EINTRLOOP (e, lstat (path, buf));<br>
-+ return e;<br>
-+}<br>
-+#endif<br>
-+<br>
- void<br>
- dir_setup_glob (glob_t *gl)<br>
- {<br>
- gl->gl_opendir = open_dirstream;<br>
- gl->gl_readdir = read_dirstream;<br>
- gl->gl_closedir = free;<br>
-+ gl->gl_lstat = local_lstat;<br>
- gl->gl_stat = local_stat;<br>
-- /* We don't bother setting gl_lstat, since glob never calls it.<br>
-- The slot is only there for compatibility with 4.4 BSD. */<br>
- }<br>
- <br>
- void<br>
--- <br>
-2.16.1<br>
-<br>
diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch<br>
deleted file mode 100644<br>
index d49acd9f6e..0000000000<br>
--- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch<br>
+++ /dev/null<br>
@@ -1,38 +0,0 @@<br>
-From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001<br>
-From: Paul Eggert <<a href="mailto:eggert@cs.ucla.edu" target="_blank">eggert@cs.ucla.edu</a>><br>
-Date: Sun, 24 Sep 2017 09:12:58 -0400<br>
-Subject: [PATCH 2/2] glob: Do not assume glibc glob internals.<br>
-<br>
-It has been proposed that glibc glob start using gl_lstat,<br>
-which the API allows it to do. GNU 'make' should not get in<br>
-the way of this. See:<br>
-<a href="https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html" rel="noreferrer" target="_blank">https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html</a><br>
-<br>
-* dir.c (local_lstat): New function, like local_stat.<br>
-(dir_setup_glob): Use it to initialize gl_lstat too, as the API<br>
-requires.<br>
----<br>
-Upstream-Status: Backport<br>
-<br>
- <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 3 +--<br>
- 1 file changed, 1 insertion(+), 2 deletions(-)<br>
-<br>
-diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
-index 64ec870..e87901c 100644<br>
---- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
-+++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
-@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],<br>
- #include <glob.h><br>
- #include <fnmatch.h><br>
- <br>
--#define GLOB_INTERFACE_VERSION 1<br>
- #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1<br>
- # include <gnu-versions.h><br>
--# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION<br>
-+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2<br>
- gnu glob<br>
- # endif<br>
- #endif],<br>
--- <br>
-2.16.1<br>
-<br>
diff --git a/meta/recipes-devtools/make/<a href="http://make_4.2.1.bb" rel="noreferrer" target="_blank">make_4.2.1.bb</a> b/meta/recipes-devtools/make/<a href="http://make_4.2.1.bb" rel="noreferrer" target="_blank">make_4.2.1.bb</a><br>
deleted file mode 100644<br>
index c6e6a0cd58..0000000000<br>
--- a/meta/recipes-devtools/make/<a href="http://make_4.2.1.bb" rel="noreferrer" target="_blank">make_4.2.1.bb</a><br>
+++ /dev/null<br>
@@ -1,12 +0,0 @@<br>
-LICENSE = "GPLv3 & LGPLv2"<br>
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \<br>
- file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \<br>
- file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"<br>
-require make.inc<br>
-<br>
-EXTRA_OECONF += "--without-guile"<br>
-<br>
-SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac"<br>
-SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589"<br>
-<br>
-BBCLASSEXTEND = "native nativesdk"<br>
diff --git a/meta/recipes-devtools/make/<a href="http://make_4.3.bb" rel="noreferrer" target="_blank">make_4.3.bb</a> b/meta/recipes-devtools/make/<a href="http://make_4.3.bb" rel="noreferrer" target="_blank">make_4.3.bb</a><br>
new file mode 100644<br>
index 0000000000..a3eb9d92f2<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/make/<a href="http://make_4.3.bb" rel="noreferrer" target="_blank">make_4.3.bb</a><br>
@@ -0,0 +1,10 @@<br>
+LICENSE = "GPLv3"<br>
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"<br>
+require make.inc<br>
+<br>
+EXTRA_OECONF += "--without-guile"<br>
+<br>
+SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a"<br>
+SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82"<br>
+<br>
+BBCLASSEXTEND = "native nativesdk"<br>
-- <br>
2.17.1<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>