[OE-core] [OE-Core][PATCH] make: 4.2.1 -> 4.3
Jens Rehsack
sno at netbsd.org
Wed Jan 22 09:00:40 UTC 2020
> Am 21.01.2020 um 17:59 schrieb Martin Jansa <martin.jansa at gmail.com>:
>
> There are also some backwards incompatible changes introduced in this release.
>
> Link to whole announcement:https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html
Do you want them included in commit message?
AFAIK hostbuild is used anyway - so this affects SDK's and I got reports from
SDK users that the kernel build is not running parallel.
> On Tue, Jan 21, 2020 at 5:47 PM Jens Rehsack <sno at netbsd.org> wrote:
> 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch
> and 0002-glob-Do-not-assume-glibc-glob-internals.patch.
>
> 2) License has been changed to GPLv3 only
>
> 3) Important bug-fix is
> * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html
>
> Signed-off-by: Jens Rehsack <sno at netbsd.org>
> ---
> meta/recipes-devtools/make/make.inc | 4 +-
> ...b-Do-not-assume-glibc-glob-internals.patch | 70 -------------------
> ...b-Do-not-assume-glibc-glob-internals.patch | 38 ----------
> meta/recipes-devtools/make/make_4.2.1.bb | 12 ----
> meta/recipes-devtools/make/make_4.3.bb | 10 +++
> 5 files changed, 11 insertions(+), 123 deletions(-)
> delete mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
> delete mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
> delete mode 100644 meta/recipes-devtools/make/make_4.2.1.bb
> create mode 100644 meta/recipes-devtools/make/make_4.3.bb
>
> diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc
> index b8905bc6d3..4142cf23d3 100644
> --- a/meta/recipes-devtools/make/make.inc
> +++ b/meta/recipes-devtools/make/make.inc
> @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute
> HOMEPAGE = "http://www.gnu.org/software/make/"
> SECTION = "devel"
>
> -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \
> - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \
> - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \
> +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \
> "
>
> inherit autotools gettext pkgconfig texinfo
> 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
> deleted file mode 100644
> index 2b6e4d40c3..0000000000
> --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
> +++ /dev/null
> @@ -1,70 +0,0 @@
> -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001
> -From: Paul Eggert <eggert at cs.ucla.edu>
> -Date: Sun, 24 Sep 2017 09:12:58 -0400
> -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals.
> -
> -It has been proposed that glibc glob start using gl_lstat,
> -which the API allows it to do. GNU 'make' should not get in
> -the way of this. See:
> -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
> -
> -* dir.c (local_lstat): New function, like local_stat.
> -(dir_setup_glob): Use it to initialize gl_lstat too, as the API
> -requires.
> ----
> -Upstream-Status: Backport
> -Signed-off-by: Khem Raj <raj.khem at gmail.com>
> -
> - dir.c | 29 +++++++++++++++++++++++++++--
> - 1 file changed, 27 insertions(+), 2 deletions(-)
> -
> -diff --git a/dir.c b/dir.c
> -index f34bbf5..12eef30 100644
> ---- a/dir.c
> -+++ b/dir.c
> -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
> - }
> - #endif
> -
> -+/* Similarly for lstat. */
> -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
> -+# ifndef VMS
> -+# ifndef HAVE_SYS_STAT_H
> -+int lstat (const char *path, struct stat *sbuf);
> -+# endif
> -+# else
> -+ /* We are done with the fake lstat. Go back to the real lstat */
> -+# ifdef lstat
> -+# undef lstat
> -+# endif
> -+# endif
> -+# define local_lstat lstat
> -+#elif defined(WINDOWS32)
> -+/* Windows doesn't support lstat(). */
> -+# define local_lstat local_stat
> -+#else
> -+static int
> -+local_lstat (const char *path, struct stat *buf)
> -+{
> -+ int e;
> -+ EINTRLOOP (e, lstat (path, buf));
> -+ return e;
> -+}
> -+#endif
> -+
> - void
> - dir_setup_glob (glob_t *gl)
> - {
> - gl->gl_opendir = open_dirstream;
> - gl->gl_readdir = read_dirstream;
> - gl->gl_closedir = free;
> -+ gl->gl_lstat = local_lstat;
> - gl->gl_stat = local_stat;
> -- /* We don't bother setting gl_lstat, since glob never calls it.
> -- The slot is only there for compatibility with 4.4 BSD. */
> - }
> -
> - void
> ---
> -2.16.1
> -
> 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
> deleted file mode 100644
> index d49acd9f6e..0000000000
> --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001
> -From: Paul Eggert <eggert at cs.ucla.edu>
> -Date: Sun, 24 Sep 2017 09:12:58 -0400
> -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals.
> -
> -It has been proposed that glibc glob start using gl_lstat,
> -which the API allows it to do. GNU 'make' should not get in
> -the way of this. See:
> -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
> -
> -* dir.c (local_lstat): New function, like local_stat.
> -(dir_setup_glob): Use it to initialize gl_lstat too, as the API
> -requires.
> ----
> -Upstream-Status: Backport
> -
> - configure.ac | 3 +--
> - 1 file changed, 1 insertion(+), 2 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 64ec870..e87901c 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
> - #include <glob.h>
> - #include <fnmatch.h>
> -
> --#define GLOB_INTERFACE_VERSION 1
> - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
> - # include <gnu-versions.h>
> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
> -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
> - gnu glob
> - # endif
> - #endif],
> ---
> -2.16.1
> -
> diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb
> deleted file mode 100644
> index c6e6a0cd58..0000000000
> --- a/meta/recipes-devtools/make/make_4.2.1.bb
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -LICENSE = "GPLv3 & LGPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
> -require make.inc
> -
> -EXTRA_OECONF += "--without-guile"
> -
> -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac"
> -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589"
> -
> -BBCLASSEXTEND = "native nativesdk"
> diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb
> new file mode 100644
> index 0000000000..a3eb9d92f2
> --- /dev/null
> +++ b/meta/recipes-devtools/make/make_4.3.bb
> @@ -0,0 +1,10 @@
> +LICENSE = "GPLv3"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> +require make.inc
> +
> +EXTRA_OECONF += "--without-guile"
> +
> +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a"
> +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82"
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Jens Rehsack - rehsack at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Message signed with OpenPGP
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20200122/dc283197/attachment-0001.sig>
More information about the Openembedded-core
mailing list