[folly related] update to 09.09 (#40920)

2024-09-13 03:15:53 +08:00 · 2024-09-13 03:15:53 +08:00 · 4ed2466fe0
parent b36a416ddd
commit 4ed2466fe0
20 changed files with 59 additions and 33 deletions
--- a/ports/fbthrift/portfile.cmake
+++ b/ports/fbthrift/portfile.cmake
@ -2,7 +2,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/fbthrift
    REF "v${VERSION}"
-    SHA512 8ad405815257d670d143c83ae06591f1c97f05c0a07100d8b2e1e8a3ed4b8665659a01fc9f0eed53e57d32515d048308431151b7d00c2fc33c4be8e808ddb1bb
+    SHA512 10ee7740d8bbedc06f0156b563cd12ab2e650c22323692b90b8da90a09cede276a0b061328dccff32c4fe08b5bc8fa39a5f08afe1bd5128734c31076efcf8c8c
    HEAD_REF main
    PATCHES 
        fix-glog.patch
@ -34,8 +34,10 @@ file(REMOVE_RECURSE
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/detail/test"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/folly_dynamic/test"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/patch/test"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/detail/test"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/tool"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/runtime/test"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test"
--- a/ports/fbthrift/vcpkg.json
+++ b/ports/fbthrift/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "fbthrift",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.00",
  "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
  "homepage": "https://github.com/facebook/fbthrift",
  "license": "Apache-2.0",
--- a/ports/fizz/fix-build.patch
+++ b/ports/fizz/fix-build.patch
@ -1,20 +1,17 @@
 diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
-index 32f310cd..f8a19b58 100644
+index c60177c..f9432ec 100644
 --- a/fizz/CMakeLists.txt
 +++ b/fizz/CMakeLists.txt
-@@ -50,53 +50,32 @@ find_package(folly CONFIG REQUIRED)
+@@ -50,7 +50,7 @@ find_package(folly CONFIG REQUIRED)
 find_package(fmt CONFIG REQUIRED)
 
 find_package(OpenSSL REQUIRED)
 -find_package(Glog REQUIRED)
-find_package(DoubleConversion REQUIRED)
 +find_package(glog CONFIG REQUIRED)
-+find_package(double-conversion CONFIG REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Zstd REQUIRED)
+ find_package(Zstd REQUIRED)
 if (UNIX AND NOT APPLE)
-   find_package(Librt)
- endif()
+@@ -59,43 +59,23 @@ endif()
 
 include(CheckAtomic)
 
@ -66,7 +63,7 @@ index 32f310cd..f8a19b58 100644
 
 find_package(liboqs CONFIG)
 if (liboqs_FOUND)
-@@ -277,30 +256,25 @@ target_include_directories(
+@@ -193,28 +173,24 @@ target_include_directories(
     $<BUILD_INTERFACE:${FIZZ_BASE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/generated>
     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
@ -77,7 +74,6 @@ index 32f310cd..f8a19b58 100644
   PRIVATE
 -    ${GLOG_INCLUDE_DIRS}
     ${FIZZ_INCLUDE_DIRECTORIES}
-    ${DOUBLE_CONVERSION_INCLUDE_DIR}
 )
 
 
@ -99,13 +95,11 @@ index 32f310cd..f8a19b58 100644
 +    glog::glog
 +    gflags::gflags
     ${FIZZ_LINK_LIBRARIES}
-    ${DOUBLE_CONVERSION_LIBRARY}
 +    libevent::core
-+    double-conversion::double-conversion
     ${CMAKE_DL_LIBS}
     ${LIBRT_LIBRARIES})
 
-@@ -361,8 +335,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
+@@ -279,8 +255,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
 SET(FIZZ_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 
 if(BUILD_TESTS)
@ -115,7 +109,7 @@ index 32f310cd..f8a19b58 100644
 endif()
 
 add_library(fizz_test_support
-@@ -398,14 +371,12 @@ macro(add_gtest test_source test_name)
+@@ -317,14 +292,12 @@ macro(add_gtest test_source test_name)
   add_executable(${test_name} ${test_source} test/CMakeTestMain.cpp)
 
   set_property(TARGET ${test_name} PROPERTY ENABLE_EXPORTS true)
@ -133,10 +127,10 @@ index 32f310cd..f8a19b58 100644
   if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
     # GMOCK_MOCK_METHOD() will complain otherwise
 diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
-index bace1609..51251ea2 100644
+index 9d07110..a47bb99 100644
 --- a/fizz/cmake/fizz-config.cmake.in
 +++ b/fizz/cmake/fizz-config.cmake.in
-@@ -29,9 +29,18 @@ set(FIZZ_LIBRARIES fizz::fizz)
+@@ -31,9 +31,18 @@ set(FIZZ_LIBRARIES fizz::fizz)
 
 include(CMakeFindDependencyMacro)
 
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/portfile.cmake
@ -4,7 +4,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebookincubator/fizz
    REF "v${VERSION}"
-    SHA512 68efc3709a72eff2e2a8528a1c57e3980319a812730de9ce88c70b33a19abf8f28fbb8ef4c10264fe8232fca48a0ce24e40d66a0fce0b9f234d5625daf0dbf55
+    SHA512 ab9ce79c5f7dd2358a95e6842aa8e5c5410e7608f1aecfd2a19902a14fcc207a99207a7c3637d58f7ba07217a33db4c7abdd2f20de9e300390cb54c927f091af
    HEAD_REF main
    PATCHES
        fix-build.patch
--- a/ports/fizz/vcpkg.json
+++ b/ports/fizz/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "fizz",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.00",
  "description": "a TLS 1.3 implementation by Facebook",
  "homepage": "https://github.com/facebookincubator/fizz",
  "license": "BSD-3-Clause",
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@ -9,7 +9,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/folly
    REF "v${VERSION}"
-    SHA512 0d27bc460de66c7bf975c33fa7bbd572324b0aa49427a53cd04610ccdcb72874abb10778de256fb136164133d90589b6b1bffa2aa8aa9dc4046ac97473064591
+    SHA512 78797f1383fb45cdb26977f19945d84fdf5056ba2156c47e0176fa7e3d5d0e7c7b61f1efbf98b09a45cad8826d931fcfdb26641f2d0065c6b6a601e9c8cc03f7
    HEAD_REF main
    PATCHES
        disable-non-underscore-posix-names.patch
--- a/ports/folly/vcpkg.json
+++ b/ports/folly/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "folly",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.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",
--- a/ports/mvfst/portfile.cmake
+++ b/ports/mvfst/portfile.cmake
@ -2,7 +2,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/mvfst
    REF "v${VERSION}"
-    SHA512 288ebb0419910b668cdbd493512516e4e9c34770fc009442d2658651f5bc584bf9c968304b59ed82067746d8eff225bc6bd2f61fa1fd42e8cf052e0d6df51130
+    SHA512 9622d7a59c2d6c8fd6c5c7da48cdaa437905bfedb9035d12f8e9281f5d853048faf84588d4d11db4d8215f3c9f2f4344e707f39eda09fe561fcf827789efa33a
    HEAD_REF main
 )

--- a/ports/mvfst/vcpkg.json
+++ b/ports/mvfst/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "mvfst",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.00",
  "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",
  "license": "MIT",
--- a/ports/proxygen/portfile.cmake
+++ b/ports/proxygen/portfile.cmake
@ -2,7 +2,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/proxygen
    REF "v${VERSION}"
-    SHA512 598e4e170398c6a95ef4ab4f8826b716b74177f59f047d85427a53d2e51608c92d8130876c50cd51110f35a6fb4ad8b2969ee0ce64e94bcac808cec3ae0fc88f
+    SHA512 b4160ece2d4c674cf4ca6a2ec97d0cfdbd3acf79fbdf7ef0e9fb05cf7605a26a19fe0d9235d83492223cfb36d5c6d05474b9e3fb06978041db5bd0eadaa01ca3
    HEAD_REF main
    PATCHES
        remove-register.patch
--- a/ports/proxygen/vcpkg.json
+++ b/ports/proxygen/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "proxygen",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.00",
  "description": "It comprises the core C++ HTTP abstractions used at Facebook.",
  "homepage": "https://github.com/facebook/proxygen",
  "license": "BSD-3-Clause",
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@ -4,7 +4,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/wangle
    REF "v${VERSION}"
-    SHA512 5dbe55570144feade8e731b7a8c7c3d72bcc017545362efd69a9c96918f970a729bcc9893088e028d4d412a24f45c076dd62e53b5b6d6da06c22716ea216c2fe
+    SHA512 d63c1e128ada851cce874a6d37b480a0c1fff0a1f22fbe268b27168ef117100814b481b0dc4e7ef9208025c37dc73f4b9fe5d61bc2c261ec992362c3436a4efa
    HEAD_REF main
    PATCHES
        fix-config-cmake.patch
--- a/ports/wangle/vcpkg.json
+++ b/ports/wangle/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "wangle",
-  "version-string": "2024.09.02.00",
+  "version-string": "2024.09.09.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",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2705,7 +2705,7 @@
      "port-version": 1
    },
    "fbthrift": {
-      "baseline": "2024.09.02.00",
+      "baseline": "2024.09.09.00",
      "port-version": 0
    },
    "fcl": {
@ -2753,7 +2753,7 @@
      "port-version": 0
    },
    "fizz": {
-      "baseline": "2024.09.02.00",
+      "baseline": "2024.09.09.00",
      "port-version": 0
    },
    "flagpp": {
@ -2837,7 +2837,7 @@
      "port-version": 0
    },
    "folly": {
-      "baseline": "2024.09.02.00",
+      "baseline": "2024.09.09.00",
      "port-version": 0
    },
    "font-chef": {
@ -6121,7 +6121,7 @@
      "port-version": 7
    },
    "mvfst": {
-      "baseline": "2024.09.02.00",
+      "baseline": "2024.09.09.00",
      "port-version": 0
    },
    "mygui": {
@ -7169,7 +7169,7 @@
      "port-version": 0
    },
    "proxygen": {
-      "baseline": "2024.09.02.00",
+      "baseline": "2024.09.09.00",
      "port-version": 0
    },
    "psimd": {
@ -9477,7 +9477,7 @@
      "port-version": 5
    },
    "wangle": {
-      "baseline": "2024.09.02.00",
+      "baseline": "2024.09.09.00",
      "port-version": 0
    },
    "wasmedge": {
--- a/versions/f-/fbthrift.json
+++ b/versions/f-/fbthrift.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2dd6a3dfab0e06b4887aaab2b1896fd5660d231d",
+      "version-string": "2024.09.09.00",
+      "port-version": 0
+    },
    {
      "git-tree": "fbab3b045b008e9db45462ed1cdfb45c097ed659",
      "version-string": "2024.09.02.00",
--- a/versions/f-/fizz.json
+++ b/versions/f-/fizz.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "ec904b8256271917e3480f318c152a09ac55c8be",
+      "version-string": "2024.09.09.00",
+      "port-version": 0
+    },
    {
      "git-tree": "bab275f847642bc0057f4f176df9ac11b440ef91",
      "version-string": "2024.09.02.00",
--- a/versions/f-/folly.json
+++ b/versions/f-/folly.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "3ad6474b38bcc82fbe6308e6f9b1b3b7574c731a",
+      "version-string": "2024.09.09.00",
+      "port-version": 0
+    },
    {
      "git-tree": "fd1f6b565af8aa31c33469136f82beebe0e60dc5",
      "version-string": "2024.09.02.00",
--- a/versions/m-/mvfst.json
+++ b/versions/m-/mvfst.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "f34fdaf5e85ffcccb3a94f386a54939467246d14",
+      "version-string": "2024.09.09.00",
+      "port-version": 0
+    },
    {
      "git-tree": "1a3749554e863acb8b58a27c5528f9ceb08fe059",
      "version-string": "2024.09.02.00",
--- a/versions/p-/proxygen.json
+++ b/versions/p-/proxygen.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "939dbe5a70e09d4b57806d3c1362cf459a3ee1ae",
+      "version-string": "2024.09.09.00",
+      "port-version": 0
+    },
    {
      "git-tree": "fe9fba5e78442c50e32bf3c65f07b712b8e94a7f",
      "version-string": "2024.09.02.00",
--- a/versions/w-/wangle.json
+++ b/versions/w-/wangle.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "9f52e52bad681c510e408e3a62c6cf96d300e1bf",
+      "version-string": "2024.09.09.00",
+      "port-version": 0
+    },
    {
      "git-tree": "24b95da00b642b65da6a4a35ddda85867d146362",
      "version-string": "2024.09.02.00",