回复: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule

gaoliming posted 1 patch 2 years, 3 months ago
Failed in applying to current master (apply log)
BaseTools/Source/C/BrotliCompress/GNUmakefile |  7 +++++++
BaseTools/Source/C/BrotliCompress/Makefile    | 11 ++++++++++-
BaseTools/Source/C/BrotliCompress/brotli      |  2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
回复: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule
Posted by gaoliming 2 years, 3 months ago
Create PR https://github.com/tianocore/edk2/pull/2346 for this patch. 

 

Thanks

Liming

发件人: Pedro Falcato <pedro.falcato@gmail.com> 
发送时间: 2021年12月21日 1:02
收件人: edk2-devel-groups-io <devel@edk2.groups.io>; ross@burtonini.com
抄送: Bob Feng <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Yuwei Chen <yuwei.chen@intel.com>
主题: Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule

 

Ross,

 

This is a duplicate of https://edk2.groups.io/g/devel/message/84497, which has already been Rb'd and is just waiting for a maintainer to merge it.

 

Best regards,

Pedro

 

On Mon, Dec 20, 2021 at 4:55 PM Ross Burton <ross@burtonini.com <mailto:ross@burtonini.com> > wrote:

Update to the latest Brotli commit, and extend the makefiles as needed.

Specifically, this is needed for 0a3944 in brotli, to fix VLA parameter
warnings with new compilers.

Signed-off-by: Ross Burton <ross.burton@arm.com <mailto:ross.burton@arm.com> >
Change-Id: I36d28cadb9bf2d9e01ac0341e69509fa1b8d6969
---
 BaseTools/Source/C/BrotliCompress/GNUmakefile |  7 +++++++
 BaseTools/Source/C/BrotliCompress/Makefile    | 11 ++++++++++-
 BaseTools/Source/C/BrotliCompress/brotli      |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile
index b150e5dd2b..1a946140a3 100644
--- a/BaseTools/Source/C/BrotliCompress/GNUmakefile
+++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile
@@ -10,8 +10,12 @@ APPNAME = BrotliCompress

 OBJECTS = \
   BrotliCompress.o \
+  brotli/c/common/constants.o \
+  brotli/c/common/context.o \
   brotli/c/common/dictionary.o \
   brotli/c/common/transform.o \
+  brotli/c/common/platform.o \
+  brotli/c/common/shared_dictionary.o \
   brotli/c/dec/bit_reader.o \
   brotli/c/dec/decode.o \
   brotli/c/dec/huffman.o \
@@ -22,12 +26,15 @@ OBJECTS = \
   brotli/c/enc/block_splitter.o \
   brotli/c/enc/brotli_bit_stream.o \
   brotli/c/enc/cluster.o \
+  brotli/c/enc/compound_dictionary.o \
   brotli/c/enc/compress_fragment.o \
   brotli/c/enc/compress_fragment_two_pass.o \
+  brotli/c/enc/command.o \
   brotli/c/enc/dictionary_hash.o \
   brotli/c/enc/encode.o \
   brotli/c/enc/encoder_dict.o \
   brotli/c/enc/entropy_encode.o \
+  brotli/c/enc/fast_log.o \
   brotli/c/enc/histogram.o \
   brotli/c/enc/literal_cost.o \
   brotli/c/enc/memory.o \
diff --git a/BaseTools/Source/C/BrotliCompress/Makefile b/BaseTools/Source/C/BrotliCompress/Makefile
index 038d1ec242..918497dc7b 100644
--- a/BaseTools/Source/C/BrotliCompress/Makefile
+++ b/BaseTools/Source/C/BrotliCompress/Makefile
@@ -13,7 +13,13 @@ APPNAME = BrotliCompress

 #LIBS = $(LIB_PATH)\Common.lib

