diff mbox series

coreutils: fix build when the host has fr_FR.

Message ID 20230615123043.2340005-1-ross.burton@arm.com
State Accepted, archived
Commit 06c850f18d4537794b87d1bf53ce5c917f4849d2
Headers show
Series coreutils: fix build when the host has fr_FR. | expand

Commit Message

Ross Burton June 15, 2023, 12:30 p.m. UTC 
From: Ross Burton <ross.burton@arm.com>

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.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../coreutils/stdlib-mb-cur-max.patch         | 33 +++++++++++++++++++
 meta/recipes-core/coreutils/coreutils_9.3.bb  |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch
diff mbox series

Patch

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 00000000000..732fa5b6f23
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch
@@ -0,0 +1,33 @@ 
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From ca6c179226864bff23f2b062518cf885bb42ce56 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Thu, 27 Apr 2023 15:26:37 +0200
+Subject: [PATCH] stdlib: Fix error when cross-compiling.
+
+Reported by Pierre Labastie <pierre.labastie@neuf.fr> in
+<https://lists.gnu.org/archive/html/bug-gnulib/2023-04/msg00220.html>.
+
+* m4/stdlib_h.m4 (gl_STDLIB_H): Provide a 4th argument to AC_RUN_IFELSE.
+---
+ ChangeLog      | 7 +++++++
+ m4/stdlib_h.m4 | 4 ++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
+index 3274ea4948..f47c1eb37b 100644
+--- a/m4/stdlib_h.m4
++++ b/m4/stdlib_h.m4
+@@ -66,7 +66,7 @@ int main ()
+   return result;
+ }]])],
+           [gl_cv_macro_MB_CUR_MAX_good=yes],
+-          [gl_cv_macro_MB_CUR_MAX_good=no]
++          [gl_cv_macro_MB_CUR_MAX_good=no],
+           [:])
+       fi
+     ])
+-- 
+2.34.1
+
diff --git a/meta/recipes-core/coreutils/coreutils_9.3.bb b/meta/recipes-core/coreutils/coreutils_9.3.bb
index 4ec953c575b..25da988f508 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
 SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
            file://remove-usr-local-lib-from-m4.patch \
            file://0001-local.mk-fix-cross-compiling-problem.patch \
+           file://stdlib-mb-cur-max.patch \
            file://run-ptest \
            "