diff options
| author | Khem Raj <raj.khem@gmail.com> | 2025-08-20 23:45:18 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-08-25 17:47:20 +0100 |
| commit | 72d1535163d29c46a0baba669897e35021839a7d (patch) | |
| tree | 9bd17e0556808dcc93c91d486ad591149a324bf9 | |
| parent | 16287e7cb43e91000eab73403eca72e5378c1cb9 (diff) | |
| download | poky-72d1535163d29c46a0baba669897e35021839a7d.tar.gz | |
m4: Fix ptest on musl
Fixes
../../sources/m4-1.4.20/tests/test-c32ispunct.c:261: assertion 'is == 0' failed
./test-c32ispunct.sh: line 36: 402 Aborted
(core dumped) LC_ALL="$testlocale" ${CHECKER} ./test-c32ispunct${EXEEXT} 3
FAIL: test-c32ispunct.sh
(From OE-Core rev: f39537e8b84d0640fb8a7406ebf2396b532cdb57)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/m4/m4-1.4.20.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/m4/m4/0001-test-c32ispunct-Check-for-musl-along-with-glibc.patch | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-devtools/m4/m4-1.4.20.inc b/meta/recipes-devtools/m4/m4-1.4.20.inc index aad57b8b64..5c4ba09288 100644 --- a/meta/recipes-devtools/m4/m4-1.4.20.inc +++ b/meta/recipes-devtools/m4/m4-1.4.20.inc | |||
| @@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ | |||
| 10 | file://0001-gettext-h-Avoid-gcc-Wformat-security-warnings-with-d.patch \ | 10 | file://0001-gettext-h-Avoid-gcc-Wformat-security-warnings-with-d.patch \ |
| 11 | " | 11 | " |
| 12 | SRC_URI:append:class-target = " file://run-ptest \ | 12 | SRC_URI:append:class-target = " file://run-ptest \ |
| 13 | file://0001-test-c32ispunct-Check-for-musl-along-with-glibc.patch \ | ||
| 13 | file://serial-tests-config.patch \ | 14 | file://serial-tests-config.patch \ |
| 14 | " | 15 | " |
| 15 | 16 | ||
diff --git a/meta/recipes-devtools/m4/m4/0001-test-c32ispunct-Check-for-musl-along-with-glibc.patch b/meta/recipes-devtools/m4/m4/0001-test-c32ispunct-Check-for-musl-along-with-glibc.patch new file mode 100644 index 0000000000..fb03e94c52 --- /dev/null +++ b/meta/recipes-devtools/m4/m4/0001-test-c32ispunct-Check-for-musl-along-with-glibc.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | From 761aa7fab4a82dc01daa28799f4f1d6ae17a4c26 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 18 Aug 2025 11:31:32 -0700 | ||
| 4 | Subject: [PATCH] test-c32ispunct: Check for musl along with glibc | ||
| 5 | |||
| 6 | This check crashes on musl based locales, other libcs | ||
| 7 | e.g. glibc ignore it too. | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/m4-patches/2025-08/msg00000.html] | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | tests/test-c32ispunct.c | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | --- a/tests/test-c32ispunct.c | ||
| 17 | +++ b/tests/test-c32ispunct.c | ||
| 18 | @@ -255,7 +255,7 @@ main (int argc, char *argv[]) | ||
| 19 | is = for_character ("\360\235\204\200", 4); | ||
| 20 | ASSERT (is != 0); | ||
| 21 | #endif | ||
| 22 | - #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__) | ||
| 23 | + #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__) | ||
| 24 | /* U+E003A TAG COLON */ | ||
| 25 | is = for_character ("\363\240\200\272", 4); | ||
| 26 | ASSERT (is == 0); | ||
