[folly-fbthrift2] no absolute paths (#23792)

2025-06-07 17:22:47 +08:00 · 2022-03-28 22:39:28 +02:00 · 2022-03-28 22:39:28 +02:00 · fed5cf1d9b
commit fed5cf1d9b
parent d97abe65b5
20 changed files with 61 additions and 60 deletions
--- a/ports/fbthrift/add-missing-algorithm-include.patch
+++ b/ports/fbthrift/add-missing-algorithm-include.patch
@ -1,28 +0,0 @@
-From f2151fa730058a1baf23ed3dc082c91df6351da1 Mon Sep 17 00:00:00 2001
-From: "Zeyi (Rice) Fan" <zeyi@fb.com>
-Date: Fri, 4 Feb 2022 15:17:53 -0800
-Subject: [PATCH] fix build failure on Windows
-
-Summary: Fix a build error on Windows where `std::mismatch` is not found.
-
-Reviewed By: xavierd
-
-Differential Revision: D34012963
-
-fbshipit-source-id: 9f5aa21d03a92fdadf5bc83943a159a2f7872144
---
- thrift/compiler/generate/build_templates.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/thrift/compiler/generate/build_templates.cc b/thrift/compiler/generate/build_templates.cc
-index 56f13e8dde8..acd9dd30a75 100644
--- a/thrift/compiler/generate/build_templates.cc
-+++ b/thrift/compiler/generate/build_templates.cc
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- 
-+#include <algorithm>
- #include <fstream>
- #include <iostream>
- #include <iterator>
--- a/ports/fbthrift/portfile.cmake
+++ b/ports/fbthrift/portfile.cmake
@ -4,11 +4,9 @@ vcpkg_find_acquire_program(BISON)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/fbthrift
-    REF v2022.01.31.00
-    SHA512 159457398fdc0c89c34364b8a89068127c3519ce35af349776016e0ae37ae9508689853e0e371c2065fd715451f466e37c7e3799e054eca02cbc4717809150ab
+    REF v2022.03.21.00
+    SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab
    HEAD_REF master
-    PATCHES
-        add-missing-algorithm-include.patch # https://github.com/facebook/fbthrift/commit/f2151fa730058a1baf23ed3dc082c91df6351da1
 )

 vcpkg_cmake_configure(
@ -41,6 +39,7 @@ file(REMOVE_RECURSE
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/server/test"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark"
    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation"
@ -58,5 +57,8 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake")
        "${PACKAGE_PREFIX_DIR}/bin/thrift1" "${PACKAGE_PREFIX_DIR}/tools/fbthrift/thrift1")
 endif()

+# Only used internally and removed in master
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftTargets.cmake" "LOCATION_HH=\\\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/thrift/compiler/location.hh\\\"" "")
+
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/fbthrift/vcpkg.json
+++ b/ports/fbthrift/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "fbthrift",
-  "version-string": "2022.01.31.00",
-  "port-version": 2,
+  "version-string": "2022.03.21.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
@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebookincubator/fizz
-    REF v2022.01.31.00
-    SHA512 544f843f47cb6113d0ad804079e6d767f33723d9d529c2751c5c6317d65c35bd327b43852904b2a37c2af615276176fe2de667907a9a460c0dfc7593eca46459
+    REF v2022.03.21.00
+    SHA512 81a7b764c2c2e17fd5df32a69ecb368eb01df04df6dbd1155a40b68fc39cda4f86ce81afc5c89425a5751ef7f4dbb8a40df8b5095685e72ce5e9043c0a74682e
    HEAD_REF master
    PATCHES
        0001-fix-libsodium.patch
--- a/ports/fizz/vcpkg.json
+++ b/ports/fizz/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "fizz",
-  "version-string": "2022.01.31.00",
+  "version-string": "2022.03.21.00",
  "port-version": 1,
  "description": "a TLS 1.3 implementation by Facebook",
  "homepage": "https://github.com/facebookincubator/fizz",
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@ -8,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/folly
-    REF v2022.01.31.00
-    SHA512 fef065c8a879e5b80eb521eaa09d2ac4eb22563e759834e60f665f07df5c2863c76217798680381bc51fad8c44f4b5d5abfb924a94c89635a41708abf6d70133
+    REF v2022.03.21.00
+    SHA512 4e0fda55f007179883af30024fe1d389642159b1b4c915f7ef1a3c1003c8c52e2370f53ffa79d5fa75533d33becfb946d2bcbb2abdc62b9a297f977403d13dd7
    HEAD_REF main
    PATCHES
        reorder-glog-gflags.patch
--- a/ports/folly/vcpkg.json
+++ b/ports/folly/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "folly",
-  "version-string": "2022.01.31.00",
-  "port-version": 1,
+  "version-string": "2022.03.21.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
@ -1,8 +1,8 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebookincubator/mvfst
-    REF e569853
-    SHA512 66697d8149defe43f7b91ed509117a6330556ad89dfb64a3a778c6cdd706f01d8df7d356e2896d04dffc91e51c68735283b2a27915f3d909834dd0b0a95640de
+    REF 7c52380a5c445fe478096d7ca10e92797747ae87
+    SHA512 5ccebec9652e7a481b599b20a07b0d6585d300cdde3e6b62985c5ce448c0890d537bced6c9dbd77009f89c16311c56fde1f2131064ff5cc3fcb34bf69cb11f06
    HEAD_REF main
 )

--- a/ports/mvfst/vcpkg.json
+++ b/ports/mvfst/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "mvfst",
-  "version": "0.2",
-  "port-version": 1,
+  "version-date": "2022-03-27",
  "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",
  "supports": "!windows",
