From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web09.10007.1643185823470655694 for ; Wed, 26 Jan 2022 00:30:23 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=NQcqe23s; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: bob.c.feng@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643185823; x=1674721823; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=JNkGjmCNrkrykKPeUgxuQ66yBNj19gBsTqeYPv9l6GA=; b=NQcqe23sm4jAHIfEL5PAraGUhw9yw2nF6BKuEJjPprYdEJxZ07PL9DHE H/LYjBUvrCcyCon9p0Xh9Xqq0YCmo2jv0YjFZwjF888HNEZrP5J0CCKTF ceX3p78xUYN2XPUt0ChUHZU8Ht0+nAdL48/SpAh2scUH7AsCNLkIFmk4N UOUe6Li4l1OG8ieBHU3ggLOx2HdvL46DZ4oJA18/26zLt629J5Hg40lyU plWe4YcAWc8xSEPZBT2S5kBFfc0WYEuTFBIdudIz/K1INjvjJZrC2N2Tx FfX+rGMeHHia8Tr9wndUWhg/oZenuJSwOeWojfQ8hYHzV7qtQJIrmBzba g==; X-IronPort-AV: E=McAfee;i="6200,9189,10238"; a="246450619" X-IronPort-AV: E=Sophos;i="5.88,317,1635231600"; d="scan'208";a="246450619" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2022 00:30:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,317,1635231600"; d="scan'208";a="628239132" Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.142]) by orsmga004.jf.intel.com with ESMTP; 26 Jan 2022 00:30:21 -0800 From: "Bob Feng" To: devel@edk2.groups.io Cc: Liming Gao , Yuwei Chen , Pedro Falcato Subject: [Patch 1/2] BaseTools: Update brotli submodule Date: Wed, 26 Jan 2022 16:30:14 +0800 Message-Id: <20220126083014.480-1-bob.c.feng@intel.com> X-Mailer: git-send-email 2.29.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3D3417 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 Cc: Liming Gao Cc: Yuwei Chen Cc: Pedro Falcato --- 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/Sour= ce/C/BrotliCompress/GNUmakefile index b150e5dd2b..fd8e05c0e6 100644 --- a/BaseTools/Source/C/BrotliCompress/GNUmakefile +++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile @@ -8,10 +8,17 @@ MAKEROOT ?=3D .. =0D APPNAME =3D BrotliCompress=0D =0D OBJECTS =3D \=0D BrotliCompress.o \=0D + brotli/c/common/platform.o \=0D + brotli/c/common/shared_dictionary.o \=0D + brotli/c/common/constants.o \=0D + brotli/c/common/context.o \=0D + brotli/c/enc/command.o \=0D + brotli/c/enc/compound_dictionary.o \=0D + brotli/c/enc/fast_log.o \=0D brotli/c/common/dictionary.o \=0D brotli/c/common/transform.o \=0D brotli/c/dec/bit_reader.o \=0D brotli/c/dec/decode.o \=0D brotli/c/dec/huffman.o \=0D 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 =3D $(CFLAGS) /W2 =0D APPNAME =3D BrotliCompress=0D =0D #LIBS =3D $(LIB_PATH)\Common.lib=0D =0D -COMMON_OBJ =3D brotli\c\common\dictionary.obj brotli\c\common\transform.ob= j=0D +COMMON_OBJ =3D \=0D + brotli\c\common\constants.obj \=0D + brotli\c\common\context.obj \=0D + brotli\c\common\dictionary.obj \=0D + brotli\c\common\platform.obj \=0D + brotli\c\common\shared_dictionary.obj \=0D + brotli\c\common\transform.obj=0D DEC_OBJ =3D \=0D brotli\c\dec\bit_reader.obj \=0D brotli\c\dec\decode.obj \=0D brotli\c\dec\huffman.obj \=0D brotli\c\dec\state.obj=0D ENC_OBJ =3D \=0D + brotli\c\enc\command.obj \=0D + brotli\c\enc\compound_dictionary.obj \=0D brotli\c\enc\backward_references.obj \=0D + brotli\c\enc\fast_log.obj \=0D brotli\c\enc\backward_references_hq.obj \=0D brotli\c\enc\bit_cost.obj \=0D brotli\c\enc\block_splitter.obj \=0D brotli\c\enc\brotli_bit_stream.obj \=0D brotli\c\enc\cluster.obj \=0D 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 --=20 2.29.1.windows.1