Re: [PATCH] BaseTools/Brotli: update to latest brotli submodule


Pedro Falcato
 

Hi Bob,

My patch includes the other brotli submodule as well, per Liming's request.

I saw the PR's CI failed before Christmas but I completely forgot about it, sorry about that!

I can take a look again and submit a v2 patch set tomorrow. It's all trivial stuff and I believe it's best that both brotli submodules are kept in sync (despite it being weird that we have two submodules of the same project in the tree, it sounds like something that should be de-duplicated, honestly).

Thanks,

Pedro

On Tue, 11 Jan 2022, 14:38 Bob Feng, <bob.c.feng@...> wrote:
Actually https://github.com/google/brotli/pull/893 this PR just fixed the GCC 11 build issue. It was merged at https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b. Both of Pedro's patch and Ross's patch include that fix.

I think the difference between the Pedro's patch and Ross's patch is that besides of brotli version, Ross's patch don't have the changes in MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf, that is

+  brotli/c/common/constants.c
+  brotli/c/common/context.c
   brotli/c/common/dictionary.c
+  brotli/c/common/shared_dictionary.c

Are these added c files necessary?

Can we use Ross's patch to fix GCC11 build issue?

Thanks,
Bob

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
Sent: Friday, December 24, 2021 9:42 AM
To: 'Ross Burton' <ross@...>; Kinney, Michael D <michael.d.kinney@...>; 'Pedro Falcato' <pedro.falcato@...>
Cc: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@...>; Chen, Christine <yuwei.chen@...>
Subject: 回复: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule

Ross:
  I know the reason. Your patch is to update brotli version to the latest one e83c7b8e8fb8b696a1df6866bc46cbb76d7e0348, but previos Pedro's patch updates brotli version to one early version 4ec67035c0d97c270c1c73038cc66fc5fcdfc120. So, your PR can pass, but my PR fail.

Pedro:
  Can you update your patch to reference the latest brotli version e83c7b8e8fb8b696a1df6866bc46cbb76d7e0348?

Thanks
Liming
> -----邮件原件-----
> 发件人: Ross Burton <ross@...>
> 发送时间: 2021年12月24日 6:53
> 收件人: Kinney, Michael D <michael.d.kinney@...>
> 抄送: devel@edk2.groups.io; Gao, Liming <gaoliming@...>;
> Pedro Falcato <pedro.falcato@...>; Feng, Bob C
> <bob.c.feng@...>; Chen, Christine <yuwei.chen@...>
> 主题: Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli
> submodule
>
> My original PR has passed CI:
> https://github.com/tianocore/edk2/pull/2231
>
> Ross
>
> On Thu, 23 Dec 2021 at 22:35, Kinney, Michael D
> <michael.d.kinney@...> wrote:
> >
> > Hi Ross,
> >
> > This PR is showing CI failures with VS2019
> >
> >
> https://dev.azure.com/tianocore/11ea4a10-ac9f-4e5f-8b13-7def1f19d478/_
> apis/build/builds/36559/logs/178
> >
> > 2021-12-23T00:53:44.7544282Z PROGRESS - Running Build DEBUG
> > 2021-12-23T00:54:36.3840067Z ERROR - Compiler #2059 from C:\Program
> Files (x86)\Microsoft Visual
> Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\include\vcruntime_stri
> ng.h(67):   syntax error: '('
> > 2021-12-23T00:54:36.3841683Z ERROR - Compiler #2146 from C:\Program
> Files (x86)\Microsoft Visual
> Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\include\vcruntime_stri
> ng.h(67):   syntax error: missing ')' before identifier 'UINTN'
> > 2021-12-23T00:54:36.3845453Z WARNING - Compiler #4029 from
> C:\Program Files (x86)\Microsoft Visual
> Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\include\vcruntime_stri
> ng.h(67):   declared formal parameter list different from definition
> > 2021-12-23T00:54:36.3847199Z ERROR - Compiler #2059 from C:\Program
> Files (x86)\Microsoft Visual
> Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\include\vcruntime_stri
> ng.h(67):   syntax error: ')'
> > 2021-12-23T00:54:36.3851318Z ERROR - Compiler #2059 from C:\Program
> Files (x86)\Microsoft Visual
> Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\include\vcruntime_stri
> ng.h(67):   syntax error: '<parameter-list>'
> > 2021-12-23T00:54:36.3853972Z WARNING - Compiler #4205 from
> C:\Program Files (x86)\Windows
> Kits\10\include\10.0.22000.0\ucrt\corecrt_memcpy_s.h(45):   nonstandard
> extension used: static function declaration in function scope
> > 2021-12-23T00:54:36.3858517Z WARNING - Compiler #4020 from
> C:\Program Files (x86)\Windows
> Kits\10\include\10.0.22000.0\ucrt\corecrt_memcpy_s.h(54):   'SetMem':
> too many actual parameters
> > 2021-12-23T00:54:36.3861595Z WARNING - Compiler #4020 from
> d:\a\1\s\MdeModulePkg\Library\BrotliCustomDecompressLib\brotli\c\comm
> on\shared_dictionary.c(103):   'SetMem': too many actual parameters
> > 2021-12-23T00:54:36.3864836Z WARNING - Compiler #4020 from
> d:\a\1\s\MdeModulePkg\Library\BrotliCustomDecompressLib\brotli\c\comm
> on\shared_dictionary.c(496):   'SetMem': too many actual parameters
> > 2021-12-23T00:54:36.3867350Z ERROR - Compiler #1077 from NMAKE :
> fatal   '"C:\Program Files (x86)\Microsoft Visual
> Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\bin\Hostx86\x86\cl.ex
> e"' : return code '0x2'
> > 2021-12-23T00:54:36.3870885Z ERROR - Compiler #7000 from :   Failed
> to execute command
> > 2021-12-23T00:54:36.3873160Z ERROR - EDK2 #002 from :   Failed to
> build module
> > 2021-12-23T00:54:36.3878035Z CRITICAL - Build failed
> >
> > Can you please resolve and update the PR.
> >
> > Thanks,
> >
> > Mike
> >
> > > -----Original Message-----
> > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> > > Ross
> Burton
> > > Sent: Thursday, December 23, 2021 2:02 AM
> > > To: Gao, Liming <gaoliming@...>
> > > Cc: Pedro Falcato <pedro.falcato@...>; edk2-devel-groups-io
> <devel@edk2.groups.io>; Feng, Bob C <bob.c.feng@...>;
> > > Chen, Christine <yuwei.chen@...>
> > > Subject: Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to
> > > latest brotli
> submodule
> > >
> > > On Thu, 23 Dec 2021 at 00:48, gaoliming <gaoliming@...>
> wrote:
> > > > Create PR https://github.com/tianocore/edk2/pull/2346 for this patch.
> > >
> > > There are now *three* PRs on GitHub to solve this issue, which is
> > > a build breaker for anyone using a new GCC.
> > >
> > > Can someone please merge the fix?
> > >
> > > Ross
> > >
> > >
> > >
> > >
> >












Join devel@edk2.groups.io to automatically receive all group messages.