--- a/ports/proxygen/portfile.cmake
+++ b/ports/proxygen/portfile.cmake
@ -1,8 +1,8 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/proxygen
-    REF v2022.01.31.00
-    SHA512 f340466fb52e01bb71289f7cf1e8aee2ef8a0d5db21998ea85aaf07b128144de05747ececcac65e99d1d452bddc0d0dc60ba17087311c8337e31fbdda6f4ce3a
+    REF v2022.03.21.00
+    SHA512 66dfd40e45b884d64be9c06b110caaa9333116c402312ee8eb0c21f0ab569ea31b9e4fb676c68b96730abbff0b74d139f5e39e702cd958c24ce0fe76f353fbe9
    HEAD_REF master
    PATCHES
        remove-register.patch
--- a/ports/proxygen/vcpkg.json
+++ b/ports/proxygen/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "proxygen",
-  "version-string": "2022.01.31.00",
+  "version-string": "2022.03.21.00",
  "description": "It comprises the core C++ HTTP abstractions used at Facebook.",
  "homepage": "https://github.com/facebook/proxygen",
  "supports": "!windows",
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/wangle
-    REF v2022.01.31.00
-    SHA512 bb0ce38e7a54c094a828dbf75c0b719e49b2c39420bb648d54dbc13a083c982c31f104903d8d93558e254bdf1133dbf320f170a83c30fec78bdb9eeaf085a10a
+    REF v2022.03.21.00
+    SHA512 069fe7758ccb2f33665f53109047f2e0158e248fda8c760eddd978afd6980acbc6421db60721bf320deca557369377c8757f13c67f8685e3a98394324e75e72e
    HEAD_REF master
    PATCHES
        fix-config-cmake.patch
--- a/ports/wangle/vcpkg.json
+++ b/ports/wangle/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "wangle",
-  "version-string": "2022.01.31.00",
+  "version-string": "2022.03.21.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
@ -2161,8 +2161,8 @@
      "port-version": 3
    },
    "fbthrift": {
-      "baseline": "2022.01.31.00",
-      "port-version": 2
+      "baseline": "2022.03.21.00",
+      "port-version": 0
    },
    "fcl": {
      "baseline": "0.7.0",
@ -2197,7 +2197,7 @@
      "port-version": 1
    },
    "fizz": {
-      "baseline": "2022.01.31.00",
+      "baseline": "2022.03.21.00",
      "port-version": 1
    },
    "flann": {
@ -2253,8 +2253,8 @@
      "port-version": 1
    },
    "folly": {
-      "baseline": "2022.01.31.00",
-      "port-version": 1
+      "baseline": "2022.03.21.00",
+      "port-version": 0
    },
    "font-chef": {
      "baseline": "1.1.0",
@ -4685,8 +4685,8 @@
      "port-version": 5
    },
    "mvfst": {
-      "baseline": "0.2",
-      "port-version": 1
+      "baseline": "2022-03-27",
+      "port-version": 0
    },
    "mygui": {
      "baseline": "3.4.1",
@ -5553,7 +5553,7 @@
      "port-version": 1
    },
    "proxygen": {
-      "baseline": "2022.01.31.00",
+      "baseline": "2022.03.21.00",
      "port-version": 0
    },
    "psimd": {
@ -7373,7 +7373,7 @@
      "port-version": 3
    },
    "wangle": {
-      "baseline": "2022.01.31.00",
+      "baseline": "2022.03.21.00",
      "port-version": 0
    },
    "wavelib": {
--- a/versions/f-/fbthrift.json
+++ b/versions/f-/fbthrift.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "0cd01b0f0f6c77c87eea5331b75b01c9e9a20e2c",
+      "version-string": "2022.03.21.00",
+      "port-version": 0
+    },
    {
      "git-tree": "228608a7708d80532948eec3a0987f2e85e4a43c",
      "version-string": "2022.01.31.00",
--- a/versions/f-/fizz.json
+++ b/versions/f-/fizz.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "3a4e5784b588827080b88e75299923149b842c4d",
+      "version-string": "2022.03.21.00",
+      "port-version": 1
+    },
    {
      "git-tree": "57fdd6342f89ccc3569b1a3416be67cd8dd7b59d",
      "version-string": "2022.01.31.00",
--- a/versions/f-/folly.json
+++ b/versions/f-/folly.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "bb704ec83012c1ef40ba934b0d5f3ae45471e4bd",
+      "version-string": "2022.03.21.00",
+      "port-version": 0
+    },
    {
      "git-tree": "10d3306d94114d0916a4691c131e233c08dc9090",
      "version-string": "2022.01.31.00",
--- a/versions/m-/mvfst.json
+++ b/versions/m-/mvfst.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "b054de2d05773c286f25528132a496dd075d3914",
+      "version-date": "2022-03-27",
+      "port-version": 0
+    },
    {
      "git-tree": "042a5236f46c787daf8334a8ca9c0cd3f71ab1b4",
      "version": "0.2",
--- a/versions/p-/proxygen.json
+++ b/versions/p-/proxygen.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "3d4554283cc0401f123164636046763fa9808475",
+      "version-string": "2022.03.21.00",
+      "port-version": 0
+    },
    {
      "git-tree": "d17fc3eb415126e6e9d5d77eb2de69ffd3c30869",
      "version-string": "2022.01.31.00",
--- a/versions/w-/wangle.json
+++ b/versions/w-/wangle.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "6f0fec69eddf934964ee77b9923f68da2c3c7724",
+      "version-string": "2022.03.21.00",
+      "port-version": 0
+    },
    {
      "git-tree": "387fe8f00443c17cf01fe0ebc235dd8cc5dd3f03",
      "version-string": "2022.01.31.00",