From f6b96fbd62b286d6a1da80d847d511d591fd1692 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jul 2023 21:22:19 +0200 Subject: [PATCH] package/make: bump version to 4.4.1 Removed all patches, they are included in this release. Release notes: https://lists.gnu.org/archive/html/info-gnu/2023-02/msg00011.html https://lists.gnu.org/archive/html/info-gnu/2022-10/msg00008.html https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html The COPYING license file has changed due to the switch from http:// to https:// URLs in the text. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 - ...pport-GLIBC-glob-interface-version-2.patch | 31 -------- ...b-Do-not-assume-glibc-glob-internals.patch | 70 ------------------- package/make/make.hash | 8 +-- package/make/make.mk | 7 +- 5 files changed, 6 insertions(+), 112 deletions(-) delete mode 100644 package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch delete mode 100644 package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch diff --git a/.checkpackageignore b/.checkpackageignore index 806a225ab1..e6c55cb324 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -922,8 +922,6 @@ package/madplay/0001-switch-to-new-alsa-api.patch Sob Upstream package/madplay/0002-configure-ac-automake-foreign.patch Upstream package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch Upstream package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch Upstream -package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch Upstream -package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch Upstream package/makedumpfile/0002-Handle-__mips64.patch Upstream package/mariadb/0001-add-extra-check-for-librt.patch Upstream package/mariadb/S97mysqld Indent Shellcheck Variables diff --git a/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch b/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch deleted file mode 100644 index 62e67f850a..0000000000 --- a/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 -From: Paul Smith -Date: Sun, 19 Nov 2017 15:09:16 -0500 -Subject: [PATCH] * configure.ac: Support GLIBC glob interface version 2 - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 48c8a116a914a3 - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8c72568cf276..4710832ae568 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# 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.2 - diff --git a/package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 33ded3c501..0000000000 --- a/package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH] 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. - -Signed-off-by: Samuel Mendoza-Jonas -(from upstream commit 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4) ---- - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index adbb8a9..c343e4c 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.21.0 - diff --git a/package/make/make.hash b/package/make/make.hash index 0bd0e5546f..07d91e7baa 100644 --- a/package/make/make.hash +++ b/package/make/make.hash @@ -1,6 +1,6 @@ -# From http://lists.gnu.org/archive/html/info-gnu/2016-06/msg00005.html -md5 15b012617e7c44c0ed482721629577ac make-4.2.1.tar.bz2 +# From https://lists.gnu.org/archive/html/info-gnu/2023-02/msg00011.html +md5 c8b13b7477e812d4213a9b88ff0ff1d6 make-4.4.1.tar.lz # Locally calculated after checking signature -sha256 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 make-4.2.1.tar.bz2 +sha256 8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9 make-4.4.1.tar.lz # Locally computed -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/make/make.mk b/package/make/make.mk index f289c5c3d9..e194e15873 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -4,17 +4,14 @@ # ################################################################################ -MAKE_VERSION = 4.2.1 -MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2 +MAKE_VERSION = 4.4.1 +MAKE_SOURCE = make-$(MAKE_VERSION).tar.lz MAKE_SITE = $(BR2_GNU_MIRROR)/make MAKE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-pkgconf MAKE_LICENSE = GPL-3.0+ MAKE_LICENSE_FILES = COPYING MAKE_CPE_ID_VENDOR = gnu -# Patching configure.ac -MAKE_AUTORECONF = YES - MAKE_CONF_OPTS = --without-guile # Disable the 'load' operation for static builds since it needs dlopen