From: "Bob Feng" <bob.c.feng@intel.com>
To: devel@edk2.groups.io
Cc: Liming Gao <gaoliming@byosoft.com.cn>,
Yuwei Chen <yuwei.chen@intel.com>,
Pedro Falcato <pedro.falcato@gmail.com>
Subject: [Patch 1/2] BaseTools: Update brotli submodule
Date: Wed, 26 Jan 2022 16:30:14 +0800 [thread overview]
Message-ID: <20220126083014.480-1-bob.c.feng@intel.com> (raw)
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
next reply other threads:[~2022-01-26 8:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-26 8:30 Bob Feng [this message]
2022-01-27 1:12 ` 回复: [Patch 1/2] BaseTools: Update brotli submodule gaoliming
2022-01-27 2:23 ` [edk2-devel] " Bob Feng
[not found] ` <16CDFF5EEB5C1060.24088@groups.io>
2022-02-10 6:44 ` Bob Feng
2022-02-10 7:58 ` 回复: " gaoliming
2022-02-10 10:15 ` Bob Feng
2022-02-10 16:43 ` Michael D Kinney
2022-02-11 1:28 ` Bob Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220126083014.480-1-bob.c.feng@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox