[folly related] update to 11.18 (#42314)

This commit is contained in:
c8ef 2024-11-23 07:25:12 +08:00 committed by GitHub
parent c555ea55d2
commit f1ed59e966
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 48 additions and 32 deletions

View File

@ -1,13 +0,0 @@
diff --git a/thrift/compiler/compiler.cc b/thrift/compiler/compiler.cc
index 5e24fd6853f..8c7985e3c11 100644
--- a/thrift/compiler/compiler.cc
+++ b/thrift/compiler/compiler.cc
@@ -734,7 +734,7 @@ std::unique_ptr<t_program_bundle> parse_and_mutate(
const parsing_params& pparams,
const gen_params& gparams) {
auto found_or_error = source_manager::path_or_error();
- if (bundle_annotations()) {
+ if constexpr (bundle_annotations()) {
const std::string scope_path = "thrift/annotation/scope.thrift";
found_or_error = source_mgr.find_include_file(
scope_path, input_filename, pparams.incl_searchpath);

View File

@ -2,11 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/fbthrift REPO facebook/fbthrift
REF "v${VERSION}" REF "v${VERSION}"
SHA512 4d97e58534e29b9a9cd9c4331d1d1a4a47a58ccd6de75514a010ac7b01696d37dc09c022b10d7d939312cca9c87f1d3586b58355e5ae41812e7f147240594303 SHA512 94873a1b07a71d62ce91d30b247bc7c00e71c9da3a3346d4f749f24a54641c22feb7ae7927144fc10008b274ea7728f83532bc45fc583a8bc42b479232a7b6c5
HEAD_REF main HEAD_REF main
PATCHES PATCHES
fix-deps.patch fix-deps.patch
fix-annotation.patch
) )
file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake") file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake")

View File

@ -1,6 +1,6 @@
{ {
"name": "fbthrift", "name": "fbthrift",
"version-string": "2024.11.11.00", "version-string": "2024.11.18.00",
"description": "Facebook's branch of Apache Thrift, including a new C++ server.", "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
"homepage": "https://github.com/facebook/fbthrift", "homepage": "https://github.com/facebook/fbthrift",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/fizz REPO facebookincubator/fizz
REF "v${VERSION}" REF "v${VERSION}"
SHA512 fbfad920a1bef043409e0d76232f8dbaf6b2e8e3272fd05237dbca36549f966c11693e6b46ca3195eebd852009b43c9534ef03331bdce580db5fd1d6a5637e20 SHA512 5168421ab92ac54c50c087c09ff4ae6e19917e73ff074595466ca09db297d1aaf8f6afabe349c65e1f29ce87e359a2ffc6155c568252090803a781d6af231a4c
HEAD_REF main HEAD_REF main
PATCHES PATCHES
fix-build.patch fix-build.patch

View File

@ -1,6 +1,6 @@
{ {
"name": "fizz", "name": "fizz",
"version-string": "2024.11.11.00", "version-string": "2024.11.18.00",
"description": "a TLS 1.3 implementation by Facebook", "description": "a TLS 1.3 implementation by Facebook",
"homepage": "https://github.com/facebookincubator/fizz", "homepage": "https://github.com/facebookincubator/fizz",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

View File

@ -9,7 +9,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly REPO facebook/folly
REF "v${VERSION}" REF "v${VERSION}"
SHA512 c57a1e7ea1a40180f2ec4b56a8312621e14b73fddd13c71d6e3fa1164156c1a4a9f151adae8a502949891192f306ee9dad56f9790082679aa82d101f8a0ddc9d SHA512 3331320e0e82eb19329eddcf5cd15ab54470352d8ec45087bd4e32d568f77a2ef68161f98bf8ad5b16253380313f82591e73987f8060017ee45b2457ac2f8b44
HEAD_REF main HEAD_REF main
PATCHES PATCHES
disable-non-underscore-posix-names.patch disable-non-underscore-posix-names.patch

View File

@ -1,6 +1,6 @@
{ {
"name": "folly", "name": "folly",
"version-string": "2024.11.11.00", "version-string": "2024.11.18.00",
"description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
"homepage": "https://github.com/facebook/folly", "homepage": "https://github.com/facebook/folly",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/mvfst REPO facebook/mvfst
REF "v${VERSION}" REF "v${VERSION}"
SHA512 f64620cb874bc6e3587e14905ac306f273a20b95424dd61420c159671cfb4df45553ed9ef33e19a7bc74e015b9c69b668d458c825d60d3cf5fce39fef1b6ba45 SHA512 662a86f4b1b1d60f05c9198687c668e334061d00109148d3cd4643fc10c38c7bf2810fbb6fa1d01a25847e36c54a6cc2f6fb9e1405923f6a376be50f44252b29
HEAD_REF main HEAD_REF main
) )

View File

@ -1,6 +1,6 @@
{ {
"name": "mvfst", "name": "mvfst",
"version-string": "2024.11.11.00", "version-string": "2024.11.18.00",
"description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.",
"homepage": "https://github.com/facebook/mvfst", "homepage": "https://github.com/facebook/mvfst",
"license": "MIT", "license": "MIT",

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/proxygen REPO facebook/proxygen
REF "v${VERSION}" REF "v${VERSION}"
SHA512 9a9850cda195d1968c900abeec8e191e65406276ec81f10cdb0d39942a609440a4ecefaa9fc38e5575ee8d0b5d338a53996c6b76bd38d0a812ac2b22e0eb2077 SHA512 a8fad342016dea2cd2c2e83f474bd4928643de1207b819afb8bd67bbb83551afa437f87d90040f84a12191c553c09e5bb181a920016f60713883918372599c39
HEAD_REF main HEAD_REF main
PATCHES PATCHES
remove-register.patch remove-register.patch

View File

@ -1,6 +1,6 @@
{ {
"name": "proxygen", "name": "proxygen",
"version-string": "2024.11.11.00", "version-string": "2024.11.18.00",
"description": "It comprises the core C++ HTTP abstractions used at Facebook.", "description": "It comprises the core C++ HTTP abstractions used at Facebook.",
"homepage": "https://github.com/facebook/proxygen", "homepage": "https://github.com/facebook/proxygen",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/wangle REPO facebook/wangle
REF "v${VERSION}" REF "v${VERSION}"
SHA512 62151bc1894e0fab4c43135587612d3fcbd0b0f299640eb3c36be728fd7469c950fa71f20d4754208acb86d817142437abd79ba043cfafd13cf9e5a414e9c0d4 SHA512 cb45ff0c5b384f98b976cff240e1077c00c392007507cbf2e321e0b1a39d6cedc273a4bf172d529967aedf0abd0de6a3861ea724f8b1f8f31a9344da9cf0374e
HEAD_REF main HEAD_REF main
PATCHES PATCHES
fix-config-cmake.patch fix-config-cmake.patch

View File

@ -1,6 +1,6 @@
{ {
"name": "wangle", "name": "wangle",
"version-string": "2024.11.11.00", "version-string": "2024.11.18.00",
"description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.",
"homepage": "https://github.com/facebook/wangle", "homepage": "https://github.com/facebook/wangle",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@ -2737,7 +2737,7 @@
"port-version": 1 "port-version": 1
}, },
"fbthrift": { "fbthrift": {
"baseline": "2024.11.11.00", "baseline": "2024.11.18.00",
"port-version": 0 "port-version": 0
}, },
"fcl": { "fcl": {
@ -2789,7 +2789,7 @@
"port-version": 0 "port-version": 0
}, },
"fizz": { "fizz": {
"baseline": "2024.11.11.00", "baseline": "2024.11.18.00",
"port-version": 0 "port-version": 0
}, },
"flagpp": { "flagpp": {
@ -2873,7 +2873,7 @@
"port-version": 1 "port-version": 1
}, },
"folly": { "folly": {
"baseline": "2024.11.11.00", "baseline": "2024.11.18.00",
"port-version": 0 "port-version": 0
}, },
"font-chef": { "font-chef": {
@ -6197,7 +6197,7 @@
"port-version": 7 "port-version": 7
}, },
"mvfst": { "mvfst": {
"baseline": "2024.11.11.00", "baseline": "2024.11.18.00",
"port-version": 0 "port-version": 0
}, },
"mygui": { "mygui": {
@ -7237,7 +7237,7 @@
"port-version": 0 "port-version": 0
}, },
"proxygen": { "proxygen": {
"baseline": "2024.11.11.00", "baseline": "2024.11.18.00",
"port-version": 0 "port-version": 0
}, },
"psimd": { "psimd": {
@ -9573,7 +9573,7 @@
"port-version": 5 "port-version": 5
}, },
"wangle": { "wangle": {
"baseline": "2024.11.11.00", "baseline": "2024.11.18.00",
"port-version": 0 "port-version": 0
}, },
"wasmedge": { "wasmedge": {

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "6a85b5e10e213e480d71912a236443ec0be07de4",
"version-string": "2024.11.18.00",
"port-version": 0
},
{ {
"git-tree": "82e7be9f4ae312bce9371f323e0b72c6423e80c1", "git-tree": "82e7be9f4ae312bce9371f323e0b72c6423e80c1",
"version-string": "2024.11.11.00", "version-string": "2024.11.11.00",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "bcea99722328dbfc6f8b862c828e36a3cc85f677",
"version-string": "2024.11.18.00",
"port-version": 0
},
{ {
"git-tree": "7a0c3a2ac5d3a5a474ae9620665b38bc46751a3a", "git-tree": "7a0c3a2ac5d3a5a474ae9620665b38bc46751a3a",
"version-string": "2024.11.11.00", "version-string": "2024.11.11.00",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "d818cb28a5c43346a41adcafe1646dc110b85f85",
"version-string": "2024.11.18.00",
"port-version": 0
},
{ {
"git-tree": "a189d29fa63323f9d159f93e5d121c608b7bc79a", "git-tree": "a189d29fa63323f9d159f93e5d121c608b7bc79a",
"version-string": "2024.11.11.00", "version-string": "2024.11.11.00",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "7c74f72c1132fa28593555c7ae8b23874d3a891d",
"version-string": "2024.11.18.00",
"port-version": 0
},
{ {
"git-tree": "6d9c29cbf191688e2c21a1a753ab9009c966bb3f", "git-tree": "6d9c29cbf191688e2c21a1a753ab9009c966bb3f",
"version-string": "2024.11.11.00", "version-string": "2024.11.11.00",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "8b544728cb9b64a01240ebcff3d64e701db39da9",
"version-string": "2024.11.18.00",
"port-version": 0
},
{ {
"git-tree": "25ddd2355bb9e07e9e5d743c3d4215b2e67ecbf9", "git-tree": "25ddd2355bb9e07e9e5d743c3d4215b2e67ecbf9",
"version-string": "2024.11.11.00", "version-string": "2024.11.11.00",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "5d1e30f1c6de18d11efbd3c06864e80014707e30",
"version-string": "2024.11.18.00",
"port-version": 0
},
{ {
"git-tree": "fce5e17f6ccc1162fc06273308167a9b3df3bec8", "git-tree": "fce5e17f6ccc1162fc06273308167a9b3df3bec8",
"version-string": "2024.11.11.00", "version-string": "2024.11.11.00",