[folly related] update to 07.01 (#39642)

2024-11-27 21:48:59 +08:00 · 2024-07-03 02:48:08 +08:00 · 2024-07-03 02:48:08 +08:00 · cf793ad280
commit cf793ad280
parent 901407b872
23 changed files with 72 additions and 23 deletions
--- a/ports/cachelib/fix-fmt.patch
+++ b/ports/cachelib/fix-fmt.patch
@ -0,0 +1,13 @@
+diff --git a/cachelib/navy/block_cache/BlockCache.cpp b/cachelib/navy/block_cache/BlockCache.cpp
+index 5394cd3..f9d2c23 100644
+--- a/cachelib/navy/block_cache/BlockCache.cpp
+++ b/cachelib/navy/block_cache/BlockCache.cpp
+@@ -266,7 +266,7 @@ Status BlockCache::lookup(HashedKey hk, Buffer& value) {
+       XLOGF(ERR,
+             "Retry reading an entry after checksum for debugging. Return code: "
+             "{}",
+-            retryStatus);
+            toString(retryStatus));
+ 
+       // Remove this item from index so no future lookup will
+       // ever attempt to read this key. Reclaim will also not be
--- a/ports/cachelib/portfile.cmake
+++ b/ports/cachelib/portfile.cmake
@ -2,11 +2,12 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/CacheLib
    REF "v${VERSION}"
-    SHA512 8463c449c798e139b83e8be7716e613e38e654247cb430708e718c38c0d67fbd0b51c02aadaa1909325d0633ff3617ab61b9ddbf44060930ff79107681a6c90a
+    SHA512 df2d5f1e2664fee4d88542ab8c98788cb31cfd9c599662a99307030cebf29e2916e316c811aca33ef83bb5c0e2f9710325dacd16391731c7b331eb6fa8a01c46
    HEAD_REF main
    PATCHES
        fix-build.patch
        fix-glog.patch
+        fix-fmt.patch
 )

 FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h
--- a/ports/cachelib/vcpkg.json
+++ b/ports/cachelib/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "cachelib",
-  "version-string": "2024.06.24.00",
+  "version-string": "2024.07.01.00",
  "description": "Pluggable caching engine to build and scale high performance cache services.",
  "homepage": "https://github.com/facebook/CacheLib",
  "license": "Apache-2.0",
--- 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 560584e1740d5b0fdb637ec7c455c4b340bae1427a15af9da7a084b889305b2a66f08afd67d9ab0ec4007ae3311f1f42129feb71cabe586bd7ab9c4c993fc01b
+    SHA512 29422b4d16130ac352bdb4ee64fde5af0da0af4e1fd8fcb45b04720a878b7c2bdf42a3b516d167332bc8bf509a18e6688d03938321b6bd7ee92fc2c48048da90
    HEAD_REF main
    PATCHES 
        fix-glog.patch
@ -36,6 +36,7 @@ file(REMOVE_RECURSE
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test"
    "${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"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/server/test"
--- a/ports/fbthrift/vcpkg.json
+++ b/ports/fbthrift/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "fbthrift",
-  "version-string": "2024.06.24.00",
+  "version-string": "2024.07.01.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 dfd169570da65fa00d33eed3b6e7cdd65ffc25cc09448d4111021677e75dca08bc0788ff8ea5fbbb1a8b5f929ac0f3c2b0e33b182a68677f927a2f014e898e12
+    SHA512 fda7dad381919be093eaf355c0f47f7620ad45f6d96a4a454f154f203c7fcfbbeff8f8a7d6010ba360aaf7bc067937043f036cf1364b7c58747ec51985a2770a
    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.06.24.00",
+  "version-string": "2024.07.01.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 5f17b3db6cb0ed8f8bdd5da3ad83c2b8a55d4147e7098ac51fd82f621af0f04aca7e2ff996394c376f2e3c49135c526974fddad817c807226250589b8e2cef9d
+    SHA512 fe9a0b449d84f7d43ebaea29ead5bfd17f8f6c43bbf2928d93045cbaf394ffba059e29241e9850c376f7c765784b207cd16a4cce65ad5ec4131c9ca570b6b2c0
    HEAD_REF main
    PATCHES
        disable-non-underscore-posix-names.patch
--- a/ports/folly/vcpkg.json
+++ b/ports/folly/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "folly",
-  "version-string": "2024.06.24.00",
-  "port-version": 1,
+  "version-string": "2024.07.01.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 89891b688ba126911cbb4e4d047f14dadd2b3b2c9ee6654b3bf9cdd3054b49a56009acbc4e9ef57e54a37cb4195404bd9e17728b5fdb48f2b289cec226c3582b
+    SHA512 1f2fa62be05fea05b2bbad1dd711a468a3552344c4908e7f53c761a893668ac7cef16aa93d042d4e7f9ba3978e605ab98ba43b8a49263b01519a7e585c8a3777
    HEAD_REF main
 )

