[folly related] update to 10.07 (#41480)

2024-12-27 10:21:07 +08:00 · 2024-10-16 11:40:44 +08:00 · 2024-10-16 11:40:44 +08:00 · 8862fb4ff8
commit 8862fb4ff8
parent c01623c57c
21 changed files with 79 additions and 38 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 5d6206b72a9579ab3207dae55dab753b13747e8f964fa5d95c1691046a4d151d2043b0e6b341954dffd01082107ee7ce849a81baaf8d569ea388a193b2860469
+    SHA512 b1a880a922e5823ec6c87d1540651978d895a2d0389158865011198ca80034342f39f7b2c1a104745ccb1cb3cb8d355cb0afb5b08c38fb8187a285ea37071f26
    HEAD_REF main
    PATCHES 
        fix-glog.patch
@ -19,7 +19,11 @@ file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake")
 file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake")
 file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake")

-vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        "-Dthriftpy=OFF"
+)
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fbthrift)

--- a/ports/fbthrift/vcpkg.json
+++ b/ports/fbthrift/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "fbthrift",
-  "version-string": "2024.09.30.00",
+  "version-string": "2024.10.07.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/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 9ad53ab9756ef614113c816773d73312da01533b26037a6fa071226a955751c8f30f18c40c876884f50b7d9899260dfa50a9ea035a89c04471e313392d6b8957
+    SHA512 e20ecda20f0a4dce306cddfbdcf990212067aa4d3df551ee9d0b4a9a17f0509aba0c38bc9945ba2ba039a60f51a9cd5ea3e6fe6f97ba7d1c80e76238301bd283
    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.30.00",
+  "version-string": "2024.10.07.00",
  "description": "a TLS 1.3 implementation by Facebook",
  "homepage": "https://github.com/facebookincubator/fizz",
  "license": "BSD-3-Clause",
--- a/ports/folly/fix-fmt-patch-for-old-cmake.patch
+++ b/ports/folly/fix-fmt-patch-for-old-cmake.patch
@ -1,18 +0,0 @@
-diff --git a/CMake/GenPkgConfig.cmake b/CMake/GenPkgConfig.cmake
-index 0e93175bd..9de854022 100644
--- a/CMake/GenPkgConfig.cmake
-+++ b/CMake/GenPkgConfig.cmake
-@@ -103,6 +103,11 @@ function(gen_pkgconfig_vars)
-       "<COMPILE_LANG_AND_ID:CUDA,NVIDIA>" "<COMPILE_LANGUAGE:CUDA>"
-       cflags "${cflags}"
-     )
-+
-+  endif()
-+  # patch for fmt's generator expression on older CMake
-+  if (MSVC)
-+    string(REPLACE "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>" "/utf-8" cflags "${cflags}")
-   endif()
-
-   set("${var_prefix}_CFLAGS" "${cflags}" PARENT_SCOPE)
--
-2.34.1
--- 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 61e9f011544314f330feea61d90771a06438ee2358023540d6f0658180491c09a9df4d2d4bb10375fe97467e9e233d1d1f8004b2df8e9c6281417a9b913e6ac6
+    SHA512 cb8feb35e51072555b910613e87f079acd1f97892df0e6f3888bd9a8a336ca6183d552bfb4e16cfafbf8f5a7ec3f2a85dda686c74528e23e4bc821b2f67bfa77
    HEAD_REF main
    PATCHES
        disable-non-underscore-posix-names.patch
@ -17,7 +17,6 @@ vcpkg_from_github(
        fix-deps.patch
        disable-uninitialized-resize-on-new-stl.patch
        fix-unistd-include.patch
-        fix-fmt-patch-for-old-cmake.patch
 )

 file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
--- a/ports/folly/vcpkg.json
+++ b/ports/folly/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "folly",
-  "version-string": "2024.09.30.00",
+  "version-string": "2024.10.07.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/fix-cmake.patch
+++ b/ports/mvfst/fix-cmake.patch
@ -0,0 +1,25 @@
+diff --git a/quic/api/CMakeLists.txt b/quic/api/CMakeLists.txt
+index 5522347c5..a0a34761e 100644
+--- a/quic/api/CMakeLists.txt
+++ b/quic/api/CMakeLists.txt
+@@ -47,6 +47,7 @@ add_library(
+   QuicPacketScheduler.cpp
+   QuicStreamAsyncTransport.cpp
+   QuicTransportBase.cpp
+  QuicTransportBaseLite.cpp
+   QuicTransportFunctions.cpp
+ )
+ 
+
+diff --git a/quic/state/CMakeLists.txt b/quic/state/CMakeLists.txt
+index 0916546fe..14297bb30 100644
+--- a/quic/state/CMakeLists.txt
+++ b/quic/state/CMakeLists.txt
+@@ -55,6 +55,7 @@ add_library(
+   mvfst_state_ack_handler
+   AckEvent.cpp
+   AckHandlers.cpp
+  AckedPacketIterator.cpp
+ )
+ 
+ set_property(TARGET mvfst_state_ack_handler PROPERTY VERSION ${PACKAGE_VERSION})
--- a/ports/mvfst/portfile.cmake
+++ b/ports/mvfst/portfile.cmake
@ -2,8 +2,9 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/mvfst
    REF "v${VERSION}"