-COMMON_OBJ = brotli\c\common\dictionary.obj brotli\c\common\transform.obj
+COMMON_OBJ = \
+  brotli\c\common\constants.obj \
+  brotli\c\common\context.obj \
+  brotli\c\common\dictionary.obj \
+  brotli\c\common\transform.obj \
+  brotli\c\common\platform.obj \
+  brotli\c\common\shared_dictionary.obj
 DEC_OBJ = \
   brotli\c\dec\bit_reader.obj \
   brotli\c\dec\decode.obj \
@@ -26,12 +32,15 @@ ENC_OBJ = \
   brotli\c\enc\block_splitter.obj \
   brotli\c\enc\brotli_bit_stream.obj \
   brotli\c\enc\cluster.obj \
+  brotli\c\enc\compound_dictionary.obj \
   brotli\c\enc\compress_fragment.obj \
   brotli\c\enc\compress_fragment_two_pass.obj \
+  brotli\c\enc\command.obj \
   brotli\c\enc\dictionary_hash.obj \
   brotli\c\enc\encode.obj \
   brotli\c\enc\encoder_dict.obj \
   brotli\c\enc\entropy_encode.obj \
+  brotli\c\enc\fast_log.obj \
   brotli\c\enc\histogram.obj \
   brotli\c\enc\literal_cost.obj \
   brotli\c\enc\memory.obj \
diff --git a/BaseTools/Source/C/BrotliCompress/brotli b/BaseTools/Source/C/BrotliCompress/brotli
index 666c3280cc..e83c7b8e8f 160000
--- a/BaseTools/Source/C/BrotliCompress/brotli
+++ b/BaseTools/Source/C/BrotliCompress/brotli
@@ -1 +1 @@
-Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+Subproject commit e83c7b8e8fb8b696a1df6866bc46cbb76d7e0348
-- 
2.25.1



------------
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85111): https://edk2.groups.io/g/devel/message/85111
Mute This Topic: https://groups.io/mt/87860390/5946980
Group Owner: devel+owner@edk2.groups.io <mailto:devel%2Bowner@edk2.groups.io> 
Unsubscribe: https://edk2.groups.io/g/devel/unsub [pedro.falcato@gmail.com <mailto:pedro.falcato@gmail.com> ]
------------






 

-- 

Pedro Falcato



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85180): https://edk2.groups.io/g/devel/message/85180
Mute This Topic: https://groups.io/mt/87910459/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule
Posted by Ross Burton 2 years, 3 months ago
On Thu, 23 Dec 2021 at 00:48, gaoliming <gaoliming@byosoft.com.cn> 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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85198): https://edk2.groups.io/g/devel/message/85198
Mute This Topic: https://groups.io/mt/87915616/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule
Posted by Michael D Kinney 2 years, 3 months ago
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_string.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_string.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_string.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_string.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_string.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\common\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\common\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.exe"' : 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@byosoft.com.cn>
> Cc: Pedro Falcato <pedro.falcato@gmail.com>; edk2-devel-groups-io <devel@edk2.groups.io>; Feng, Bob C <bob.c.feng@intel.com>;
> Chen, Christine <yuwei.chen@intel.com>
> Subject: Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule
> 
> On Thu, 23 Dec 2021 at 00:48, gaoliming <gaoliming@byosoft.com.cn> 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
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85202): https://edk2.groups.io/g/devel/message/85202
Mute This Topic: https://groups.io/mt/87915616/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule
Posted by Ross Burton 2 years, 3 months ago
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@intel.com> 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_string.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_string.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_string.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_string.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_string.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\common\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\common\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.exe"' : 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@byosoft.com.cn>
> > Cc: Pedro Falcato <pedro.falcato@gmail.com>; edk2-devel-groups-io <devel@edk2.groups.io>; Feng, Bob C <bob.c.feng@intel.com>;
> > Chen, Christine <yuwei.chen@intel.com>
> > Subject: Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule
> >
> > On Thu, 23 Dec 2021 at 00:48, gaoliming <gaoliming@byosoft.com.cn> 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
> >
> >
> > 
> >
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85203): https://edk2.groups.io/g/devel/message/85203
Mute This Topic: https://groups.io/mt/87915616/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


