[openwrt/openwrt] tools/coreutils: update to 9.6

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 26 05:38:36 PDT 2025


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/199afe9ef79d00ddda8ac161062ca3b1429d1200

commit 199afe9ef79d00ddda8ac161062ca3b1429d1200
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Tue May 6 14:54:55 2025 -0400

    tools/coreutils: update to 9.6
    
    Update to the next stable release.
    
    Prevent the need for gperf to build
    gperf based headers due to new gnulib versions
    by skipping replacement of gperf files.
    
    Without Automake, there are some
    existing macro conflicts
    due to the new version of gnulib,
    causing build errors with some source files,
    so skip those file replacements.
    
    All patches are automatically refreshed.
    
    Link: https://lists.gnu.org/archive/html/coreutils/2025-01/msg00049.html
    Tested-by: Georgi Valkov <gvalkov at gmail.com> # macOS
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
    Link: https://github.com/openwrt/openwrt/pull/16522
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 tools/coreutils/Makefile                    | 20 +++++++++++++++-----
 tools/coreutils/patches/000-bootstrap.patch |  4 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile
index 73b95912ee..d1948042b9 100644
--- a/tools/coreutils/Makefile
+++ b/tools/coreutils/Makefile
@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=coreutils
 PKG_CPE_ID:=cpe:/a:gnu:coreutils
-PKG_VERSION:=9.5
+PKG_VERSION:=9.6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/coreutils
-PKG_HASH:=767ae6a22950ec42f3ba5f7c1de79dd27800ee8e9b8642da5dedb5974a1741e5
+PKG_HASH:=2bec616375002c92c1ed5ead32a092b174fe44c14bc736d32e5961053b821d84
 
 HOST_BUILD_PARALLEL := 1
 
@@ -23,10 +23,20 @@ include $(INCLUDE_DIR)/host-build.mk
 export GNULIB_SRCDIR:=$(HOST_GNULIB_SRCDIR)
 
 HOST_GNULIB_SKIP := \
-	lib/nstrftime.c \
-	lib/fprintftime.c \
+	lib/c++defs.h \
+	lib/realloc.c \
+	lib/reallocarray.c \
+	lib/savedir.c \
 	lib/fcntl.in.h \
-	lib/locale.in.h
+	lib/stdio.in.h \
+	lib/stdlib.in.h \
+	lib/se-selinux.in.h \
+	lib/iconv_open-aix.gperf \
+	lib/iconv_open-hpux.gperf \
+	lib/iconv_open-irix.gperf \
+	lib/iconv_open-osf.gperf \
+	lib/iconv_open-solaris.gperf \
+	lib/iconv_open-zos.gperf
 
 HOST_CONFIGURE_ARGS += \
 	 --enable-install-program=$(subst $(space),$(comma),$(strip $(PKG_PROGRAMS)))
diff --git a/tools/coreutils/patches/000-bootstrap.patch b/tools/coreutils/patches/000-bootstrap.patch
index ea0ea7e37e..1edf879e0e 100644
--- a/tools/coreutils/patches/000-bootstrap.patch
+++ b/tools/coreutils/patches/000-bootstrap.patch
@@ -34,7 +34,7 @@
        if [ ! "$inst_ver" ]; then
          warn_ "Error: '$app' not found"
          ret=1
-@@ -1157,7 +1157,7 @@ autogen()
+@@ -1205,7 +1205,7 @@ autogen()
    # two just-pre-run programs.
  
    # Import from gettext.
@@ -45,7 +45,7 @@
  
 --- a/bootstrap.conf
 +++ b/bootstrap.conf
-@@ -349,11 +349,8 @@ gnulib_tool_option_extras="--tests-base=
+@@ -354,11 +354,8 @@ gnulib_tool_option_extras="--tests-base=
  buildreq="\
  autoconf   2.64
  automake   1.11.2




More information about the lede-commits mailing list