[folly,fizz,wangle,mvfst,proxygen,fbthrift] update to 2023.10.02.00 (#34218)

This commit is contained in:
Jia Yue Hua 2023-10-03 07:03:31 +08:00 committed by GitHub
parent 38dd6b15ad
commit 001e1d37a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 108 additions and 87 deletions

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2b69ad..84b2bf8 100644
index 5eea37c..145e5b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,22 +96,24 @@ endif ()
@@ -96,23 +96,25 @@ endif ()
# Find required dependencies for thrift/lib
if (THRIFT_LIB_ONLY OR build_all)
@ -22,6 +22,7 @@ index d2b69ad..84b2bf8 100644
+ elseif(TARGET zstd::libzstd_static)
+ set(ZSTD_LIBRARIES zstd::libzstd_static)
+ endif()
find_package(mvfst CONFIG REQUIRED)
# https://cmake.org/cmake/help/v3.9/module/FindThreads.html
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads)
@ -34,21 +35,23 @@ index d2b69ad..84b2bf8 100644
add_definitions("-DTHRIFT_HAVE_LIBSNAPPY=0")
if (THRIFT_LIB_ONLY)
diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in
index e1297ed..c7d9d59 100644
index 1d38221..ab96215 100644
--- a/thrift/cmake/FBThriftConfig.cmake.in
+++ b/thrift/cmake/FBThriftConfig.cmake.in
@@ -28,7 +28,14 @@ else()
@@ -28,8 +28,15 @@ else()
set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1")
endif()
-find_dependency(ZLIB REQUIRED)
-find_package(mvfst CONFIG REQUIRED)
+find_dependency(ZLIB)
+find_dependency(mvfst CONFIG)
+find_dependency(fizz CONFIG )
+find_dependency(fmt CONFIG )
+find_dependency(folly CONFIG )
+find_dependency(gflags CONFIG)
+find_dependency(glog CONFIG )
+find_dependency(wangle CONFIG )
+find_dependency(ZLIB)
+find_dependency(zstd CONFIG)
if (NOT TARGET FBThrift::thriftcpp2)

View File

@ -5,7 +5,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/fbthrift
REF "v${VERSION}"
SHA512 abba38b2451459f86735c010a9492875a70aa9935978a2032a7882b3d37a136c17bc7ffcd70aff617539e5602302df2957ba153f8fc8dcae866e9baf364261a2
SHA512 8730c2ecfeccf221e746df9f8e449d31934fd7e6f7861631d4c38e891cfc7b5ab07ffb48b56048031820f771966d6435bee2996738934bca9324548aeba5b30d
HEAD_REF master
PATCHES
fix-glog.patch
@ -38,6 +38,8 @@ file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/detail/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/debug_thrift_data_difference/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test"

View File