回复: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule
Posted by gaoliming 2 years, 3 months ago
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@burtonini.com>
> 发送时间: 2021年12月24日 6:53
> 收件人: Kinney, Michael D <michael.d.kinney@intel.com>
> 抄送: devel@edk2.groups.io; Gao, Liming <gaoliming@byosoft.com.cn>;
> Pedro Falcato <pedro.falcato@gmail.com>; Feng, Bob C
> <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>
> 主题: 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@intel.com> 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@byosoft.com.cn>
> > > Cc: Pedro Falcato <pedro.falcato@gmail.com>; edk2-devel-groups-io
> <devel@edk2.groups.io>; Feng, Bob C <bob.c.feng@intel.com>;
> > > Chen, Christine <yuwei.chen@intel.com>
> > > Subject: Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli
> submodule
> > >
> > > On Thu, 23 Dec 2021 at 00:48, gaoliming <gaoliming@byosoft.com.cn>
> 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
> > >
> > >
> > > 
> > >
> >




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85208): https://edk2.groups.io/g/devel/message/85208
Mute This Topic: https://groups.io/mt/87930114/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule
Posted by Bob Feng 2 years, 2 months ago
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@burtonini.com>; Kinney, Michael D <michael.d.kinney@intel.com>; 'Pedro Falcato' <pedro.falcato@gmail.com>
Cc: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>
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@burtonini.com>
> 发送时间: 2021年12月24日 6:53
> 收件人: Kinney, Michael D <michael.d.kinney@intel.com>
> 抄送: devel@edk2.groups.io; Gao, Liming <gaoliming@byosoft.com.cn>; 
> Pedro Falcato <pedro.falcato@gmail.com>; Feng, Bob C 
> <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>
> 主题: 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@intel.com> 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@byosoft.com.cn>
> > > Cc: Pedro Falcato <pedro.falcato@gmail.com>; edk2-devel-groups-io
> <devel@edk2.groups.io>; Feng, Bob C <bob.c.feng@intel.com>;
> > > Chen, Christine <yuwei.chen@intel.com>
> > > Subject: Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to 
> > > latest brotli
> submodule
> > >
> > > On Thu, 23 Dec 2021 at 00:48, gaoliming <gaoliming@byosoft.com.cn>
> 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
> > >
> > >
> > > 
> > >
> >









-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85559): https://edk2.groups.io/g/devel/message/85559
Mute This Topic: https://groups.io/mt/88349804/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to latest brotli submodule
Posted by Pedro Falcato 2 years, 2 months ago
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@intel.com> 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@burtonini.com>; Kinney, Michael D <
> michael.d.kinney@intel.com>; 'Pedro Falcato' <pedro.falcato@gmail.com>
> Cc: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>; Chen,
> Christine <yuwei.chen@intel.com>
> 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@burtonini.com>
> > 发送时间: 2021年12月24日 6:53
> > 收件人: Kinney, Michael D <michael.d.kinney@intel.com>
> > 抄送: devel@edk2.groups.io; Gao, Liming <gaoliming@byosoft.com.cn>;
> > Pedro Falcato <pedro.falcato@gmail.com>; Feng, Bob C
> > <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>
> > 主题: 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@intel.com> 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@byosoft.com.cn>
> > > > Cc: Pedro Falcato <pedro.falcato@gmail.com>; edk2-devel-groups-io
> > <devel@edk2.groups.io>; Feng, Bob C <bob.c.feng@intel.com>;
> > > > Chen, Christine <yuwei.chen@intel.com>
> > > > Subject: Re: [edk2-devel] [PATCH] BaseTools/Brotli: update to
> > > > latest brotli
> > submodule
> > > >
> > > > On Thu, 23 Dec 2021 at 00:48, gaoliming <gaoliming@byosoft.com.cn>
> > 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
> > > >
> > > >
> > > >
> > > >
> > >
>
>
>
>
>
>
>
>
>
> 
>
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85580): https://edk2.groups.io/g/devel/message/85580
Mute This Topic: https://groups.io/mt/88349804/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-