Update protobuf submodule (#10801)

This commit is contained in:
Changming Sun 2022-03-09 09:37:58 -08:00 committed by GitHub
parent 58521fb822
commit cc6bc34c8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions

View file

@ -334,7 +334,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "2dc747c574b68a808ea4699d26942c8132fe2b09",
"commitHash": "0dab03ba7bc438d7ba3eac2b2c1eb39ed520f928",
"repositoryUrl": "https://github.com/protocolbuffers/protobuf.git"
},
"comments": "git submodule at cmake/external/protobuf"

@ -1 +1 @@
Subproject commit 2dc747c574b68a808ea4699d26942c8132fe2b09
Subproject commit 0dab03ba7bc438d7ba3eac2b2c1eb39ed520f928

View file

@ -82,9 +82,9 @@ unzip /tmp/src/gradle-6.3-bin.zip
mv /tmp/src/gradle-6.3 /usr/local/gradle
if ! [ -x "$(command -v protoc)" ]; then
GetFile https://github.com/protocolbuffers/protobuf/archive/v3.16.0.tar.gz /tmp/src/v3.16.0.tar.gz
tar -xf /tmp/src/v3.16.0.tar.gz -C /tmp/src
cd /tmp/src/protobuf-3.16.0
GetFile https://github.com/protocolbuffers/protobuf/archive/v3.18.1.tar.gz /tmp/src/v3.18.1.tar.gz
tar -xf /tmp/src/v3.18.1.tar.gz -C /tmp/src
cd /tmp/src/protobuf-3.18.1
cmake ./cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Relwithdebinfo -DCMAKE_INSTALL_LIBDIR=lib64
make -j$(getconf _NPROCESSORS_ONLN)
make install

View file

@ -34,9 +34,9 @@ function GetFile {
return $?
}
GetFile https://github.com/protocolbuffers/protobuf/archive/v3.16.0.tar.gz /tmp/src/v3.16.0.tar.gz
tar -xf /tmp/src/v3.16.0.tar.gz -C /tmp/src
cd /tmp/src/protobuf-3.16.0
GetFile https://github.com/protocolbuffers/protobuf/archive/v3.18.1.tar.gz /tmp/src/v3.18.1.tar.gz
tar -xf /tmp/src/v3.18.1.tar.gz -C /tmp/src
cd /tmp/src/protobuf-3.18.1
cmake ./cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Relwithdebinfo
make -j$(getconf _NPROCESSORS_ONLN)
make install