--- a/ports/mvfst/vcpkg.json
+++ b/ports/mvfst/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "mvfst",
-  "version-string": "2024.06.24.00",
+  "version-string": "2024.07.01.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 d4eb28935d433aaa45ff139b6c6fc729d253a2ecdf6038aa51ed241f4f203aa91b01bdcd58873ad58b0b0feaa72cb58f93622a7a5b655a7ef33b5e061cb4b3d9
+    SHA512 42974a73467f06b8786efcf784b20f94a782ca9c74af2b156c3246812e33c1c6069deaaa0034617dbf80d285356b94e6e70b534011b5db6203acba3b4cfc9c98
    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.06.24.00",
+  "version-string": "2024.07.01.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 a93d367e6061ef37b7775aa99fdfdba3c13abea485d8968c1f593bc456ee19519dd26aa52dae119b01296566f76114e01c4dad50031fe36485060feb338c095e
+    SHA512 b51ae354e7904dac378eb5987c4487a4c7e4bb2ebaff504b46348eabce4229884e1808804f155218c271a419813d060c9d0f51b35db9905234addebd53483e09
    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.06.24.00",
+  "version-string": "2024.07.01.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
@ -1449,7 +1449,7 @@
      "port-version": 0
    },
    "cachelib": {
-      "baseline": "2024.06.24.00",
+      "baseline": "2024.07.01.00",
      "port-version": 0
    },
    "caf": {
@ -2669,7 +2669,7 @@
      "port-version": 0
    },
    "fbthrift": {
-      "baseline": "2024.06.24.00",
+      "baseline": "2024.07.01.00",
      "port-version": 0
    },
    "fcl": {
@ -2713,7 +2713,7 @@
      "port-version": 0
    },
    "fizz": {
-      "baseline": "2024.06.24.00",
+      "baseline": "2024.07.01.00",
      "port-version": 0
    },
    "flagpp": {
@ -2797,8 +2797,8 @@
      "port-version": 2
    },
    "folly": {
-      "baseline": "2024.06.24.00",
-      "port-version": 1
+      "baseline": "2024.07.01.00",
+      "port-version": 0
    },
    "font-chef": {
      "baseline": "1.1.0",
@ -6033,7 +6033,7 @@
      "port-version": 7
    },
    "mvfst": {
-      "baseline": "2024.06.24.00",
+      "baseline": "2024.07.01.00",
      "port-version": 0
    },
    "mygui": {
@ -7065,7 +7065,7 @@
      "port-version": 0
    },
    "proxygen": {
-      "baseline": "2024.06.24.00",
+      "baseline": "2024.07.01.00",
      "port-version": 0
    },
    "psimd": {
@ -9345,7 +9345,7 @@
      "port-version": 5
    },
    "wangle": {
-      "baseline": "2024.06.24.00",
+      "baseline": "2024.07.01.00",
      "port-version": 0
    },
    "wasmedge": {
--- a/versions/c-/cachelib.json
+++ b/versions/c-/cachelib.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "3bb4c5e9a819c0c75b19b571c9b788ae9deeed8a",
+      "version-string": "2024.07.01.00",
+      "port-version": 0
+    },
    {
      "git-tree": "fc6513f7e57c438020e51abbe83c14e46b2c3a09",
      "version-string": "2024.06.24.00",
--- a/versions/f-/fbthrift.json
+++ b/versions/f-/fbthrift.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "faa0c50ca092c1babb25133e1062441599ab7e8a",
+      "version-string": "2024.07.01.00",
+      "port-version": 0
+    },
    {
      "git-tree": "e21dd53c89f5ec6062a031d8a9845c3b74c4887c",
      "version-string": "2024.06.24.00",
--- a/versions/f-/fizz.json
+++ b/versions/f-/fizz.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "f29188a411853ffd34395c1586a43050e4d5b837",
+      "version-string": "2024.07.01.00",
+      "port-version": 0
+    },
    {
      "git-tree": "717c499e36e42552beeb1acb31bb6e0e39a5b540",
      "version-string": "2024.06.24.00",
--- a/versions/f-/folly.json
+++ b/versions/f-/folly.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "4725741c3674a8bfcfeec571af44330f8f7c3779",
+      "version-string": "2024.07.01.00",
+      "port-version": 0
+    },
    {
      "git-tree": "bcb430e2d5fe8557c51952641a32f7275d03d59a",
      "version-string": "2024.06.24.00",
--- a/versions/m-/mvfst.json
+++ b/versions/m-/mvfst.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "3da6a3eb2d381a5978a4b75fb6d97cbbe28e63bc",
+      "version-string": "2024.07.01.00",
+      "port-version": 0
+    },
    {
      "git-tree": "79be938668054ff02c7908e028778d348897661d",
      "version-string": "2024.06.24.00",
--- a/versions/p-/proxygen.json
+++ b/versions/p-/proxygen.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "8139561ddb5142ea1353d61aec9cddaca60d1bdd",
+      "version-string": "2024.07.01.00",
+      "port-version": 0
+    },
    {
      "git-tree": "437a24e8691eb016ae6b99957368d22e7642de24",
      "version-string": "2024.06.24.00",
--- a/versions/w-/wangle.json
+++ b/versions/w-/wangle.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "705591be974122dab4d03de9a78ccc23868d7e22",
+      "version-string": "2024.07.01.00",
+      "port-version": 0
+    },
    {
      "git-tree": "23d8495622ba6ccb533aac74b17743991838f6cc",
      "version-string": "2024.06.24.00",