@ -1,6 +1,6 @@
{
"name": "fbthrift",
"version-string": "2023.07.03.00",
"version-string": "2023.10.02.00",
"description": "Facebook's branch of Apache Thrift, including a new C++ server.",
"homepage": "https://github.com/facebook/fbthrift",
"license": "Apache-2.0",
@ -17,6 +17,7 @@
"folly",
"gflags",
"glog",
"mvfst",
"openssl",
{
"name": "vcpkg-cmake",

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/fizz
REF "v${VERSION}"
SHA512 c7140b61529ee024e3c99e65d175acb8277fa7bc0090019188481b57c5253d8f5b96a01c28df4a1d00bae67e1f9079d409c2a7f526e933c7fe2f3c2a12fd92ac
SHA512 ff0dfe95640a24568a2950442576fbf4acd9a1dd354b7f7687cb1946cc2f896664e6e54b29ec051eccddb765bab276cb94c9920c724c4b4a5b1fc5f29c26e649
HEAD_REF master
PATCHES
0001-fix-libsodium.patch

View File

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

View File

@ -9,7 +9,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF "v${VERSION}"
SHA512 6e9433c65d91ff1af51b74e7153ce3d116484d6eb9cbe72747bad902bcb237fccffc35897c63ee3612fa633164b62884a94f511b7039112e2725851ad2719776
SHA512 406dbbd5a61a5b0713e7e6c7677be76392c21a5d702b051e72158513436ea9605afe616c5bc1405cb9455be1d1993990c9f2608284204210f41ffc2055e7831b
HEAD_REF main
PATCHES
reorder-glog-gflags.patch

View File

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

View File

@ -1,19 +1,19 @@
diff --git a/configure b/configure
index 2c2441b..620c443 100644
index 28f3eb0..b3ac6bc 100755
--- a/configure
+++ b/configure
@@ -20,7 +20,7 @@ for opt do
;;
--mandir=*) mandir="$optarg"
;;
@@ -36,7 +36,7 @@ for opt do
;;
--mandir=*) mandir="$optarg"
;;
- --datadir=*) datadir="$optarg"
+ --datarootdir=*) datadir="$optarg"
;;
--cc=*) cc="$optarg"
;;
@@ -28,10 +28,12 @@ for opt do
;;
--nolibc) liburing_nolibc="yes"
--cc=*) cc="$optarg"
;;
@@ -44,10 +44,12 @@ for opt do
;;
--nolibc) nolibc_deprecated
;;
+ --enable-shared) ENABLE_SHARED=1
+ ;;
@ -27,7 +27,7 @@ index 2c2441b..620c443 100644
;;
esac
done
@@ -130,6 +132,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak
@@ -146,6 +148,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak
printf "# Configured with:" >> $config_host_mak
printf " '%s'" "$0" "$@" >> $config_host_mak
echo >> $config_host_mak

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO axboe/liburing
REF "liburing-${VERSION}"
SHA512 0eda230e527e696189aa04c63f8c444bbfc2e5d2f6b1f2ac9454accdd0aa435979017b803d869c25c29a8575237bec25a8414940a09b6e1e971d84f7e8797506
SHA512 8033f813262472b695d15ce20cc6cbe76a5577f16bfa7e8bc2f21c7925ec831b0f2eaf135af721e80cccce9ebe7f4431148dba2e66fa5f0278be457d9aca6535
HEAD_REF master
PATCHES
fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED

View File

