Re: [OE-core] [PATCH] ovmf: Don't define bool type if building in C23 mode

["Mathieu Dubois-Briand" <mathieu.dubois-briand@bootlin.com>]

On Mon Aug 4, 2025 at 11:14 AM CEST, Mikko Rapeli wrote:
> Hi,
>
> On Mon, Aug 04, 2025 at 10:26:23AM +0200, Mathieu Dubois-Briand via lists.openembedded.org wrote:
>> On Fri Aug 1, 2025 at 12:29 PM CEST, Mingli via lists.openembedded.org Yu wrote:
>> > From: Mingli Yu <mingli.yu@windriver.com>
>> >
>> > Backport a patch [1] to fix the below build failure:
>> >  /buildarea/tmp/work/corei7-64-wrs-linux/ovmf/edk2-stable202502/sources/ovmf-edk2-stable202502/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h:13:17: error: two or more data types in declaration specifiers
>> >  13 | typedef BOOLEAN bool;
>> >  | ^~~~
>> >   /buildarea/tmp/work/corei7-64-wrs-linux/ovmf/edk2-stable202502/sources/ovmf-edk2-stable202502/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h:13:1: error: useless type name in empty declaration [-Werror]
>> >   13 | typedef BOOLEAN bool;
>> >
>> > [1] https://github.com/tianocore/edk2/commit/772fa11ac82579a8f6fa171e6b835f68af3f64be
>> >
>> > Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>> > ---
>> 
>> Hi,
>> 
>> Thanks for the patch, but it looks like the embedded patch does not
>> apply cleanly:
>> 
>> ERROR: ovmf-native-edk2-stable202502-r0 do_patch: Applying patch '0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch' on target directory '/srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86_64-linux/ovmf-native/edk2-stable202502/sources/ovmf-edk2-stable202502'
>> CmdError('quilt --quiltrc /srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86_64-linux/ovmf-native/edk2-stable202502/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch
>> patching file SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h
>> Hunk #1 FAILED at 10 (different line endings).
>> 1 out of 1 hunk FAILED -- rejects in file SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h
>> Patch 0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch does not apply (enforce with -f)
>> 
>> https://autobuilder.yoctoproject.org/valkyrie/#/builders/17/builds/1998
>> 
>> Can you have a look at this issue please?
>
> ovmf and edk2 are notorious for using Windows newlines so patches over
> mailing lists may break when applying. I suggest using git to pull the
> changes or manually applying simple changes.
>
> Cheers,
>
> -Mikko

Makes sense. I believe I managed to fix the new line issues, so the
patch is back in testing queue.

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com