回复: [edk2-devel] [PATCH] Updating brotli submodules to build with GCC 11.

["gaoliming" <gaoliming@byosoft.com.cn>]

Garcia:
 PR https://github.com/tianocore/edk2/pull/2514 has been created for this
change. 
 
 But now, CI meets with the problem. This change is not merged. Some people
is investigating CI issue. 

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Leonardo
> Garcia
> 发送时间: 2022年2月14日 20:28
> 收件人: devel@edk2.groups.io
> 抄送: bob.c.feng@intel.com; gaoliming@byosoft.com.cn;
> yuwei.chen@intel.com; jian.j.wang@intel.com; Leonardo Garcia
> <leonardo.garcia@linaro.org>
> 主题: [edk2-devel] [PATCH] Updating brotli submodules to build with GCC
11.
> 
> From: Leonardo Garcia <leonardo.garcia@linaro.org>
> 
> GCC 11.1.0 introduced a new warning for variable length arrays as
> parameters (vla-parameter). Brotli compression library had issues with
> this which were fixed upstream by commits
> 0a3944c8c99b8d10cc4325f721b7c273d2b41f7b and
> 27dd7265403d8e8fed99a854b9c3e1db7d79525f in brotli repository. Updating
> edk2 submodules to have these commits. While at it, adding two more
> commits from the brotli repository to make it compatible with future
> versions of python as well.
> 
> The addition of new commits to the brotli tree made it necessary to add
> more files to the build process of the brotli compression library in
> BaseTools package.
> 
> Signed-off-by: Leonardo Garcia <leonardo.garcia@linaro.org>
> ---
>  BaseTools/Source/C/BrotliCompress/GNUmakefile         | 9 ++++++++-
>  BaseTools/Source/C/BrotliCompress/brotli              | 2 +-
>  MdeModulePkg/Library/BrotliCustomDecompressLib/brotli | 2 +-
>  3 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/BaseTools/Source/C/BrotliCompress/GNUmakefile
> b/BaseTools/Source/C/BrotliCompress/GNUmakefile
> index b150e5dd2b..0e73f8b2ce 100644
> --- a/BaseTools/Source/C/BrotliCompress/GNUmakefile
> +++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile
> @@ -12,6 +12,10 @@ OBJECTS = \
>    BrotliCompress.o \
> 
>    brotli/c/common/dictionary.o \
> 
>    brotli/c/common/transform.o \
> 
> +  brotli/c/common/platform.o \
> 
> +  brotli/c/common/context.o \
> 
> +  brotli/c/common/constants.o \
> 
> +  brotli/c/common/shared_dictionary.o \
> 
>    brotli/c/dec/bit_reader.o \
> 
>    brotli/c/dec/decode.o \
> 
>    brotli/c/dec/huffman.o \
> 
> @@ -33,7 +37,10 @@ OBJECTS = \
>    brotli/c/enc/memory.o \
> 
>    brotli/c/enc/metablock.o \
> 
>    brotli/c/enc/static_dict.o \
> 
> -  brotli/c/enc/utf8_util.o
> 
> +  brotli/c/enc/utf8_util.o \
> 
> +  brotli/c/enc/command.o \
> 
> +  brotli/c/enc/fast_log.o \
> 
> +  brotli/c/enc/compound_dictionary.o
> 
> 
> 
>  include $(MAKEROOT)/Makefiles/app.makefile
> 
> 
> 
> 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
> diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
> b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
> index 666c3280cc..f4153a09f8 160000
> --- a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
> +++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
> @@ -1 +1 @@
> -Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d
> +Subproject commit f4153a09f87cbb9c826d8fc12c74642bb2d879ea
> --
> 2.34.1
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#86656): https://edk2.groups.io/g/devel/message/86656
> Mute This Topic: https://groups.io/mt/89143163/4905953
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [gaoliming@byosoft.com.cn]
> -=-=-=-=-=-=
>