-    SHA512 42d3216221d9008c9a10cfcbe3ce6f738e9f96c1c3374a8a379673a26d48367ae65056454c2057928b17103687ddec50e1d06fb641b97942682f0c5eb50e5f54
+    SHA512 8ec9e7daf1c259f31e90eaa32cfa29d377e279f93c2072528447455f4f8ea897ab17f2759222a2ea9a73fdafe96b7d8223cf1efbadad2e8ea180b23832090aa7
    HEAD_REF main
+    PATCHES fix-cmake.patch
 )

 vcpkg_cmake_configure(
--- a/ports/mvfst/vcpkg.json
+++ b/ports/mvfst/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "mvfst",
-  "version-string": "2024.09.30.00",
+  "version-string": "2024.10.07.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 1ea95297f4b8ee1f4eec57817ead67e3d9b2fd7b9721c0ec5d98ab8b041b33b521689f34e874e1a6a305d5a9ed174798ff46c89c397a12169c0f96bc50f2a486
+    SHA512 929a4010277bdf7ac7950e1f37b946328ef3da59dafa283db3841236833bde4cb2b734545e7bad8fd104bf4d083f3b50dc4a07d6e07a9fcdde78eda24e20b458
    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.30.00",
+  "version-string": "2024.10.07.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 1c6daf763ab8bcefec2c3798743e4979f812ec630bcb252afa333f8df90a96c7c6f8f05c30b2f970ade45e8419bc09633f355ce66114a8a337b3ddbf7b4b6443
+    SHA512 cb64738645c5af63bd4a06112d3ddcee557ca426127f569fc360183fc5893c88049a9ac60212f6187f283f02911e48ef718fb1b5ba41b665ab2bdc312aeb4356
    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.30.00",
+  "version-string": "2024.10.07.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
@ -2713,7 +2713,7 @@
      "port-version": 1
    },
    "fbthrift": {
-      "baseline": "2024.09.30.00",
+      "baseline": "2024.10.07.00",
      "port-version": 0
    },
    "fcl": {
@ -2761,7 +2761,7 @@
      "port-version": 0
    },
    "fizz": {
-      "baseline": "2024.09.30.00",
+      "baseline": "2024.10.07.00",
      "port-version": 0
    },
    "flagpp": {
@ -2845,7 +2845,7 @@
      "port-version": 1
    },
    "folly": {
-      "baseline": "2024.09.30.00",
+      "baseline": "2024.10.07.00",
      "port-version": 0
    },
    "font-chef": {
@ -6145,7 +6145,7 @@
      "port-version": 7
    },
    "mvfst": {
-      "baseline": "2024.09.30.00",
+      "baseline": "2024.10.07.00",
      "port-version": 0
    },
    "mygui": {
@ -7193,7 +7193,7 @@
      "port-version": 0
    },
    "proxygen": {
-      "baseline": "2024.09.30.00",
+      "baseline": "2024.10.07.00",
      "port-version": 0
    },
    "psimd": {
@ -9505,7 +9505,7 @@
      "port-version": 5
    },
    "wangle": {
-      "baseline": "2024.09.30.00",
+      "baseline": "2024.10.07.00",
      "port-version": 0
    },
    "wasmedge": {
--- a/versions/f-/fbthrift.json
+++ b/versions/f-/fbthrift.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "bc4c75751db768dfccfdf9dc0cd45b5f38e3ab18",
+      "version-string": "2024.10.07.00",
+      "port-version": 0
+    },
    {
      "git-tree": "6da859410d8da42d16572b238e77f3a03c7e41f3",
      "version-string": "2024.09.30.00",
--- a/versions/f-/fizz.json
+++ b/versions/f-/fizz.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "0f9b145acd04fdea428cd27b7fca22d37b2f1e80",
+      "version-string": "2024.10.07.00",
+      "port-version": 0
+    },
    {
      "git-tree": "9400166b4d4bb78fb5d4fa643b2ce5dde98f1ae9",
      "version-string": "2024.09.30.00",
--- a/versions/f-/folly.json
+++ b/versions/f-/folly.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "c1728c51eda0e3195c97dfdb580113f5a29d267c",
+      "version-string": "2024.10.07.00",
+      "port-version": 0
+    },
    {
      "git-tree": "89e5d57a4e801e9f33fd775484532fca2fe50a23",
      "version-string": "2024.09.30.00",
--- a/versions/m-/mvfst.json
+++ b/versions/m-/mvfst.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "884696ea9ad9078cb5235e9bae639fc789ce7a1c",
+      "version-string": "2024.10.07.00",
+      "port-version": 0
+    },
    {
      "git-tree": "324132fd5e76f2c4eebe3aecf33ffadc12c1e368",
      "version-string": "2024.09.30.00",
--- a/versions/p-/proxygen.json
+++ b/versions/p-/proxygen.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "bf5f1d578553c2ec1665a45b4e34bcf3229c3e6f",
+      "version-string": "2024.10.07.00",
+      "port-version": 0
+    },
    {
      "git-tree": "7a85641a8010a78d432738f559b0b88ac77223b6",
      "version-string": "2024.09.30.00",
--- a/versions/w-/wangle.json
+++ b/versions/w-/wangle.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "dce0e6d225710b3ecd5811bb83d804ea740281c0",
+      "version-string": "2024.10.07.00",
+      "port-version": 0
+    },
    {
      "git-tree": "b3251636a753439c991c79c231043f2da637df24",
      "version-string": "2024.09.30.00",