Skip to content

Commit

Permalink
[folly, fizz, wangle, proxygen, mvfst, fbthrift, cachelib] update to …
Browse files Browse the repository at this point in the history
…2024.04.22 (#38419)

<!-- If your PR fixes issues, please note that here by adding "Fixes
#NNNNNN." for each fixed issue on separate lines. -->

<!-- If you are still working on the PR, open it as a Draft:
https://github.blog/2019-02-14-introducing-draft-pull-requests/. -->

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.


<!-- If this PR adds a new port, please uncomment and fill out this
checklist:

- [ ] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [ ] The name of the port matches an existing name for this component
on https://repology.org/ if possible, and/or is strongly associated with
that component on search engines.
- [ ] Optional dependencies are resolved in exactly one way. For
example, if the component is built with CMake, all `find_package` calls
are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or
disabled with
[CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html).
- [ ] The versioning scheme in `vcpkg.json` matches what upstream says.
- [ ] The license declaration in `vcpkg.json` matches what upstream
says.
- [ ] The installed as the "copyright" file matches what upstream says.
- [ ] The source code of the component installed comes from an
authoritative source.
- [ ] The generated "usage text" is accurate. See
[adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md)
for context.
- [ ] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [ ] Only one version is in the new port's versions file.
- [ ] Only one version is added to each modified port's versions file.

END OF NEW PORT CHECKLIST (delete this line) -->
  • Loading branch information
c8ef committed Apr 29, 2024
1 parent 1db0bfe commit 31e85fd
Show file tree
Hide file tree
Showing 23 changed files with 65 additions and 30 deletions.
2 changes: 1 addition & 1 deletion ports/cachelib/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/CacheLib
REF "v${VERSION}"
SHA512 3e9b5d799abdfcb52cc84ac8fc954d46ddd8aef51748ada32bdc57a7b8fc20bb7dd2481af873581069746408e76e0445de3f7973352a6a7c848befada869c379
SHA512 68605da87930e224a5fd08b167b105aefd32a7ecfd5435a3b1cc1addc7d05ce67c23684f49de210984b8244a1362db8e8a1cb82d45a7a23a5f766088f9746edb
HEAD_REF master
PATCHES
fix-build.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/cachelib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cachelib",
"version-string": "2024.04.15.00",
"version-string": "2024.04.22.00",
"description": "Pluggable caching engine to build and scale high performance cache services.",
"homepage": "https://github.com/facebook/CacheLib",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion ports/fbthrift/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/fbthrift
REF "v${VERSION}"
SHA512 d04c93f63edf1e07421cda3ab26918d22d3bd89bda054c89848f5ed44589ef5e1ae5be3ca2a1838f2ec4238937369406b46585e391c45bf23aebfb053cbcda25
SHA512 8d5ea34a0a8ebb79e43186a17736706f1db4cf079a14dd2217106dfa4077a00ef2b3d87728d850029ea672b3ee5e6e643a18f0acde79164982d20c4c667d2966
HEAD_REF master
PATCHES
fix-glog.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/fbthrift/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fbthrift",
"version-string": "2024.04.15.00",
"version-string": "2024.04.22.00",
"description": "Facebook's branch of Apache Thrift, including a new C++ server.",
"homepage": "https://github.com/facebook/fbthrift",
"license": "Apache-2.0",
Expand Down
18 changes: 9 additions & 9 deletions ports/fizz/fix-build.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
index e69ae168..65c9d62c 100644
index 56adfe0a..4f81aa5a 100644
--- a/fizz/CMakeLists.txt
+++ b/fizz/CMakeLists.txt
@@ -50,53 +50,31 @@ find_package(folly CONFIG REQUIRED)
@@ -50,53 +50,32 @@ find_package(folly CONFIG REQUIRED)
find_package(fmt CONFIG REQUIRED)

find_package(OpenSSL REQUIRED)
Expand Down Expand Up @@ -52,7 +52,7 @@ index e69ae168..65c9d62c 100644

+find_package(gflags CONFIG REQUIRED)
find_package(ZLIB REQUIRED)
-
-find_package(Libevent CONFIG QUIET)
-if(TARGET event)
- message(STATUS "Found libevent from package config")
Expand All @@ -64,9 +64,9 @@ index e69ae168..65c9d62c 100644
-endif()
+find_package(Libevent CONFIG REQUIRED)

# Fizz build time options
include(FizzOptions)
@@ -254,30 +232,25 @@ target_include_directories(
find_package(liboqs CONFIG)
if (liboqs_FOUND)
@@ -265,30 +244,25 @@ target_include_directories(
$<BUILD_INTERFACE:${FIZZ_BASE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/generated>
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
Expand Down Expand Up @@ -105,7 +105,7 @@ index e69ae168..65c9d62c 100644
${CMAKE_DL_LIBS}
${LIBRT_LIBRARIES})

@@ -334,8 +307,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
@@ -349,8 +323,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
SET(FIZZ_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})

if(BUILD_TESTS)
Expand All @@ -115,7 +115,7 @@ index e69ae168..65c9d62c 100644
endif()

add_library(fizz_test_support
@@ -348,20 +320,7 @@ add_library(fizz_test_support
@@ -363,20 +336,7 @@ add_library(fizz_test_support
target_link_libraries(fizz_test_support
PUBLIC
fizz
Expand All @@ -137,7 +137,7 @@ index e69ae168..65c9d62c 100644
)

# export fizz headers and targets for unit tests utils
@@ -386,14 +345,12 @@ macro(add_gtest test_source test_name)
@@ -401,14 +361,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)
Expand Down
2 changes: 1 addition & 1 deletion ports/fizz/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/fizz
REF "v${VERSION}"
SHA512 d2f7c0fd198a2c2bfcd3557cc7af8f50dd8ad47452a1acb3880fed689cdac5dd8857222ef8b6897eccccb6392b714713fda055c4a735ba8fe3a517d1c618e139
SHA512 54c16c10f0cf432cb0965d1f223f6b8bbac8adc89da0c405396ad15a9621fe11cf4f1751a034b282dfa0f7ed03cb6d47292f19f9a677c4fdd8c01551430347a9
HEAD_REF master
PATCHES
fix-build.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/fizz/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fizz",
"version-string": "2024.04.15.00",
"version-string": "2024.04.22.00",
"description": "a TLS 1.3 implementation by Facebook",
"homepage": "https://github.com/facebookincubator/fizz",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion ports/folly/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF "v${VERSION}"
SHA512 a3bf212fcbbb2db85f6212bbc383fb9106d54a692c9c76c23a13c4d0e163195623733382c067734af95b9f70c5d218e2672133df39aa72e3cdab4a009b52f24b
SHA512 ff57179bf5d5e73eac8c315b49b2b0c28f154aa0c923ff742b8c41126dea3366a78e20cfff95d7844f5c4850e81b15c3e3f65665ff4ef9ab1d0135af6fb34c90
HEAD_REF main
PATCHES
disable-non-underscore-posix-names.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/folly/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "folly",
"version-string": "2024.04.15.00",
"version-string": "2024.04.22.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",
Expand Down
2 changes: 1 addition & 1 deletion ports/mvfst/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/mvfst
REF "v${VERSION}"
SHA512 753faf1aa2d10a99242f3a06882db90eebf13d923bc4cec94401e02b203d39b3943b0e6076ddff3e522ca825243e4dcce0143f55ce7f839d0f57b4b42f44caf0
SHA512 12161f798bbab821ac74ce04258b6728d19c29097c3a03fe7461238a9db132c1d77297fa60b163f953f6f185ad7711fd91432348039197652bff1f3de559c63d
HEAD_REF main
)

Expand Down
2 changes: 1 addition & 1 deletion ports/mvfst/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mvfst",
"version-string": "2024.04.15.00",
"version-string": "2024.04.22.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",
Expand Down
2 changes: 1 addition & 1 deletion ports/proxygen/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/proxygen
REF "v${VERSION}"
SHA512 83ae451f0f3454fcc5daae6c4f2555e37ca0c8d69a62c33451ad72638150b52843220f572a3a53e3826372ca01411b0c2b0ce13ca4b60df13a566cf706484593
SHA512 93dde6d21c338f512d2a579dc23c40fccaaaa98e7fccf8bb471d40000c1d8a8d5fabe9b27b4a205c4949b0d56c3a77b003c0e46f86dbd735aad6b68178c54a83
HEAD_REF master
PATCHES
remove-register.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/proxygen/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "proxygen",
"version-string": "2024.04.15.00",
"version-string": "2024.04.22.00",
"description": "It comprises the core C++ HTTP abstractions used at Facebook.",
"homepage": "https://github.com/facebook/proxygen",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion ports/wangle/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/wangle
REF "v${VERSION}"
SHA512 1835d897b097b9bf4e87ba51d2eb1fcb926fe90813cdff661ba888b1186487980ec481c532f6ab18fc255ead28e28740976c3cd7ff723f61773c7c654d46718a
SHA512 d78991b03994466e2aa3289e69384a56ba82355a5778ed595c7dfa456beb1118eebc0b1f15467af76ad29bc13088dec9556cbe357fb7dd8f5745f4720136b3c2
HEAD_REF master
PATCHES
fix-config-cmake.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/wangle/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wangle",
"version-string": "2024.04.15.00",
"version-string": "2024.04.22.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",
Expand Down
14 changes: 7 additions & 7 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1433,7 +1433,7 @@
"port-version": 0
},
"cachelib": {
"baseline": "2024.04.15.00",
"baseline": "2024.04.22.00",
"port-version": 0
},
"caf": {
Expand Down Expand Up @@ -2653,7 +2653,7 @@
"port-version": 0
},
"fbthrift": {
"baseline": "2024.04.15.00",
"baseline": "2024.04.22.00",
"port-version": 0
},
"fcl": {
Expand Down Expand Up @@ -2697,7 +2697,7 @@
"port-version": 0
},
"fizz": {
"baseline": "2024.04.15.00",
"baseline": "2024.04.22.00",
"port-version": 0
},
"flagpp": {
Expand Down Expand Up @@ -2781,7 +2781,7 @@
"port-version": 2
},
"folly": {
"baseline": "2024.04.15.00",
"baseline": "2024.04.22.00",
"port-version": 0
},
"font-chef": {
Expand Down Expand Up @@ -5973,7 +5973,7 @@
"port-version": 7
},
"mvfst": {
"baseline": "2024.04.15.00",
"baseline": "2024.04.22.00",
"port-version": 0
},
"mygui": {
Expand Down Expand Up @@ -6993,7 +6993,7 @@
"port-version": 0
},
"proxygen": {
"baseline": "2024.04.15.00",
"baseline": "2024.04.22.00",
"port-version": 0
},
"psimd": {
Expand Down Expand Up @@ -9241,7 +9241,7 @@
"port-version": 5
},
"wangle": {
"baseline": "2024.04.15.00",
"baseline": "2024.04.22.00",
"port-version": 0
},
"wasmedge": {
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cachelib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3069208e74474384f29d8a14865d74b6a0e3c06b",
"version-string": "2024.04.22.00",
"port-version": 0
},
{
"git-tree": "f06b7028d67ad69b208b340bd8a8f173dd2ee444",
"version-string": "2024.04.15.00",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/fbthrift.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "46d788eccf368c936450f592656ecde3a95a169e",
"version-string": "2024.04.22.00",
"port-version": 0
},
{
"git-tree": "76ddc229d7bc95ce42a7f218b76aa6316a6a8911",
"version-string": "2024.04.15.00",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/fizz.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e97f6bbb5b231d75fc5918ec667d3b744696a29f",
"version-string": "2024.04.22.00",
"port-version": 0
},
{
"git-tree": "5a404f853e980e3898081e175fc198187746a021",
"version-string": "2024.04.15.00",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/folly.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5e4f9bd31d69378c2859796aa2d63f003a97f3c7",
"version-string": "2024.04.22.00",
"port-version": 0
},
{
"git-tree": "3b803b0dc89af872933e2ac7b801c606b2400d3e",
"version-string": "2024.04.15.00",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mvfst.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4bb8fa5be07d30ff4e4035c5c919a554dc9e8eec",
"version-string": "2024.04.22.00",
"port-version": 0
},
{
"git-tree": "f33e273595f6c55018aca87d97f12eb3a83bfcd9",
"version-string": "2024.04.15.00",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/proxygen.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "21eda2f084823674a66c17e77f6520a9f238d485",
"version-string": "2024.04.22.00",
"port-version": 0
},
{
"git-tree": "4b72c30c87e3f16a813b51cd445c74643b5891c5",
"version-string": "2024.04.15.00",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wangle.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e4a19ce3d98ada4dbd7857f7a7c60e68e1da9fe9",
"version-string": "2024.04.22.00",
"port-version": 0
},
{
"git-tree": "3c725fdec0c58cd624a8860320c560427ab2ce00",
"version-string": "2024.04.15.00",
Expand Down

0 comments on commit 31e85fd

Please sign in to comment.