diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-03-11 23:24:22 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-14 07:17:47 +0000 |
commit | ba451b771f0d089f44966c5084e3a71bdfeae40d (patch) | |
tree | 3d494f3bb61edc09675c4c3df4ef89efc45f139e | |
parent | 3419f8340cc515b3f71f23a4b49bd898e972668e (diff) | |
download | poky-ba451b771f0d089f44966c5084e3a71bdfeae40d.tar.gz |
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
(From OE-Core rev: 7fce95e47601f766b384bc0d5805986ad933681f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch | 5 |
1 files changed, 2 insertions, 3 deletions
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 927f914848..43173ac32d 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 <alex@linutronix.de> | |||
21 | src/boot/efi/efi-string.c | 5 +++++ | 21 | src/boot/efi/efi-string.c | 5 +++++ |
22 | 1 file changed, 5 insertions(+) | 22 | 1 file changed, 5 insertions(+) |
23 | 23 | ||
24 | diff --git a/src/boot/efi/efi-string.c b/src/boot/efi/efi-string.c | ||
25 | index 22923d60f6..22a8d1ef71 100644 | ||
26 | --- a/src/boot/efi/efi-string.c | 24 | --- a/src/boot/efi/efi-string.c |
27 | +++ b/src/boot/efi/efi-string.c | 25 | +++ b/src/boot/efi/efi-string.c |
28 | @@ -2,7 +2,12 @@ | 26 | @@ -2,7 +2,13 @@ |
29 | 27 | ||
30 | #include <stdbool.h> | 28 | #include <stdbool.h> |
31 | #include <stdint.h> | 29 | #include <stdint.h> |
32 | + | 30 | + |
33 | +#if SD_BOOT | 31 | +#if SD_BOOT |
34 | +typedef __WCHAR_TYPE__ wchar_t; | 32 | +typedef __WCHAR_TYPE__ wchar_t; |
33 | +#define __DEFINED_wchar_t | ||
35 | +#else | 34 | +#else |
36 | #include <wchar.h> | 35 | #include <wchar.h> |
37 | +#endif | 36 | +#endif |