mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-08 23:51:08 -09:00
f73dffae4f
The package fails to build on wchar-less uClibc-ng configuration
(i.e. without BR2_TOOLCHAIN_BUILDROOT_WCHAR selected):
```
CC t/unit-tests/unit-test.o
t/unit-tests/clar/clar.c: In function 'clar__assert_equal':
t/unit-tests/clar/clar.c:767:23: error: unknown type name 'wchar_t'
767 | const wchar_t *wcs1 = va_arg(args, const wchar_t *);
| ^~~~~~~
In file included from t/unit-tests/clar/clar.c:13:
t/unit-tests/clar/clar.c:767:58: error: unknown type name 'wchar_t'
767 | const wchar_t *wcs1 = va_arg(args, const wchar_t *);
| ^~~~~~~
t/unit-tests/clar/clar.c:768:23: error: unknown type name 'wchar_t'
768 | const wchar_t *wcs2 = va_arg(args, const wchar_t *);
| ^~~~~~~
t/unit-tests/clar/clar.c:768:58: error: unknown type name 'wchar_t'
768 | const wchar_t *wcs2 = va_arg(args, const wchar_t *);
| ^~~~~~~
t/unit-tests/clar/clar.c:769:65: warning: implicit declaration of function 'wcscmp' [-Wimplicit-function-declaration]
769 | is_equal = (!wcs1 || !wcs2) ? (wcs1 == wcs2) : !wcscmp(wcs1, wcs2);
| ^~~~~~
t/unit-tests/clar/clar.c:784:23: error: unknown type name 'wchar_t'
784 | const wchar_t *wcs1 = va_arg(args, const wchar_t *);
| ^~~~~~~
t/unit-tests/clar/clar.c:784:58: error: unknown type name 'wchar_t'
784 | const wchar_t *wcs1 = va_arg(args, const wchar_t *);
| ^~~~~~~
t/unit-tests/clar/clar.c:785:23: error: unknown type name 'wchar_t'
785 | const wchar_t *wcs2 = va_arg(args, const wchar_t *);
| ^~~~~~~
t/unit-tests/clar/clar.c:785:58: error: unknown type name 'wchar_t'
785 | const wchar_t *wcs2 = va_arg(args, const wchar_t *);
| ^~~~~~~
t/unit-tests/clar/clar.c:787:65: warning: implicit declaration of function 'wcsncmp' [-Wimplicit-function-declaration]
787 | is_equal = (!wcs1 || !wcs2) ? (wcs1 == wcs2) : !wcsncmp(wcs1, wcs2, len);
| ^~~~~~~
make[1]: *** [Makefile:2795: t/unit-tests/clar/clar.o] Error 1
```
This is because since version 2.47.0, Git imports clar unit testing
framework, which uses wchar_t. On wchar-less uClibc-ng configuration,
however, the installed <wchar.h> header is a stub (that is, wchar_t
is undefined).
Apply upstream patchset from Patrick Steinhardt [1], which includes
upstreamed clar build fix.
Fixes: https://autobuild.buildroot.org/results/85dbf87451156fce7c2a12d8882622ea75e0d0db
Link: https://lore.kernel.org/git/cover.1729506329.git.ps@pks.im/ [1]
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From 4e5e8a0822db050c31b3cdd5ae00c37f4a8a063e Mon Sep 17 00:00:00 2001
|
|
From: Patrick Steinhardt <ps@pks.im>
|
|
Date: Mon, 21 Oct 2024 12:56:38 +0200
|
|
Subject: [PATCH] Makefile: extract script to generate clar declarations
|
|
|
|
Extract the script to generate function declarations for the clar unit
|
|
testing framework into a standalone script. This is done such that we
|
|
can reuse it in other build systems.
|
|
|
|
Signed-off-by: Patrick Steinhardt <ps@pks.im>
|
|
Upstream: https://lore.kernel.org/r/c2e3fbcd8532038158a0ead6f0a2f752f557ab7f.1729506329.git.ps@pks.im
|
|
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
|
|
---
|
|
Makefile | 4 +---
|
|
t/unit-tests/generate-clar-decls.sh | 16 ++++++++++++++++
|
|
2 files changed, 17 insertions(+), 3 deletions(-)
|
|
create mode 100755 t/unit-tests/generate-clar-decls.sh
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 87c1f9e220..a58dcab954 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -3905,9 +3905,7 @@ GIT-TEST-SUITES: FORCE
|
|
fi
|
|
|
|
$(UNIT_TEST_DIR)/clar-decls.h: $(patsubst %,$(UNIT_TEST_DIR)/%.c,$(CLAR_TEST_SUITES)) GIT-TEST-SUITES
|
|
- $(QUIET_GEN)for suite in $(CLAR_TEST_SUITES); do \
|
|
- sed -ne "s/^\(void test_$${suite}__[a-zA-Z_0-9][a-zA-Z_0-9]*(void)\)$$/extern \1;/p" $(UNIT_TEST_DIR)/$$suite.c; \
|
|
- done >$@
|
|
+ $(QUIET_GEN)$(SHELL_PATH) $(UNIT_TEST_DIR)/generate-clar-decls.sh "$@" $(filter %.c,$^)
|
|
$(UNIT_TEST_DIR)/clar.suite: $(UNIT_TEST_DIR)/clar-decls.h
|
|
$(QUIET_GEN)awk -f $(UNIT_TEST_DIR)/clar-generate.awk $< >$(UNIT_TEST_DIR)/clar.suite
|
|
$(CLAR_TEST_OBJS): $(UNIT_TEST_DIR)/clar-decls.h
|
|
diff --git a/t/unit-tests/generate-clar-decls.sh b/t/unit-tests/generate-clar-decls.sh
|
|
new file mode 100755
|
|
index 0000000000..688e0885f4
|
|
--- /dev/null
|
|
+++ b/t/unit-tests/generate-clar-decls.sh
|
|
@@ -0,0 +1,16 @@
|
|
+#!/bin/sh
|
|
+
|
|
+if test $# -lt 2
|
|
+then
|
|
+ echo "USAGE: $0 <OUTPUT> <SUITE>..." 2>&1
|
|
+ exit 1
|
|
+fi
|
|
+
|
|
+OUTPUT="$1"
|
|
+shift
|
|
+
|
|
+for suite in "$@"
|
|
+do
|
|
+ sed -ne "s/^\(void test_$(basename "${suite%.c}")__[a-zA-Z_0-9][a-zA-Z_0-9]*(void)\)$/extern \1;/p" "$suite" ||
|
|
+ exit 1
|
|
+done >"$OUTPUT"
|
|
--
|
|
An old man doll... just what I always wanted! - Clara
|
|
|