From: Khem Raj Date: Sun, 12 Mar 2023 07:24:22 +0000 (-0800) Subject: systemd: Fix musl fix patch X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1415 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fce95e47601f766b384bc0d5805986ad933681f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git systemd: Fix musl fix patch Current patch with fail when stdint.h is in include path before this typedef which can also happen with re-includes. Therefore shunt that by defining __DEFINED_wchar_t which helps musl builds of systemd-boot recipe Signed-off-by: Khem Raj Cc: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch b/meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch index 927f914848e..43173ac32db 100644 --- a/meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch +++ b/meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch @@ -21,17 +21,16 @@ Signed-off-by: Alexander Kanavin src/boot/efi/efi-string.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/src/boot/efi/efi-string.c b/src/boot/efi/efi-string.c -index 22923d60f6..22a8d1ef71 100644 --- a/src/boot/efi/efi-string.c +++ b/src/boot/efi/efi-string.c -@@ -2,7 +2,12 @@ +@@ -2,7 +2,13 @@ #include #include + +#if SD_BOOT +typedef __WCHAR_TYPE__ wchar_t; ++#define __DEFINED_wchar_t +#else #include +#endif