diff options
| author | Ross Burton <ross.burton@arm.com> | 2023-06-15 13:30:43 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-16 15:37:08 +0100 |
| commit | dc32634133522dc844b043bb489fbd57efae3a16 (patch) | |
| tree | 286691c8dd8155789a175163450a5557836b326b | |
| parent | fcb9b65b259d9051783e5dc86f0f861fa6847c02 (diff) | |
| download | poky-dc32634133522dc844b043bb489fbd57efae3a16.tar.gz | |
coreutils: fix build when the host has fr_FR.
There is a missing comma in an AC_TRY_RUN call which means it has no
fallback for cross-compilation, so if the host doesn't have a French
locale then AC_TRY_RUN fails.
(From OE-Core rev: 06c850f18d4537794b87d1bf53ce5c917f4849d2)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_9.3.bb | 1 |
2 files changed, 34 insertions, 0 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 new file mode 100644 index 0000000000..732fa5b6f2 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | Upstream-Status: Backport | ||
| 2 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 3 | |||
| 4 | From ca6c179226864bff23f2b062518cf885bb42ce56 Mon Sep 17 00:00:00 2001 | ||
| 5 | From: Bruno Haible <bruno@clisp.org> | ||
| 6 | Date: Thu, 27 Apr 2023 15:26:37 +0200 | ||
| 7 | Subject: [PATCH] stdlib: Fix error when cross-compiling. | ||
| 8 | |||
| 9 | Reported 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 | |||
| 18 | diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 | ||
| 19 | index 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 | -- | ||
| 32 | 2.34.1 | ||
| 33 | |||
diff --git a/meta/recipes-core/coreutils/coreutils_9.3.bb b/meta/recipes-core/coreutils/coreutils_9.3.bb index 4ec953c575..25da988f50 100644 --- a/meta/recipes-core/coreutils/coreutils_9.3.bb +++ b/meta/recipes-core/coreutils/coreutils_9.3.bb | |||
| @@ -16,6 +16,7 @@ inherit autotools gettext texinfo | |||
| 16 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ | 16 | SRC_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 \ | ||
| 19 | file://run-ptest \ | 20 | file://run-ptest \ |
| 20 | " | 21 | " |
| 21 | 22 | ||
