Pedro: I am OK to update brotli to new version. Please also update MdeModulePkg\Library\BrotliCustomDecompressLib\brotli to make them be same version.
Thanks Liming 发件人: Pedro Falcato <pedro.falc...@gmail.com> 发送时间: 2021年12月1日 8:39 收件人: edk2-devel-groups-io <devel@edk2.groups.io> 抄送: Bob Feng <bob.c.f...@intel.com>; Liming Gao <gaolim...@byosoft.com.cn>; Yuwei Chen <yuwei.c...@intel.com> 主题: Re: [PATCH 1/1] BaseTools: Update brotli to the latest upstream commit Hi! It's been over a month and it would be great if you could take a look at this, at least from a usability POV as more and more distros/operating systems upgrade their compilers to GCC 11. Thanks, Pedro On Fri, Oct 29, 2021 at 3:22 AM Pedro Falcato <pedro.falc...@gmail.com <mailto:pedro.falc...@gmail.com> > wrote: BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3417 This updates BaseTools's brotli submodule to the latest upstream, which fixes GCC 11's issue building BaseTools. Cc: Bob Feng <bob.c.f...@intel.com <mailto:bob.c.f...@intel.com> > Cc: Liming Gao <gaolim...@byosoft.com.cn <mailto:gaolim...@byosoft.com.cn> > Cc: Yuwei Chen <yuwei.c...@intel.com <mailto:yuwei.c...@intel.com> > Signed-off-by: Pedro Falcato <pedro.falc...@gmail.com <mailto:pedro.falc...@gmail.com> > --- BaseTools/Source/C/BrotliCompress/GNUmakefile | 7 +++++++ BaseTools/Source/C/BrotliCompress/Makefile | 12 +++++++++++- BaseTools/Source/C/BrotliCompress/brotli | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile index b150e5dd2bb9..79d7c405069d 100644 --- a/BaseTools/Source/C/BrotliCompress/GNUmakefile +++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile @@ -10,7 +10,11 @@ APPNAME = BrotliCompress OBJECTS = \ BrotliCompress.o \ + brotli/c/common/constants.o \ + brotli/c/common/context.o \ brotli/c/common/dictionary.o \ + brotli/c/common/platform.o \ + brotli/c/common/shared_dictionary.o \ brotli/c/common/transform.o \ brotli/c/dec/bit_reader.o \ brotli/c/dec/decode.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/command.o \ + brotli/c/enc/compound_dictionary.o \ brotli/c/enc/compress_fragment.o \ brotli/c/enc/compress_fragment_two_pass.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 038d1ec24226..0ed39d4b5a2c 100644 --- a/BaseTools/Source/C/BrotliCompress/Makefile +++ b/BaseTools/Source/C/BrotliCompress/Makefile @@ -13,7 +13,14 @@ 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 \ @@ -26,12 +33,15 @@ ENC_OBJ = \ brotli\c\enc\block_splitter.obj \ brotli\c\enc\brotli_bit_stream.obj \ brotli\c\enc\cluster.obj \ + brotli\c\enc\command.obj \ + brotli\c\enc\compound_dictionary.obj \ brotli\c\enc\compress_fragment.obj \ brotli\c\enc\compress_fragment_two_pass.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 666c3280cc11..62662f87cdd9 160000 --- a/BaseTools/Source/C/BrotliCompress/brotli +++ b/BaseTools/Source/C/BrotliCompress/brotli @@ -1 +1 @@ -Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d +Subproject commit 62662f87cdd96deda90ac817de94e3c4af75226a -- 2.33.1.windows.1 -- Pedro Falcato -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#84176): https://edk2.groups.io/g/devel/message/84176 Mute This Topic: https://groups.io/mt/87418698/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
