| Message ID | 20230312072422.2626859-1-raj.khem@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 7fce95e47601f766b384bc0d5805986ad933681f |
| Headers | show |
| Series | systemd: Fix musl fix patch | expand |
How can the issue be triggered? I did test this on musl, and so did the autobuilder. Alex On Sun, 12 Mar 2023 at 08:24, Khem Raj <raj.khem@gmail.com> wrote: > > 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 <raj.khem@gmail.com> > Cc: Alexander Kanavin <alex.kanavin@gmail.com> > --- > ...rc-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch | 5 ++--- > 1 file 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> > 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 <stdbool.h> > #include <stdint.h> > + > +#if SD_BOOT > +typedef __WCHAR_TYPE__ wchar_t; > ++#define __DEFINED_wchar_t > +#else > #include <wchar.h> > +#endif > -- > 2.39.2 >
On Sat, Mar 11, 2023 at 11:30 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > How can the issue be triggered? I did test this on musl, and so did > the autobuilder. My setup is clang/musl on imx8 Which is similar to qemuarm64 And build works for systemd but Fails for systemd-boot recipe > > Alex > > On Sun, 12 Mar 2023 at 08:24, Khem Raj <raj.khem@gmail.com> wrote: > > > > 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 <raj.khem@gmail.com> > > Cc: Alexander Kanavin <alex.kanavin@gmail.com> > > --- > > ...rc-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch | 5 ++--- > > 1 file 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 > > > > 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 <stdbool.h> > > #include <stdint.h> > > + > > +#if SD_BOOT > > +typedef __WCHAR_TYPE__ wchar_t; > > ++#define __DEFINED_wchar_t > > +#else > > #include <wchar.h> > > +#endif > > -- > > 2.39.2 > > >
Right, but what is the specific trigger for the error you are seeing that requires this additional definition, compared to passing musl tests with gcc? I’d like to understand that because your change should not be necessary and I’ve had a long argument with upstream even for the existing patch. Alex On Sun 12. Mar 2023 at 17.59, Khem Raj <raj.khem@gmail.com> wrote: > > > On Sat, Mar 11, 2023 at 11:30 PM Alexander Kanavin <alex.kanavin@gmail.com> > wrote: > >> How can the issue be triggered? I did test this on musl, and so did >> the autobuilder. > > > My setup is clang/musl on imx8 > Which is similar to qemuarm64 > And build works for systemd but > Fails for systemd-boot recipe > > >> >> Alex >> >> On Sun, 12 Mar 2023 at 08:24, Khem Raj <raj.khem@gmail.com> wrote: >> > >> > 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 <raj.khem@gmail.com> >> > Cc: Alexander Kanavin <alex.kanavin@gmail.com> >> > --- >> > ...rc-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch | 5 ++--- >> > 1 file 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> >> > 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 <stdbool.h> >> > #include <stdint.h> >> > + >> > +#if SD_BOOT >> > +typedef __WCHAR_TYPE__ wchar_t; >> > ++#define __DEFINED_wchar_t >> > +#else >> > #include <wchar.h> >> > +#endif >> > -- >> > 2.39.2 >> > >> >
On Sun, Mar 12, 2023 at 10:50 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > Right, but what is the specific trigger for the error you are seeing that requires this additional definition, compared to passing musl tests with gcc? > > I’d like to understand that because your change should not be necessary and I’ve had a long argument with upstream even for the existing patch. > alltypes.h is generated by musl during its build which is used by all system headers on musl systems it contains #if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t) typedef unsigned wchar_t; #define __DEFINED_wchar_t #endif stddef.h defines __NEED_wchar_t which is included from efi-string.h and stddef.h immediately includes alltypes.h. so unless somewhere __DEFINED_wchar_t is pre-defined above will be included and that's what the problem is. The patch you created makes efi-string.c to type define wchar_t before including efi-string.h without blocking all possible ways for it to be defined by system headers. Hope that makes it clear. > Alex > > On Sun 12. Mar 2023 at 17.59, Khem Raj <raj.khem@gmail.com> wrote: >> >> >> >> On Sat, Mar 11, 2023 at 11:30 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: >>> >>> How can the issue be triggered? I did test this on musl, and so did >>> the autobuilder. >> >> >> My setup is clang/musl on imx8 >> Which is similar to qemuarm64 >> And build works for systemd but >> Fails for systemd-boot recipe >> >>> >>> >>> Alex >>> >>> On Sun, 12 Mar 2023 at 08:24, Khem Raj <raj.khem@gmail.com> wrote: >>> > >>> > 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 <raj.khem@gmail.com> >>> > Cc: Alexander Kanavin <alex.kanavin@gmail.com> >>> > --- >>> > ...rc-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch | 5 ++--- >>> > 1 file 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> >>> > 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 <stdbool.h> >>> > #include <stdint.h> >>> > + >>> > +#if SD_BOOT >>> > +typedef __WCHAR_TYPE__ wchar_t; >>> > ++#define __DEFINED_wchar_t >>> > +#else >>> > #include <wchar.h> >>> > +#endif >>> > -- >>> > 2.39.2 >>> >
On Sun, 12 Mar 2023 at 21:19, Khem Raj <raj.khem@gmail.com> wrote: > alltypes.h is generated by musl during its build which is used by all > system headers on musl systems it contains > > #if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t) > typedef unsigned wchar_t; > #define __DEFINED_wchar_t > #endif > > stddef.h defines __NEED_wchar_t which is included from efi-string.h > and stddef.h immediately includes alltypes.h. so unless somewhere > __DEFINED_wchar_t > is pre-defined above will be included and that's what the problem is. > > The patch you created makes efi-string.c to type define wchar_t before > including efi-string.h without blocking all possible ways for it to be > defined by system headers. > Hope that makes it clear. I understand this. The question was about why this happens with clang, but does not happen with gcc. I looked into this meanwhile. This seems to be a difference in how compilers look for headers. There are actually two versions of stddef.h, one provided by the compiler itself (which would be the correct, expected one), and the other coming from musl. gcc: alex@Zen2:/srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0$ find . -name stddef.h ./recipe-sysroot-native/usr/lib/aarch64-poky-linux-musl/gcc/aarch64-poky-linux-musl/12.2.0/include/stddef.h ./recipe-sysroot/usr/include/linux/stddef.h ./recipe-sysroot/usr/include/stddef.h ./git/src/basic/linux/stddef.h clang: alex@Zen2:/srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0$ find . -name stddef.h ./recipe-sysroot-native/usr/lib/clang/15.0.7/include/stddef.h ./recipe-sysroot/usr/include/linux/stddef.h ./recipe-sysroot/usr/include/stddef.h ./git/src/basic/linux/stddef.h gcc includes the correct header because its order of searching headers is: #include <...> search starts here: /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/git/src/fundamental /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/git/src/boot/efi /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include/efi/aarch64 /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include/efi /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot-native/usr/bin/aarch64-poky-linux-musl/../../lib/aarch64-poky-linux-musl/gcc/aarch64-poky-linux-musl/12.2.0/include /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/lib/aarch64-poky-linux-musl/12.2.0/include /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include End of search list. clang includes the incorrect one: #include <...> search starts here: /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/git/src/fundamental /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/git/src/boot/efi /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include/efi/aarch64 /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include/efi /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot-native/usr/lib/clang/15.0.7/include End of search list. So I'd say the search order needs to be aligned with gcc, rather than having to patch around the issue. Alex
On Sun, 12 Mar 2023 at 21:54, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > clang includes the incorrect one: > > #include <...> search starts here: > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/git/src/fundamental > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/git/src/boot/efi > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include/efi/aarch64 > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include/efi > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot-native/usr/lib/clang/15.0.7/include > End of search list. > > So I'd say the search order needs to be aligned with gcc, rather than > having to patch around the issue. For reference, clang on my host gets it right and matches gcc: alex@alex-lx-laptop:~$ echo | clang-14 -E -Wp,-v - clang -cc1 version 14.0.6 based upon LLVM 14.0.6 default target x86_64-pc-linux-gnu ... #include <...> search starts here: /usr/lib/llvm-14/lib/clang/14.0.6/include /usr/local/include /usr/include/x86_64-linux-gnu /usr/include End of search list. Alex
On Sun, Mar 12, 2023 at 1:54 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > On Sun, 12 Mar 2023 at 21:19, Khem Raj <raj.khem@gmail.com> wrote: > > alltypes.h is generated by musl during its build which is used by all > > system headers on musl systems it contains > > > > #if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t) > > typedef unsigned wchar_t; > > #define __DEFINED_wchar_t > > #endif > > > > stddef.h defines __NEED_wchar_t which is included from efi-string.h > > and stddef.h immediately includes alltypes.h. so unless somewhere > > __DEFINED_wchar_t > > is pre-defined above will be included and that's what the problem is. > > > > The patch you created makes efi-string.c to type define wchar_t before > > including efi-string.h without blocking all possible ways for it to be > > defined by system headers. > > Hope that makes it clear. > > I understand this. The question was about why this happens with clang, > but does not happen with gcc. > > I looked into this meanwhile. This seems to be a difference in how > compilers look for headers. > > There are actually two versions of stddef.h, one provided by the > compiler itself (which would be the correct, expected one), and the > other coming from musl. > > gcc: > alex@Zen2:/srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0$ > find . -name stddef.h > ./recipe-sysroot-native/usr/lib/aarch64-poky-linux-musl/gcc/aarch64-poky-linux-musl/12.2.0/include/stddef.h > ./recipe-sysroot/usr/include/linux/stddef.h > ./recipe-sysroot/usr/include/stddef.h > ./git/src/basic/linux/stddef.h > > clang: > alex@Zen2:/srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0$ > find . -name stddef.h > ./recipe-sysroot-native/usr/lib/clang/15.0.7/include/stddef.h > ./recipe-sysroot/usr/include/linux/stddef.h > ./recipe-sysroot/usr/include/stddef.h > ./git/src/basic/linux/stddef.h > > > > gcc includes the correct header because its order of searching headers is: > #include <...> search starts here: > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/git/src/fundamental > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/git/src/boot/efi > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include/efi/aarch64 > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include/efi > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot-native/usr/bin/aarch64-poky-linux-musl/../../lib/aarch64-poky-linux-musl/gcc/aarch64-poky-linux-musl/12.2.0/include > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/lib/aarch64-poky-linux-musl/12.2.0/include > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include > End of search list. > > clang includes the incorrect one: > > #include <...> search starts here: > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/git/src/fundamental > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/git/src/boot/efi > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include/efi/aarch64 > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include/efi > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot/usr/include > /srv/storage/alex/yocto/build-musl-arm-64/tmp/work/cortexa57-poky-linux-musl/systemd-boot/253.1-r0/recipe-sysroot-native/usr/lib/clang/15.0.7/include > End of search list. > This is working as intended, unlike glibc, musl provides stddef.h and it wants musl based platforms to use that, OE clang won't do that when the selected libc is glibc. > So I'd say the search order needs to be aligned with gcc, rather than > having to patch around the issue.
On Mon, 13 Mar 2023 at 01:12, Khem Raj <raj.khem@gmail.com> wrote: > This is working as intended, unlike glibc, musl provides stddef.h and > it wants musl based platforms to use that, > OE clang won't do that when the selected libc is glibc. But this means gcc is not doing the right thing. It does take its own stddef.h (rather than one from musl), and this leads to undetected breakage like this one and general inconsistency between which set of headers is used. It's gcc that is the default, AB-tested choice with musl, shouldn't it work correctly? Alex
On Mon, Mar 13, 2023 at 12:56 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > On Mon, 13 Mar 2023 at 01:12, Khem Raj <raj.khem@gmail.com> wrote: > > > This is working as intended, unlike glibc, musl provides stddef.h and > > it wants musl based platforms to use that, > > OE clang won't do that when the selected libc is glibc. > > But this means gcc is not doing the right thing. It does take its own > stddef.h (rather than one from musl), and this leads to undetected > breakage like this one and general inconsistency between which set of > headers is used. probably, but there maybe some reasons why its not done which I am not aware of. > > It's gcc that is the default, AB-tested choice with musl, shouldn't it > work correctly? > > Alex
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> 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 <stdbool.h> #include <stdint.h> + +#if SD_BOOT +typedef __WCHAR_TYPE__ wchar_t; ++#define __DEFINED_wchar_t +#else #include <wchar.h> +#endif
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 <raj.khem@gmail.com> Cc: Alexander Kanavin <alex.kanavin@gmail.com> --- ...rc-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)