From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 11 Aug 2023 06:31:01 +0000 (-0700)
Subject: systemd-boot: Fix build on musl
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b84fe344a2067b63d0c222fbc68d5916fa7903f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

systemd-boot: Fix build on musl

systemd efi.h defines wchar_t from compiler provided __WCHAR_TYPE__
therefore we do not want it to come from alltypes.h in musl case which
otherwise will end up with conflicting definitions of wchar_t, defining
__DEFINED_wchar_t ensures that alltypes.h does not provide it

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/systemd/systemd-boot_254.bb b/meta/recipes-core/systemd/systemd-boot_254.bb
index 5d69cf83abc..6240ee9339e 100644
--- a/meta/recipes-core/systemd/systemd-boot_254.bb
+++ b/meta/recipes-core/systemd/systemd-boot_254.bb
@@ -49,6 +49,8 @@ RDEPENDS:${PN} += "virtual-systemd-bootconf"
 # Imported from the old gummiboot recipe
 TUNE_CCARGS:remove = "-mfpmath=sse"
 
+CFLAGS:append:libc-musl = " -D__DEFINED_wchar_t"
+
 COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux"
 COMPATIBLE_HOST:x86-x32 = "null"