Re: [edk2-devel] 回复: [Patch 1/2] BaseTools: Update brotli submodule

["Bob Feng" <bob.c.feng@intel.com>]

Thank you Liming. 

Hi Stewards,

This patch set can resolve the build failure issue with GCC 11, so I plan to have it in this stable tag.
https://edk2.groups.io/g/devel/message/86077
https://edk2.groups.io/g/devel/message/86078


Thanks,
Bob

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
Sent: Thursday, February 10, 2022 3:58 PM
To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>
Cc: Chen, Christine <yuwei.chen@intel.com>; 'Pedro Falcato' <pedro.falcato@gmail.com>
Subject: 回复: [edk2-devel] 回复: [Patch 1/2] BaseTools: Update brotli submodule

Bob:
  I have no comments for this patch set. Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
  
  Now, we are in soft feature freeze phase. Does this patch set plan to catch this stable tag? If yes, please reply the mail and cc to Stewards. 

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Bob Feng
> 发送时间: 2022年2月10日 14:45
> 收件人: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>; Gao, 
> Liming <gaoliming@byosoft.com.cn>
> 抄送: Chen, Christine <yuwei.chen@intel.com>; 'Pedro Falcato'
> <pedro.falcato@gmail.com>
> 主题: Re: [edk2-devel] 回复: [Patch 1/2] BaseTools: Update brotli 
> submodule
> 
> Liming,
> 
> Do you have any more comments on this patch?
> 
> Thanks,
> Bob
> 
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bob 
> Feng
> Sent: Thursday, January 27, 2022 10:24 AM
> To: devel@edk2.groups.io; Gao, Liming <gaoliming@byosoft.com.cn>
> Cc: Chen, Christine <yuwei.chen@intel.com>; 'Pedro Falcato'
> <pedro.falcato@gmail.com>
> Subject: Re: [edk2-devel] 回复: [Patch 1/2] BaseTools: Update brotli 
> submodule
> 
> Yes. it passed the edk2 CI https://github.com/tianocore/edk2/pull/2442
> 
> 
> Thanks,
> Bob
> 
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of 
> gaoliming
> Sent: Thursday, January 27, 2022 9:12 AM
> To: Feng, Bob C <bob.c.feng@intel.com>; devel@edk2.groups.io
> Cc: Chen, Christine <yuwei.chen@intel.com>; 'Pedro Falcato'
> <pedro.falcato@gmail.com>
> Subject: [edk2-devel] 回复: [Patch 1/2] BaseTools: Update brotli 
> submodule
> 
> Does this updated patch pass CI?
> 
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: Bob Feng <bob.c.feng@intel.com>
> > 发送时间: 2022年1月26日 16:30
> > 收件人: devel@edk2.groups.io
> > 抄送: Liming Gao <gaoliming@byosoft.com.cn>; Yuwei Chen 
> > <yuwei.chen@intel.com>; Pedro Falcato <pedro.falcato@gmail.com>
> > 主题: [Patch 1/2] BaseTools: Update brotli submodule
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3417
> > Update the brotli submodule to the latest commit (f4153a0) so that 
> > the build isn't broken in GCC 11 compilers.
> >
> > Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > Cc: Pedro Falcato <pedro.falcato@gmail.com>
> > ---
> >  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..fd8e05c0e6 100644
> > --- a/BaseTools/Source/C/BrotliCompress/GNUmakefile
> > +++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile
> > @@ -8,10 +8,17 @@ MAKEROOT ?= ..
> >
> >
> >  APPNAME = BrotliCompress
> >
> >
> >
> >  OBJECTS = \
> >
> >    BrotliCompress.o \
> >
> > +  brotli/c/common/platform.o \
> >
> > +  brotli/c/common/shared_dictionary.o \
> >
> > +  brotli/c/common/constants.o \
> >
> > +  brotli/c/common/context.o \
> >
> > +  brotli/c/enc/command.o \
> >
> > +  brotli/c/enc/compound_dictionary.o \
> >
> > +  brotli/c/enc/fast_log.o \
> >
> >    brotli/c/common/dictionary.o \
> >
> >    brotli/c/common/transform.o \
> >
> >    brotli/c/dec/bit_reader.o \
> >
> >    brotli/c/dec/decode.o \
> >
> >    brotli/c/dec/huffman.o \
> >
> > diff --git a/BaseTools/Source/C/BrotliCompress/Makefile
> > b/BaseTools/Source/C/BrotliCompress/Makefile
> > index 038d1ec242..36e69aa656 100644
> > --- a/BaseTools/Source/C/BrotliCompress/Makefile
> > +++ b/BaseTools/Source/C/BrotliCompress/Makefile
> > @@ -11,18 +11,27 @@ CFLAGS = $(CFLAGS) /W2
> >
> >
> >  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\platform.obj \
> >
> > +  brotli\c\common\shared_dictionary.obj \
> >
> > +  brotli\c\common\transform.obj
> >
> >  DEC_OBJ = \
> >
> >    brotli\c\dec\bit_reader.obj \
> >
> >    brotli\c\dec\decode.obj \
> >
> >    brotli\c\dec\huffman.obj \
> >
> >    brotli\c\dec\state.obj
> >
> >  ENC_OBJ = \
> >
> > +  brotli\c\enc\command.obj \
> >
> > +  brotli\c\enc\compound_dictionary.obj \
> >
> >    brotli\c\enc\backward_references.obj \
> >
> > +  brotli\c\enc\fast_log.obj \
> >
> >    brotli\c\enc\backward_references_hq.obj \
> >
> >    brotli\c\enc\bit_cost.obj \
> >
> >    brotli\c\enc\block_splitter.obj \
> >
> >    brotli\c\enc\brotli_bit_stream.obj \
> >
> >    brotli\c\enc\cluster.obj \
> >
> > diff --git a/BaseTools/Source/C/BrotliCompress/brotli
> > b/BaseTools/Source/C/BrotliCompress/brotli
> > index 666c3280cc..f4153a09f8 160000
> > --- a/BaseTools/Source/C/BrotliCompress/brotli
> > +++ b/BaseTools/Source/C/BrotliCompress/brotli
> > @@ -1 +1 @@
> > -Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d
> > +Subproject commit f4153a09f87cbb9c826d8fc12c74642bb2d879ea
> > --
> > 2.29.1.windows.1
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
>