summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-09-12 23:24:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-14 09:19:37 +0100
commit4fe96220a8ad82b3eebf22ca3c0daef7420bd1e6 (patch)
tree0c2dfedd9f0df837fecab289f778639f17a568de
parent6c4e33ceb14bc9864ee33be6ea4ede85b4d3d4b3 (diff)
downloadpoky-4fe96220a8ad82b3eebf22ca3c0daef7420bd1e6.tar.gz
coreutils: Upgrade to 9.4
Drop a backport which is already in 9.4 (From OE-Core rev: a51b0456001fbff3443e827aa9465648699ba0ef) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch33
-rw-r--r--meta/recipes-core/coreutils/coreutils_9.4.bb (renamed from meta/recipes-core/coreutils/coreutils_9.3.bb)4
2 files changed, 1 insertions, 36 deletions
diff --git a/meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch b/meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch
deleted file mode 100644
index 732fa5b6f2..0000000000
--- a/meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@arm.com>
3
4From ca6c179226864bff23f2b062518cf885bb42ce56 Mon Sep 17 00:00:00 2001
5From: Bruno Haible <bruno@clisp.org>
6Date: Thu, 27 Apr 2023 15:26:37 +0200
7Subject: [PATCH] stdlib: Fix error when cross-compiling.
8
9Reported by Pierre Labastie <pierre.labastie@neuf.fr> in
10<https://lists.gnu.org/archive/html/bug-gnulib/2023-04/msg00220.html>.
11
12* m4/stdlib_h.m4 (gl_STDLIB_H): Provide a 4th argument to AC_RUN_IFELSE.
13---
14 ChangeLog | 7 +++++++
15 m4/stdlib_h.m4 | 4 ++--
16 2 files changed, 9 insertions(+), 2 deletions(-)
17
18diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
19index 3274ea4948..f47c1eb37b 100644
20--- a/m4/stdlib_h.m4
21+++ b/m4/stdlib_h.m4
22@@ -66,7 +66,7 @@ int main ()
23 return result;
24 }]])],
25 [gl_cv_macro_MB_CUR_MAX_good=yes],
26- [gl_cv_macro_MB_CUR_MAX_good=no]
27+ [gl_cv_macro_MB_CUR_MAX_good=no],
28 [:])
29 fi
30 ])
31--
322.34.1
33
diff --git a/meta/recipes-core/coreutils/coreutils_9.3.bb b/meta/recipes-core/coreutils/coreutils_9.4.bb
index ba38169f05..25f6cb15db 100644
--- a/meta/recipes-core/coreutils/coreutils_9.3.bb
+++ b/meta/recipes-core/coreutils/coreutils_9.4.bb
@@ -16,11 +16,9 @@ inherit autotools gettext texinfo
16SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ 16SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
17 file://remove-usr-local-lib-from-m4.patch \ 17 file://remove-usr-local-lib-from-m4.patch \
18 file://0001-local.mk-fix-cross-compiling-problem.patch \ 18 file://0001-local.mk-fix-cross-compiling-problem.patch \
19 file://stdlib-mb-cur-max.patch \
20 file://run-ptest \ 19 file://run-ptest \
21 " 20 "
22 21SRC_URI[sha256sum] = "ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52"
23SRC_URI[sha256sum] = "adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa"
24 22
25# http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842 23# http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842
26# 24#