@ -1,7 +1,6 @@
{
"name": "liburing",
"version": "2.3",
"port-version": 1,
"version": "2.4",
"description": "Linux-native io_uring I/O access library",
"homepage": "https://github.com/axboe/liburing",
"license": "MIT OR LGPL-2.1 OR GPL-2.0",

View File

@ -1,13 +0,0 @@
diff --git a/quic/server/QuicServerWorker.cpp b/quic/server/QuicServerWorker.cpp
index 744cb81..ff3e559 100644
--- a/quic/server/QuicServerWorker.cpp
+++ b/quic/server/QuicServerWorker.cpp
@@ -692,7 +692,7 @@ PacketDropReason QuicServerWorker::isDstConnIdMisrouted(
"Dropping packet due to DCID parsing error={}, errorCode={},"
"routingInfo = {} ",
ex.what(),
- ex.errorCode(),
+ toString(ex.errorCode()),
logRoutingInfo(dstConnId));
// TODO do we need to reset?
return PacketDropReason::PARSE_ERROR_DCID;

View File

@ -1,11 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/mvfst
REF aeee9b372827cea28697755ea1f68bfc5288548a #2023-05-18
SHA512 feece3f05537b58270507d9423cc95fe577532997b857586aa49c2000516f3297c487696b659a35f194f0e970b8e84ff0c1a7446d4af7b400a2183704df995a2
REPO facebook/mvfst
REF "v${VERSION}"
SHA512 074ad8201e2c35b51bde0f8eaeb22bfe87af80fd9f3dc6c3de343b19d4b3d7738780a208d4719ee4fbd9d3f2f8a1a95b4858e8dc3fad16c26e4a859ecab75eca
HEAD_REF main
PATCHES
fix_format.patch
)
vcpkg_cmake_configure(

View File

@ -1,8 +1,8 @@
{
"name": "mvfst",
"version-date": "2023-05-18",
"version-string": "2023.10.02.00",
"description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.",
"homepage": "https://github.com/facebookincubator/mvfst",
"homepage": "https://github.com/facebook/mvfst",
"license": "MIT",
"supports": "!windows",
"dependencies": [

View File

@ -1,27 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bf0f17..343ec2b 100644
index 112b36b..30e466a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,13 +66,13 @@ endif()
#
# IMPORTANT: If you change this, make the analogous update in:
# cmake/proxygen-config.cmake.in
-find_package(fmt REQUIRED)
-find_package(folly REQUIRED)
-find_package(wangle REQUIRED)
@@ -69,7 +69,10 @@ endif()
find_package(fmt REQUIRED)
find_package(folly REQUIRED)
find_package(wangle REQUIRED)
-find_package(mvfst REQUIRED)
+find_package(fmt CONFIG REQUIRED)
+find_package(folly CONFIG REQUIRED)
+find_package(wangle CONFIG REQUIRED)
if (BUILD_QUIC)
- find_package(mvfst REQUIRED)
+ find_package(mvfst CONFIG REQUIRED)
else()
- find_package(Fizz REQUIRED)
+ find_package(fizz CONFIG REQUIRED)
endif()
+find_package(mvfst CONFIG REQUIRED)
find_package(zstd CONFIG REQUIRED)
find_package(ZLIB REQUIRED)
@@ -128,27 +128,8 @@ SET(GFLAG_DEPENDENCIES "")
find_package(OpenSSL REQUIRED)
@@ -124,27 +127,8 @@ SET(GFLAG_DEPENDENCIES "")
SET(PROXYGEN_EXTRA_LINK_LIBRARIES "")
SET(PROXYGEN_EXTRA_INCLUDE_DIRECTORIES "")
@ -52,24 +45,22 @@ index 6bf0f17..343ec2b 100644
include(ProxygenTest)
diff --git a/cmake/proxygen-config.cmake.in b/cmake/proxygen-config.cmake.in
index 8c1426d..f8b89a4 100644
index c79875d..0e002b9 100644
--- a/cmake/proxygen-config.cmake.in
+++ b/cmake/proxygen-config.cmake.in
@@ -17,19 +17,20 @@
@@ -17,17 +17,18 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
-find_dependency(fmt)
-find_dependency(folly)
-find_dependency(wangle)
-find_dependency(mvfst)
-find_dependency(Fizz)
+find_dependency(fmt CONFIG)
+find_dependency(folly CONFIG)
+find_dependency(wangle CONFIG)
if ("@BUILD_QUIC@")
- find_dependency(mvfst)
+ find_dependency(mvfst CONFIG)
endif()
-find_dependency(Fizz)
+find_dependency(mvfst CONFIG)
+find_dependency(fizz CONFIG)
+find_dependency(gflags CONFIG)
# For now, anything that depends on Proxygen has to copy its FindZstd.cmake

View File

@ -1,21 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea22eab..6bf0f17 100644
index 9bf6ec1..112b36b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ if (BUILD_QUIC)
else()
find_package(Fizz REQUIRED)
endif()
@@ -70,7 +70,7 @@ find_package(fmt REQUIRED)
find_package(folly REQUIRED)
find_package(wangle REQUIRED)
find_package(mvfst REQUIRED)
-find_package(Zstd REQUIRED)
+find_package(zstd CONFIG REQUIRED)
find_package(ZLIB REQUIRED)
find_package(OpenSSL REQUIRED)
find_package(Threads)
diff --git a/proxygen/lib/CMakeLists.txt b/proxygen/lib/CMakeLists.txt
index b3fa2d1..5c50ee1 100644
index ac5005f..fa403ab 100644
--- a/proxygen/lib/CMakeLists.txt
+++ b/proxygen/lib/CMakeLists.txt
@@ -235,10 +235,10 @@ target_link_libraries(
@@ -236,10 +236,10 @@ target_link_libraries(
Folly::folly
fizz::fizz
wangle::wangle

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/proxygen
REF "v${VERSION}"
SHA512 e4f9af0092e810455f029bbd0b6abc152ac90742f88f75f49722bbb99427fb752429852f97d7c15c158d3ef007981bf37a0f61fa7855f1662c19af95bd39307c
SHA512 83b294895878c556b855688a78da524d7034a6dc4f1ed9c2b0e73a1bad55df2c4aae94921eb45e173ac0b53ed3ee885194caf37f0dff442f5a343701e4c0ccd8
HEAD_REF master
PATCHES
remove-register.patch
@ -29,4 +29,8 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -1,6 +1,6 @@
{
"name": "proxygen",
"version-string": "2023.07.03.00",
"version-string": "2023.10.02.00",
"description": "It comprises the core C++ HTTP abstractions used at Facebook.",
"homepage": "https://github.com/facebook/proxygen",
"license": "BSD-3-Clause",
@ -21,6 +21,7 @@
"name": "gperf",
"host": true
},
"mvfst",
"openssl",
{
"name": "vcpkg-cmake",

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "wangle",
"version-string": "2023.07.03.00",
"version-string": "2023.10.02.00",
"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",
"license": "Apache-2.0",

View File

@ -2513,7 +2513,7 @@
"port-version": 0
},
"fbthrift": {
"baseline": "2023.07.03.00",
"baseline": "2023.10.02.00",
"port-version": 0
},
"fcl": {
@ -2557,7 +2557,7 @@
"port-version": 0
},
"fizz": {
"baseline": "2023.07.03.00",
"baseline": "2023.10.02.00",
"port-version": 0
},
"flann": {
@ -2637,7 +2637,7 @@
"port-version": 0
},
"folly": {
"baseline": "2023.07.03.00",
"baseline": "2023.10.02.00",
"port-version": 0
},
"font-chef": {
@ -4813,8 +4813,8 @@
"port-version": 0
},
"liburing": {
"baseline": "2.3",
"port-version": 1
"baseline": "2.4",
"port-version": 0
},
"libusb": {
"baseline": "1.0.26.11791",
@ -5649,7 +5649,7 @@
"port-version": 6
},
"mvfst": {
"baseline": "2023-05-18",
"baseline": "2023.10.02.00",
"port-version": 0
},
"mygui": {
@ -6621,7 +6621,7 @@
"port-version": 0
},
"proxygen": {
"baseline": "2023.07.03.00",
"baseline": "2023.10.02.00",
"port-version": 0
},
"psimd": {
@ -8765,7 +8765,7 @@
"port-version": 5
},
"wangle": {
"baseline": "2023.07.03.00",
"baseline": "2023.10.02.00",
"port-version": 0
},
"wasmedge": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "80891c5a004015fd7a5c4334de145c92474f2cec",
"version-string": "2023.10.02.00",
"port-version": 0
},
{
"git-tree": "c2384982312ce0a1ee08ff0da69ff562e3690ffe",
"version-string": "2023.07.03.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1d8026070e16e8f91275e5f97699bfd5452166d4",
"version-string": "2023.10.02.00",
"port-version": 0
},
{
"git-tree": "813216afa42f8549aac52519655ab62f8d552c64",
"version-string": "2023.07.03.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a909b9222ac4ded463976431d65b6b24fa486bd3",
"version-string": "2023.10.02.00",
"port-version": 0
},
{
"git-tree": "16c4e4b0e25b9eb99d5a4b17de525a42a1ecdf48",
"version-string": "2023.07.03.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "317cfa2c23f9e0e285b1c36140cdb54739ebf328",
"version": "2.4",
"port-version": 0
},
{
"git-tree": "c51f4ef4488799a1c1389216ea8f7cec8be14b62",
"version": "2.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "082167d3253fd7af5973a5e970a407c117702841",
"version-string": "2023.10.02.00",
"port-version": 0
},
{
"git-tree": "345723d54eef6854daed66dedae0b9d4ead2f9a4",
"version-date": "2023-05-18",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "193a933153e2cfab49dd265a48ebeb650a9107e4",
"version-string": "2023.10.02.00",
"port-version": 0
},
{
"git-tree": "9c24a9089256797b853fdf56833eafa213a51f2d",
"version-string": "2023.07.03.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ff239f5d33f181256ff31bbb5cfc0bdc7329937c",
"version-string": "2023.10.02.00",
"port-version": 0
},
{
"git-tree": "105b20279ba475028db9848e6acc0950843e103c",
"version-string": "2023.07.03.00",