[folly related] update to 2026.01.26.00 (#50256)

This commit is contained in:
Jia Yue Hua 2026-03-04 04:37:37 +08:00 committed by GitHub
parent c1f21baeaf
commit 42a91624b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
38 changed files with 398 additions and 293 deletions

View File

@ -1,5 +1,5 @@
diff --git a/cachelib/cachebench/util/JSONConfig.h b/cachelib/cachebench/util/JSONConfig.h
index 97cbe3fe..7e9bbdda 100644
index 97cbe3f..7e9bbdd 100644
--- a/cachelib/cachebench/util/JSONConfig.h
+++ b/cachelib/cachebench/util/JSONConfig.h
@@ -146,10 +146,6 @@ struct Options {};
@ -14,21 +14,22 @@ index 97cbe3fe..7e9bbdda 100644
} // namespace cachebench
} // namespace cachelib
diff --git a/cachelib/common/CMakeLists.txt b/cachelib/common/CMakeLists.txt
index 927f2fa3..fcf6a5a9 100644
index 308f526..d7f7345 100644
--- a/cachelib/common/CMakeLists.txt
+++ b/cachelib/common/CMakeLists.txt
@@ -37,9 +37,6 @@ target_link_libraries(cachelib_common PUBLIC
FBThrift::thriftprotocol
@@ -43,10 +43,6 @@ target_link_libraries(cachelib_common PUBLIC
FBThrift::thrift_dynamic_value
Folly::folly
Folly::follybenchmark
- Folly::folly_exception_tracer
- Folly::folly_exception_tracer_base
- Folly::folly_exception_counter
- Folly::folly_debugging_exception_tracer_exception_tracer
- Folly::folly_debugging_exception_tracer_exception_tracer_base
- Folly::folly_debugging_exception_tracer_exception_counter
- GTest::gtest
magic_enum::magic_enum
${XXHASH_LIBRARY}
)
install(TARGETS cachelib_common
diff --git a/cachelib/common/Utils.cpp b/cachelib/common/Utils.cpp
index 57a1beb9..204a432b 100644
index 12c1e4a..7aa8a42 100644
--- a/cachelib/common/Utils.cpp
+++ b/cachelib/common/Utils.cpp
@@ -15,7 +15,6 @@
@ -39,7 +40,7 @@ index 57a1beb9..204a432b 100644
#include <sys/mman.h>
#include <sys/resource.h>
#include <sys/stat.h>
@@ -428,10 +427,6 @@ size_t getMemAvailable() {
@@ -442,10 +441,6 @@ void setCgroupMemoryAdvising(CgroupMemAvailableFn provider) {
}
void printExceptionStackTraces() {

View File

@ -1,13 +1,37 @@
diff --git a/cachelib/CMakeLists.txt b/cachelib/CMakeLists.txt
index 6be8199..2ebff62 100644
index 8d17d64..bfe055f 100644
--- a/cachelib/CMakeLists.txt
+++ b/cachelib/CMakeLists.txt
@@ -96,7 +96,7 @@ find_package(Threads REQUIRED)
@@ -108,8 +108,8 @@ find_package(Threads REQUIRED)
find_package(Boost REQUIRED COMPONENTS
system filesystem regex context program_options thread)
find_package(Gflags REQUIRED)
-find_package(Gflags REQUIRED)
-find_package(Glog REQUIRED)
+find_package(gflags CONFIG REQUIRED)
+find_package(glog CONFIG REQUIRED)
find_package(GTest CONFIG REQUIRED)
find_package(folly CONFIG REQUIRED)
find_package(fizz CONFIG REQUIRED)
find_package(GTest REQUIRED)
include(GoogleTest)
enable_testing()
diff --git a/cachelib/cachebench/CMakeLists.txt b/cachelib/cachebench/CMakeLists.txt
index df1cb18..157975a 100644
--- a/cachelib/cachebench/CMakeLists.txt
+++ b/cachelib/cachebench/CMakeLists.txt
@@ -46,7 +46,7 @@ add_dependencies(cachelib_cachebench thrift_generated_files)
target_link_libraries(cachelib_cachebench PUBLIC
cachelib_datatype
cachelib_allocator
- gflags
+ gflags::gflags
)
add_library (cachelib_binary_trace_gen
@@ -65,7 +65,7 @@ add_dependencies(cachelib_binary_trace_gen thrift_generated_files)
target_link_libraries(cachelib_binary_trace_gen PUBLIC
cachelib_datatype
cachelib_allocator
- gflags
+ gflags::gflags
)
if ((CMAKE_SYSTEM_NAME STREQUAL Linux) AND

View File

@ -0,0 +1,37 @@
diff --git a/cachelib/navy/block_cache/FixedSizeIndex.h b/cachelib/navy/block_cache/FixedSizeIndex.h
index 0f9c2d9..68ce95c 100644
--- a/cachelib/navy/block_cache/FixedSizeIndex.h
+++ b/cachelib/navy/block_cache/FixedSizeIndex.h
@@ -466,7 +466,7 @@ class FixedSizeIndex : public Index {
XLOGF(ERR,
"Adding Key hash {}, bid {} to CombinedEntryBlock failed, "
"status={}",
- key.value(), curBid, status);
+ key.value(), curBid, static_cast<uint8_t>(status));
// We will continue by discarding currently stored entry
return {};
}
diff --git a/cachelib/navy/CMakeLists.txt b/cachelib/navy/CMakeLists.txt
index 8fa1d10..73406c5 100644
--- a/cachelib/navy/CMakeLists.txt
+++ b/cachelib/navy/CMakeLists.txt
@@ -30,6 +30,7 @@ add_library (cachelib_navy
block_cache/Region.cpp
block_cache/RegionManager.cpp
block_cache/SparseMapIndex.cpp
+ block_cache/CombinedEntryBlock.cpp
common/Buffer.cpp
common/Device.cpp
common/FdpNvme.cpp
diff --git a/cachelib/cachebench/CMakeLists.txt b/cachelib/cachebench/CMakeLists.txt
index df1cb18..574cd5f 100644
--- a/cachelib/cachebench/CMakeLists.txt
+++ b/cachelib/cachebench/CMakeLists.txt
@@ -29,6 +29,7 @@ add_library (cachelib_cachebench
./runner/ProgressTracker.cpp
./runner/Runner.cpp
./runner/Stressor.cpp
+ ./cache/components/RAMComponent.cpp
./util/AggregateStats.cpp
./util/CacheConfig.cpp
./util/Config.cpp

View File

@ -2,11 +2,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/CacheLib
REF "v${VERSION}"
SHA512 0290b51ac3461ae7622f5e916a44f005cf55dded1c7f36ca84e98dbb806f876bde97f187a31f5b0015fe1cc6fc6baa57eb5ecba6ebfa71b86e6a828d299c9763
SHA512 cb5b8b00ffc0fb3ee743416125875b25c62b9620e6dc6657bb3be0c93ae3e5be1f9c30577cac8db57518ccddf63b03a5980cd7626c3bb0059f48c3db1fd72345
HEAD_REF main
PATCHES
fix-build.patch
fix-glog.patch
fix-status-formmatable.patch
)
FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h

View File

@ -1,6 +1,6 @@
{
"name": "cachelib",
"version-string": "2025.05.19.00",
"version-string": "2026.02.23.00",
"description": "Pluggable caching engine to build and scale high performance cache services.",
"homepage": "https://github.com/facebook/CacheLib",
"license": "Apache-2.0",
@ -18,6 +18,7 @@
"gflags",
"glog",
"gtest",
"magic-enum",
"tsl-sparse-map",
{
"name": "vcpkg-cmake",

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6b2b2a810..787a83bb1c 100644
index 2f214f5..b45f528 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,24 +105,26 @@ endif ()
@@ -118,12 +118,15 @@ endif ()
# Find required dependencies for thrift/lib
if (THRIFT_LIB_ONLY OR build_all)
@ -12,33 +12,17 @@ index c6b2b2a810..787a83bb1c 100644
+ set(LIBGFLAGS_LIBRARY gflags::gflags)
+ find_package(glog CONFIG REQUIRED)
+ set(GLOG_LIBRARIES glog::glog)
find_package(folly CONFIG REQUIRED)
find_package(fizz CONFIG REQUIRED)
find_package(wangle CONFIG REQUIRED)
find_package(ZLIB REQUIRED)
- find_package(Zstd REQUIRED)
+ find_package(zstd CONFIG REQUIRED)
+ if(TARGET zstd::libzstd_shared)
+ set(ZSTD_LIBRARIES zstd::libzstd_shared)
+ elseif(TARGET zstd::libzstd_static)
+ set(ZSTD_LIBRARIES zstd::libzstd_static)
+ endif()
+ set(ZSTD_LIBRARIES zstd::libzstd)
find_package(Xxhash REQUIRED)
find_package(mvfst CONFIG REQUIRED)
# https://cmake.org/cmake/help/v3.9/module/FindThreads.html
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads)
include_directories(
- ${LIBGFLAGS_INCLUDE_DIR}
- ${GLOG_INCLUDE_DIRS}
- ${OPENSSL_INCLUDE_DIR}
- ${ZSTD_INCLUDE_DIRS}
- ${Xxhash_INCLUDE_DIR}
)
add_definitions("-DTHRIFT_HAVE_LIBSNAPPY=0")
if (THRIFT_LIB_ONLY)
diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in
index 5464fa1665..3dd2763629 100644
index e279485..4dd8bd1 100644
--- a/thrift/cmake/FBThriftConfig.cmake.in
+++ b/thrift/cmake/FBThriftConfig.cmake.in
@@ -29,9 +29,16 @@ else()

View File

@ -0,0 +1,13 @@
diff --git a/thrift/lib/cpp2/server/RoundRobinRequestPile.h b/thrift/lib/cpp2/server/RoundRobinRequestPile.h
index 3a06c5b..bae9387 100644
--- a/thrift/lib/cpp2/server/RoundRobinRequestPile.h
+++ b/thrift/lib/cpp2/server/RoundRobinRequestPile.h
@@ -21,6 +21,8 @@
#include <limits>
#include <memory>
+#include <fmt/ranges.h>
+
#include <folly/Executor.h>
#include <folly/concurrency/UnboundedQueue.h>
#include <folly/io/async/AtomicNotificationQueue.h>

View File

@ -1,11 +1,11 @@
diff --git a/thrift/lib/cpp2/security/SSLUtil.cpp b/thrift/lib/cpp2/security/SSLUtil.cpp
index 52a15b6..515e5b5 100644
index 571ffef..8803f37 100644
--- a/thrift/lib/cpp2/security/SSLUtil.cpp
+++ b/thrift/lib/cpp2/security/SSLUtil.cpp
@@ -133,7 +133,7 @@ folly::AsyncSocketTransport::UniquePtr moveToPlaintext(FizzSocket* fizzSock) {
@@ -144,7 +144,7 @@ folly::AsyncSocketTransport::UniquePtr toFDSocket(
auto sock = fizzSock->template getUnderlyingTransport<folly::AsyncSocket>();
folly::AsyncSocketTransport::UniquePtr plaintextTransport;
folly::AsyncSocketTransport::UniquePtr ret;
-#if defined(__linux__) && __has_include(<liburing.h>)
+#if defined(__linux__) && FOLLY_HAS_LIBURING
if (!sock &&

View File

@ -2,12 +2,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/fbthrift
REF "v${VERSION}"
SHA512 957b58b32b7cd7cbf58ebe1e65f8c9befbe5d48d8fa33ea36ff40a04f6c34f362d88c03d0060fa6681cd7fc8b5aa7063fbd9c16ded23df0fb091031bcb0668c1
SHA512 32f2a648496a321b6aaf55197c2dc1412d030ca82f8d8a5ca0516379379a0f71dc17e2edcb2be3972f76603935c7dcae29769c067caa1ec8a33e7f4efb251581
HEAD_REF main
PATCHES
fix-deps.patch
fix-test.patch
folly-has-liburing.diff
fix-fmt-include.patch
)
file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake")
@ -24,6 +24,7 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
"-Dthriftpy=OFF"
"-Denable_tests=OFF"
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fbthrift)
@ -32,6 +33,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# There should be no empty directories in vcpkg/packages/fbthrift_x64-linux
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/include/thrift/common/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test"
@ -60,6 +62,7 @@ file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/client/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/compression/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/core/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/framing/parser/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/payload/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/server/test"
@ -73,12 +76,13 @@ file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/python/capi/benchmark"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/python/conformance"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/python/conformance/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/python/server/interceptor/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/python/server/test"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/python/test/adapters"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/python/test/cpp_conversion"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/python/test/request_context_extractor"
"${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation"
)
vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN)
vcpkg_copy_pdbs()

View File

@ -1,6 +1,6 @@
{
"name": "fbthrift",
"version-string": "2025.05.19.00",
"version-string": "2026.02.23.00",
"description": "Facebook's branch of Apache Thrift, including a new C++ server.",
"homepage": "https://github.com/facebook/fbthrift",
"license": "Apache-2.0",

View File

@ -1,22 +1,29 @@
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
index cb536415..81824a45 100644
index 995d207..d266d67 100644
--- a/fizz/CMakeLists.txt
+++ b/fizz/CMakeLists.txt
@@ -50,7 +50,7 @@ find_package(folly CONFIG REQUIRED)
@@ -60,25 +60,28 @@ endif()
find_package(fmt CONFIG REQUIRED)
find_package(OpenSSL REQUIRED)
-find_package(Glog REQUIRED)
+find_package(glog CONFIG REQUIRED)
+set(GLOG_LIBRARIES glog::glog)
add_compile_definitions(GLOG_USE_GLOG_EXPORT)
find_package(Threads REQUIRED)
find_package(Zstd REQUIRED)
-find_package(Zstd REQUIRED)
+find_package(zstd CONFIG REQUIRED)
+set(ZSTD_LIBRARY zstd::libzstd)
if (UNIX AND NOT APPLE)
@@ -59,43 +59,23 @@ endif()
find_package(Librt)
endif()
include(CheckAtomic)
-find_package(Sodium REQUIRED)
-set(FIZZ_HAVE_SODIUM ${Sodium_FOUND})
+find_package(unofficial-sodium CONFIG REQUIRED)
+set(FIZZ_HAVE_SODIUM ${unofficial-sodium_FOUND})
SET(FIZZ_SHINY_DEPENDENCIES "")
SET(FIZZ_LINK_LIBRARIES "")
@ -24,27 +31,23 @@ index cb536415..81824a45 100644
-find_package(gflags CONFIG QUIET)
-if (gflags_FOUND)
- message(STATUS "Found gflags from package config")
- if (TARGET gflags-shared)
- list(APPEND FIZZ_SHINY_DEPENDENCIES gflags-shared)
- elseif (TARGET gflags)
- list(APPEND FIZZ_SHINY_DEPENDENCIES gflags)
- else()
- message(FATAL_ERROR "Unable to determine the target name for the GFlags package.")
- endif()
- list(APPEND CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARIES})
- list(APPEND CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
+find_package(gflags CONFIG REQUIRED)
+set(GFLAGS_LIBRARIES gflags::gflags)
+if (0)
message(STATUS "Found gflags from package config")
if (TARGET gflags-shared)
list(APPEND FIZZ_SHINY_DEPENDENCIES gflags-shared)
@@ -89,7 +92,7 @@ if (gflags_FOUND)
endif()
list(APPEND CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARIES})
list(APPEND CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
-else()
- find_package(Gflags REQUIRED MODULE)
- list(APPEND FIZZ_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
- list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
- list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBGFLAGS_LIBRARY})
- list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
+find_package(zstd CONFIG REQUIRED)
+if(TARGET zstd::libzstd_shared)
+ list(APPEND FIZZ_LINK_LIBRARIES zstd::libzstd_shared)
+elseif(TARGET zstd::libzstd_static)
+ list(APPEND FIZZ_LINK_LIBRARIES zstd::libzstd_static)
+elseif(0)
find_package(Gflags REQUIRED MODULE)
list(APPEND FIZZ_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
@@ -97,12 +100,13 @@ else()
list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
endif()
+find_package(gflags CONFIG REQUIRED)
@ -52,18 +55,15 @@ index cb536415..81824a45 100644
-find_package(Libevent CONFIG QUIET)
-if(TARGET event)
- message(STATUS "Found libevent from package config")
- list(APPEND FIZZ_SHINY_DEPENDENCIES event)
-else()
- find_package(Libevent MODULE REQUIRED)
- list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB})
- list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
-endif()
+find_package(Libevent CONFIG REQUIRED)
find_package(liboqs 0.11.0 CONFIG)
if (liboqs_FOUND)
@@ -193,28 +173,24 @@ target_include_directories(
+if(TARGET libevent::core)
message(STATUS "Found libevent from package config")
- list(APPEND FIZZ_SHINY_DEPENDENCIES event)
+ list(APPEND FIZZ_SHINY_DEPENDENCIES libevent::core)
else()
find_package(Libevent MODULE REQUIRED)
list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB})
@@ -209,12 +213,7 @@ target_include_directories(
$<BUILD_INTERFACE:${FIZZ_BASE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/generated>
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
@ -76,30 +76,16 @@ index cb536415..81824a45 100644
${FIZZ_INCLUDE_DIRECTORIES}
)
target_link_libraries(fizz
PUBLIC
- ${FOLLY_LIBRARIES}
- ${OPENSSL_LIBRARIES}
@@ -261,7 +260,7 @@ target_link_libraries(fizz
Folly::folly_portability_unistd
Folly::folly_detail_base64_detail_base64_api
${OPENSSL_LIBRARIES}
- sodium
+ Folly::folly
+ OpenSSL::SSL
+ OpenSSL::Crypto
+ unofficial-sodium::sodium
Threads::Threads
ZLIB::ZLIB
- ${ZSTD_LIBRARY}
PRIVATE
- ${GLOG_LIBRARIES}
- ${GFLAGS_LIBRARIES}
+ glog::glog
+ gflags::gflags
${FIZZ_LINK_LIBRARIES}
+ libevent::core
${CMAKE_DL_LIBS}
${LIBRT_LIBRARIES})
@@ -279,8 +255,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
${ZSTD_LIBRARY}
@@ -333,8 +332,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
SET(FIZZ_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
if(BUILD_TESTS)
@ -109,28 +95,11 @@ index cb536415..81824a45 100644
endif()
add_library(fizz_test_support
@@ -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)
- target_include_directories(
- ${test_name} PUBLIC ${LIBGMOCK_INCLUDE_DIR} ${LIBGTEST_INCLUDE_DIR})
- target_compile_definitions(${test_name} PUBLIC ${LIBGMOCK_DEFINES})
target_link_libraries(
${test_name}
fizz
fizz_test_support
- ${LIBGMOCK_LIBRARIES})
+ GTest::gtest
+ GTest::gmock)
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 9d07110a..a47bb998 100644
index 07b4d01..3004ad2 100644
--- a/fizz/cmake/fizz-config.cmake.in
+++ b/fizz/cmake/fizz-config.cmake.in
@@ -31,9 +31,18 @@ set(FIZZ_LIBRARIES fizz::fizz)
@@ -32,9 +32,18 @@ set(FIZZ_LIBRARIES fizz::fizz)
include(CMakeFindDependencyMacro)

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/fizz
REF "v${VERSION}"
SHA512 c3f0732d8eac8fe86daf27be9c596d7eb7a7f72b1d94ce77432948ab8755cb720386a17704bf8d00988999664d003164501edfef17c24df6136f332bfdefae7e
SHA512 0246c3add82002f648fd9844ab3f4062265049de3976a5e4cb92b5a8eea8ac3778254dac61364abd7cdc582b223d0d062049b5664100376913a2b153c5638afb
HEAD_REF main
PATCHES
fix-build.patch

View File

@ -1,6 +1,6 @@
{
"name": "fizz",
"version-string": "2025.05.19.00",
"version-string": "2026.02.23.00",
"description": "a TLS 1.3 implementation by Facebook",
"homepage": "https://github.com/facebookincubator/fizz",
"license": "BSD-3-Clause",

View File

@ -1,14 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc99ce3..d887a7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -481,9 +481,6 @@ add_library(folly_test_util
${FOLLY_DIR}/test/DeterministicSchedule.cpp
${FOLLY_DIR}/json/JsonTestUtil.cpp
)
-target_compile_definitions(folly_test_util PUBLIC
- FOLLY_CERTS_DIR="${FOLLY_DIR}/io/async/test/certs"
-)
set_property(TARGET folly_test_util PROPERTY VERSION ${PACKAGE_VERSION})
target_link_libraries(folly_test_util
PUBLIC

View File

@ -1,8 +1,8 @@
diff --git a/CMake/folly-config.cmake.in b/CMake/folly-config.cmake.in
index 0b96f0a..d5a200f 100644
index 5fc83ac..7efb0fc 100644
--- a/CMake/folly-config.cmake.in
+++ b/CMake/folly-config.cmake.in
@@ -29,10 +29,31 @@ endif()
@@ -34,10 +34,31 @@ endif()
set(FOLLY_LIBRARIES Folly::folly)
# Find folly's dependencies
@ -31,13 +31,13 @@ index 0b96f0a..d5a200f 100644
+endif()
set(Boost_USE_STATIC_LIBS "@FOLLY_BOOST_LINK_STATIC@")
-find_dependency(Boost 1.51.0 MODULE
+find_dependency(Boost
-find_package(Boost 1.69.0 REQUIRED
+find_dependency(Boost 1.69.0
COMPONENTS
context
filesystem
diff --git a/CMake/folly-config.h.cmake b/CMake/folly-config.h.cmake
index 9a309fb..7e6e05f 100644
index 1da1cc1..701ec99 100644
--- a/CMake/folly-config.h.cmake
+++ b/CMake/folly-config.h.cmake
@@ -16,6 +16,9 @@
@ -51,24 +51,11 @@ index 9a309fb..7e6e05f 100644
#include <TargetConditionals.h> // @manual
#endif
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
index 6ce4c67..a347cf0 100644
index 1c41750..6ab485c 100644
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
@@ -35,7 +35,7 @@ else()
endif()
set(Boost_USE_STATIC_LIBS "${FOLLY_BOOST_LINK_STATIC}")
-find_package(Boost 1.51.0 MODULE
+find_package(Boost
COMPONENTS
context
filesystem
@@ -45,17 +45,21 @@ find_package(Boost 1.51.0 MODULE
thread
REQUIRED
)
+set(Boost_LIBRARIES Boost::boost Boost::context Boost::filesystem Boost::program_options Boost::regex Boost::system Boost::thread)
list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES})
@@ -57,14 +57,17 @@ find_package(Boost 1.69.0 REQUIRED
# Per-target Boost dependencies are specified via EXTERNAL_DEPS
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
-find_package(DoubleConversion MODULE REQUIRED)
@ -89,7 +76,7 @@ index 6ce4c67..a347cf0 100644
set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
if(LIBGFLAGS_FOUND)
list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
@@ -64,16 +68,22 @@ if(LIBGFLAGS_FOUND)
@@ -73,7 +76,8 @@ if(LIBGFLAGS_FOUND)
set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
endif()
@ -97,8 +84,11 @@ index 6ce4c67..a347cf0 100644
+find_package(GLOG NAMES glog REQUIRED)
+set(GLOG_LIBRARY glog::glog)
set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
@@ -83,11 +87,16 @@ if (EXISTS "${GLOG_INCLUDE_DIR}/glog/export.h")
list(APPEND FOLLY_CXX_FLAGS -DGLOG_USE_GLOG_EXPORT)
endif()
-find_package(LibEvent MODULE REQUIRED)
+find_package(LIBEVENT NAMES Libevent REQUIRED)
@ -114,7 +104,7 @@ index 6ce4c67..a347cf0 100644
set(FOLLY_HAVE_LIBZ ${ZLIB_FOUND})
if (ZLIB_FOUND)
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS})
@@ -106,21 +116,24 @@ if (LIBLZMA_FOUND)
@@ -120,21 +129,24 @@ if (LIBLZMA_FOUND)
list(APPEND FOLLY_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
endif()
@ -142,7 +132,7 @@ index 6ce4c67..a347cf0 100644
set(FOLLY_HAVE_LIBSNAPPY ${SNAPPY_FOUND})
if (SNAPPY_FOUND)
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${SNAPPY_INCLUDE_DIR})
@@ -136,14 +149,19 @@ list(APPEND FOLLY_LINK_LIBRARIES ${LIBIBERTY_LIBRARIES})
@@ -150,14 +162,19 @@ list(APPEND FOLLY_LINK_LIBRARIES ${LIBIBERTY_LIBRARIES})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBIBERTY_INCLUDE_DIRS})
find_package(LibAIO)
@ -163,7 +153,7 @@ index 6ce4c67..a347cf0 100644
list(APPEND FOLLY_LINK_LIBRARIES ${LIBSODIUM_LIBRARIES})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBSODIUM_INCLUDE_DIRS})
@@ -160,6 +178,8 @@ list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
@@ -174,6 +191,8 @@ list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS})
if (LIBUNWIND_FOUND)
set(FOLLY_HAVE_LIBUNWIND ON)
@ -172,8 +162,32 @@ index 6ce4c67..a347cf0 100644
endif()
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
list(APPEND FOLLY_LINK_LIBRARIES "execinfo")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49dd964..b84f338 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -273,7 +273,8 @@ folly_resolve_deferred_dependencies()
# This points to the SSL test certificates used by TestSSLServer and related tests
if(TARGET folly_testing_test_util)
target_compile_definitions(folly_testing_test_util INTERFACE
- FOLLY_CERTS_DIR="${FOLLY_DIR}/io/async/test/certs"
+ $<BUILD_INTERFACE:FOLLY_CERTS_DIR="${FOLLY_DIR}/io/async/test/certs">
+ $<INSTALL_INTERFACE:FOLLY_CERTS_DIR="share/folly/">
)
endif()
@@ -285,7 +286,8 @@ add_library(folly_test_util
${FOLLY_DIR}/json/JsonTestUtil.cpp
)
target_compile_definitions(folly_test_util PUBLIC
- FOLLY_CERTS_DIR="${FOLLY_DIR}/io/async/test/certs"
+ $<BUILD_INTERFACE:FOLLY_CERTS_DIR="${FOLLY_DIR}/io/async/test/certs">
+ $<INSTALL_INTERFACE:FOLLY_CERTS_DIR="share/folly">
)
set_property(TARGET folly_test_util PROPERTY VERSION ${PACKAGE_VERSION})
target_link_libraries(folly_test_util
diff --git a/folly/io/async/AsyncIO.cpp b/folly/io/async/AsyncIO.cpp
index 93cda44..ac090bb 100644
index 2760e0f..a51c16c 100644
--- a/folly/io/async/AsyncIO.cpp
+++ b/folly/io/async/AsyncIO.cpp
@@ -35,7 +35,7 @@
@ -186,12 +200,12 @@ index 93cda44..ac090bb 100644
// debugging helpers
namespace {
diff --git a/folly/io/async/AsyncIO.h b/folly/io/async/AsyncIO.h
index b1a6f52..ba84609 100644
index 36c6df2..02ff518 100644
--- a/folly/io/async/AsyncIO.h
+++ b/folly/io/async/AsyncIO.h
@@ -18,7 +18,7 @@
#include <folly/experimental/io/AsyncBase.h>
#include <folly/io/async/AsyncBase.h>
-#if __has_include(<libaio.h>)
+#if FOLLY_HAS_LIBAIO
@ -211,7 +225,7 @@ index 8e81aaa..c7f4a67 100644
-#define FOLLY_HAS_LIBURING 0
#endif
diff --git a/folly/io/async/SimpleAsyncIO.cpp b/folly/io/async/SimpleAsyncIO.cpp
index 807a2be..551a003 100644
index cceb964..9f97e36 100644
--- a/folly/io/async/SimpleAsyncIO.cpp
+++ b/folly/io/async/SimpleAsyncIO.cpp
@@ -25,7 +25,7 @@

View File

@ -0,0 +1,14 @@
diff --git a/folly/detail/CMakeLists.txt b/folly/detail/CMakeLists.txt
index 521983f..7bbfb6d 100644
--- a/folly/detail/CMakeLists.txt
+++ b/folly/detail/CMakeLists.txt
@@ -182,6 +182,9 @@ folly_add_library(
EXTERNAL_DEPS
Boost::regex
)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ target_link_libraries(folly_detail_perf_scoped PUBLIC folly_subprocess)
+endif()
folly_add_library(
NAME poly_detail

View File

@ -6,13 +6,13 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF "v${VERSION}"
SHA512 6d377c48cf1c0796da6fad34b930e9608f3cd765a675414eaad45ff46e9d0b9bb5f027b187ec135e88bb60a83cb91c07d266a6673621caf3f9961942b55276e2
SHA512 8ee08591724fb1f6183cc0456c13cd00474e425d41824add2751fd3823e23b95ea69ec1b246bc85c95d30add854ee53dafd2bc1b824d0b555917dcbaf6943a6f
HEAD_REF main
PATCHES
fix-deps.patch
disable-uninitialized-resize-on-new-stl.patch
fix-unistd-include.patch
fix-absolute-dir.patch
fix-perf_scoped-target.patch
)
file(REMOVE "${SOURCE_PATH}/CMake/FindFastFloat.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")

View File

@ -1,6 +1,6 @@
{
"name": "folly",
"version-string": "2025.05.19.00",
"version-string": "2026.02.23.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",

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/mvfst
REF "v${VERSION}"
SHA512 eefc84958d57ba09bff3498899f5b71b3bd4afd54def56115c4ecd6e0506a14bd3912b3c8a8824d42c57b1842b7a493613e92cedc5ad2a9a702bda4e348788f2
SHA512 6669e5b3163f422b3b5b11f298ff16f4f6f196aef765fa4a3da7a4caa69b7675e4ab8a9f9eac0e2f07e5fa30e723af7ab2310d67ec5d1357723da15444333dea
HEAD_REF main
)

View File

@ -1,6 +1,6 @@
{
"name": "mvfst",
"version-string": "2025.05.19.00",
"version-string": "2026.02.23.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",

View File

@ -1,45 +1,81 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dde1bcd..f72165b 100644
index 75494ab..90f6595 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,11 +71,11 @@ endif()
@@ -75,26 +75,26 @@ endif()
#
# IMPORTANT: If you change this, make the analogous update in:
# cmake/proxygen-config.cmake.in
-find_package(fmt REQUIRED)
-find_package(folly REQUIRED)
-find_package(wangle REQUIRED)
-find_package(mvfst REQUIRED)
-find_package(Zstd REQUIRED)
+find_package(fmt CONFIG REQUIRED)
+find_package(folly CONFIG REQUIRED)
+find_package(wangle CONFIG REQUIRED)
+find_package(mvfst CONFIG REQUIRED)
# If deps are being built from source (FetchContent), skip find_package
if (NOT DEFINED folly_SOURCE_DIR)
- find_package(folly REQUIRED)
+ find_package(folly CONFIG REQUIRED)
endif()
if (NOT DEFINED fizz_SOURCE_DIR)
- find_package(fizz REQUIRED)
+ find_package(fizz CONFIG REQUIRED)
endif()
if (NOT DEFINED wangle_SOURCE_DIR)
- find_package(wangle REQUIRED)
+ find_package(wangle CONFIG REQUIRED)
endif()
if (NOT DEFINED mvfst_SOURCE_DIR)
- find_package(mvfst REQUIRED)
+ find_package(mvfst CONFIG REQUIRED)
endif()
-find_package(Zstd REQUIRED)
+find_package(zstd CONFIG REQUIRED)
find_package(ZLIB REQUIRED)
find_package(OpenSSL REQUIRED)
find_package(Threads)
@@ -130,6 +130,7 @@ SET(GFLAG_DEPENDENCIES "")
-find_package(Cares REQUIRED)
-find_package(Glog REQUIRED)
+find_package(c-ares REQUIRED)
+find_package(glog CONFIG REQUIRED)
# Propagate glog's required compile definition to all proxygen targets.
# glog 0.7+ requires GLOG_USE_GLOG_EXPORT but since glog::glog is linked
@@ -143,10 +143,14 @@ SET(GFLAG_DEPENDENCIES "")
SET(PROXYGEN_EXTRA_LINK_LIBRARIES "")
SET(PROXYGEN_EXTRA_INCLUDE_DIRECTORIES "")
-find_package(gflags CONFIG QUIET)
+set(GFLAGS_USE_TARGET_NAMESPACE ON)
find_package(gflags CONFIG QUIET)
+find_package(gflags CONFIG REQUIRED)
+set(GFLAGS_LIBRARIES gflags::gflags)
if (gflags_FOUND)
message("module path: ${CMAKE_MODULE_PATH}")
message(STATUS "Found gflags from package config")
+ list(APPEND GFLAG_DEPENDENCIES gflags::gflags)
+if(0)
if (TARGET gflags-shared)
list(APPEND GFLAG_DEPENDENCIES gflags-shared)
elseif (TARGET gflags)
@@ -155,6 +159,7 @@ if (gflags_FOUND)
message(FATAL_ERROR
"Unable to determine the target name for the GFlags package.")
endif()
+endif()
list(APPEND CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARIES})
list(APPEND CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
else()
diff --git a/cmake/proxygen-config.cmake.in b/cmake/proxygen-config.cmake.in
index 6849b0a..1d2cad2 100644
index bf1c508..18cb343 100644
--- a/cmake/proxygen-config.cmake.in
+++ b/cmake/proxygen-config.cmake.in
@@ -17,17 +17,21 @@
@@ -17,22 +17,26 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
-find_dependency(Glog)
-find_dependency(fmt)
-find_dependency(folly)
-find_dependency(wangle)
-find_dependency(mvfst)
-find_dependency(Fizz)
+find_dependency(glog CONFIG)
+find_dependency(fmt CONFIG)
+find_dependency(folly CONFIG)
+find_dependency(wangle CONFIG)
@ -59,20 +95,30 @@ index 6849b0a..1d2cad2 100644
find_dependency(ZLIB)
find_dependency(OpenSSL)
find_dependency(Threads)
diff --git a/proxygen/lib/CMakeLists.txt b/proxygen/lib/CMakeLists.txt
index 74a0284..71039e7 100644
--- a/proxygen/lib/CMakeLists.txt
+++ b/proxygen/lib/CMakeLists.txt
@@ -250,10 +250,10 @@ target_link_libraries(
Folly::folly
fizz::fizz
wangle::wangle
- zstd
+ zstd::libzstd
Boost::boost
Boost::iostreams
- -lz
+ ZLIB::ZLIB
${HTTP3_DEPEND_LIBS}
-find_dependency(c-ares REQUIRED)
+find_dependency(c-ares CONFIG)
if(NOT TARGET proxygen::proxygen)
include("${CMAKE_CURRENT_LIST_DIR}/proxygen-targets.cmake")
diff --git a/proxygen/lib/dns/CMakeLists.txt b/proxygen/lib/dns/CMakeLists.txt
index 527b5a4..6e640a3 100644
--- a/proxygen/lib/dns/CMakeLists.txt
+++ b/proxygen/lib/dns/CMakeLists.txt
@@ -61,7 +61,7 @@ proxygen_add_library(proxygen_dns_cares_dns
proxygen_utils_time_util
Folly::folly_conv
Folly::folly_portability_sockets
- cares
+ c-ares::cares
glog::glog
EXPORTED_DEPS
proxygen_dns_dns_base
@@ -69,7 +69,7 @@ proxygen_add_library(proxygen_dns_cares_dns
Folly::folly_io_async_async_base
Folly::folly_network_address
Folly::folly_portability_windows
- cares
+ c-ares::cares
)
proxygen_add_library(proxygen_dns_future_dns

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/proxygen
REF "v${VERSION}"
SHA512 7b122317ebd9d781df9568cfb991483e19ed2b8e2a76e5a12af7399e3a656b269e813784c65b490c6b45b9a0aa5658f4f0a5a64ed4fa5ade100b73fb3a9e6e8e
SHA512 308c82858b0de19992bd29e32518d08a2502020b933d1796f7b65686dc5d4c2707189aa6d15dfad5a021abb9021a25aa11ade0a2f5ddafc1cea23cbb4744b81c
HEAD_REF main
PATCHES
remove-register.patch
@ -20,14 +20,13 @@ vcpkg_cmake_configure(
"-DPROXYGEN_PYTHON=${PYTHON3}"
-DVCPKG_LOCK_FIND_PACKAGE_gflags=ON
-DCMAKE_INSTALL_DIR=share/proxygen
-DBUILD_SAMPLES=OFF
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup()
vcpkg_copy_tools(TOOL_NAMES hq proxygen_curl proxygen_echo proxygen_h3datagram_client proxygen_httperf2 proxygen_proxy proxygen_push proxygen_static AUTO_CLEAN)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -1,6 +1,6 @@
{
"name": "proxygen",
"version-string": "2025.05.19.00",
"version-string": "2026.02.23.00",
"description": "It comprises the core C++ HTTP abstractions used at Facebook.",
"homepage": "https://github.com/facebook/proxygen",
"license": "BSD-3-Clause",
@ -14,6 +14,7 @@
"boost-regex",
"boost-system",
"boost-thread",
"c-ares",
"fizz",
"folly",
"gflags",

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f69e907..22570b5 100644
index c736ccb..0fa98c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,7 @@ option(BUILD_BENCHMARKS "Build benchmarks" ON)
@@ -129,7 +129,7 @@ option(BUILD_BENCHMARKS "Build benchmarks" ON)
option(BUILD_EXAMPLES "Build examples" ON)
option(BUILD_TESTS "Build tests" ON)
@ -11,7 +11,7 @@ index f69e907..22570b5 100644
include(ExternalProject)
include(CTest)
@@ -172,7 +172,9 @@ endif()
@@ -177,7 +177,9 @@ endif()
if("${BUILD_TYPE_LOWER}" MATCHES "debug")
message("debug mode was set")
@ -21,7 +21,7 @@ index f69e907..22570b5 100644
else()
message("release mode was set")
endif()
@@ -181,18 +183,25 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
@@ -186,18 +188,22 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(TEST_CXX_FLAGS ${TEST_CXX_FLAGS} -Wno-inconsistent-missing-override)
endif()
@ -32,28 +32,23 @@ index f69e907..22570b5 100644
-find_package(Gflags REQUIRED)
+find_package(gflags CONFIG REQUIRED)
+set(gflags gflags::gflags)
-# find glog::glog to satisfy the folly dep.
# find glog::glog to satisfy the folly dep.
-find_package(Glog REQUIRED)
+find_package(glog CONFIG REQUIRED)
+find_package(folly CONFIG REQUIRED)
+find_package(ZLIB REQUIRED)
-find_package(fmt CONFIG REQUIRED)
+if (BUILD_SHARED_LIBS)
+ set(gflags gflags_shared)
+else()
+ set(gflags gflags_static)
+endif()
find_package(fmt CONFIG REQUIRED)
-include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
+# find glog::glog to satisfy the folly dep.
+find_package(folly CONFIG REQUIRED)
+#find_package(glog CONFIG REQUIRED)
+
+#
+#find_package(fmt CONFIG REQUIRED)
include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR})
@@ -327,7 +336,7 @@ target_compile_options(
@@ -332,7 +338,7 @@ target_compile_options(
ReactiveSocket
PRIVATE ${EXTRA_CXX_FLAGS})
@ -62,7 +57,7 @@ index f69e907..22570b5 100644
install(TARGETS ReactiveSocket EXPORT rsocket-exports DESTINATION lib)
install(DIRECTORY rsocket DESTINATION include FILES_MATCHING PATTERN "*.h")
@@ -470,7 +479,7 @@ if(BUILD_TESTS)
@@ -475,7 +481,7 @@ if(BUILD_TESTS)
${GMOCK_LIBS} # This also needs the preceding `add_dependencies`
glog::glog
gflags
@ -72,23 +67,34 @@ index f69e907..22570b5 100644
# Download the latest TCK drivers JAR.
set(TCK_DRIVERS_JAR rsocket-tck-drivers-0.9.10.jar)
diff --git a/yarpl/CMakeLists.txt b/yarpl/CMakeLists.txt
index f4159b8..8c01ffb 100644
index f4159b8..65974e3 100644
--- a/yarpl/CMakeLists.txt
+++ b/yarpl/CMakeLists.txt
@@ -53,8 +53,14 @@ endif()
@@ -10,7 +10,6 @@ set(CMAKE_MODULE_PATH
)
add_definitions(-std=c++14)
-option(BUILD_TESTS "BUILD_TESTS" ON)
# Generate compilation database
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
@@ -53,8 +52,8 @@ endif()
# Using NDEBUG in Release builds.
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
-find_package(Gflags REQUIRED)
-find_package(Glog REQUIRED)
+find_package(gflags CONFIG REQUIRED)
+if (BUILD_SHARED_LIBS)
+ set(gflags gflags_shared)
+else()
+ set(gflags gflags_static)
+endif()
+
+find_package(glog CONFIG REQUIRED)
+#find_package(Gflags REQUIRED)
+#find_package(Glog REQUIRED)
find_package(fmt CONFIG REQUIRED)
IF(NOT FOLLY_VERSION)
@@ -125,7 +124,7 @@ target_link_libraries(
yarpl
PUBLIC Folly::folly glog::glog gflags
INTERFACE ${EXTRA_LINK_FLAGS})
-
+target_compile_definitions(yarpl PUBLIC GLOG_USE_GLOG_EXPORT)
include(CMakePackageConfigHelpers)
configure_package_config_file(
cmake/yarpl-config.cmake.in

View File

@ -1,5 +1,5 @@
diff --git a/rsocket/transports/tcp/TcpConnectionFactory.cpp b/rsocket/transports/tcp/TcpConnectionFactory.cpp
index b970cd75..cba4405e 100644
index b970cd7..cba4405 100644
--- a/rsocket/transports/tcp/TcpConnectionFactory.cpp
+++ b/rsocket/transports/tcp/TcpConnectionFactory.cpp
@@ -41,7 +41,7 @@ class ConnectCallback : public folly::AsyncSocket::ConnectCallback {
@ -12,19 +12,18 @@ index b970cd75..cba4405e 100644
#error ALPN is required for rsockets. \
Your version of OpenSSL is likely too old.
diff --git a/yarpl/CMakeLists.txt b/yarpl/CMakeLists.txt
index f4159b82..33364f58 100644
index 65974e3..9392738 100644
--- a/yarpl/CMakeLists.txt
+++ b/yarpl/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH
@@ -9,14 +9,14 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
)
-add_definitions(-std=c++14)
+add_definitions(-std=c++17)
option(BUILD_TESTS "BUILD_TESTS" ON)
# Generate compilation database
@@ -17,7 +17,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
# Common configuration for all build modes.
if (NOT MSVC)
@ -34,7 +33,7 @@ index f4159b82..33364f58 100644
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-weak-vtables -Wno-padded")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer")
diff --git a/yarpl/flowable/Flowable_FromObservable.h b/yarpl/flowable/Flowable_FromObservable.h
index e191ad7c..ce8565c8 100644
index e191ad7..ce8565c 100644
--- a/yarpl/flowable/Flowable_FromObservable.h
+++ b/yarpl/flowable/Flowable_FromObservable.h
@@ -180,7 +180,7 @@ class BufferBackpressureStrategy : public BackpressureStrategyBase<T> {

View File

@ -1,22 +0,0 @@
diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in
index e50af54..e0fd0dc 100644
--- a/wangle/cmake/wangle-config.cmake.in
+++ b/wangle/cmake/wangle-config.cmake.in
@@ -12,7 +12,16 @@
@PACKAGE_INIT@
set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set_and_check(WANGLE_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@")
+set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle")
+
+include(CMakeFindDependencyMacro)
+find_dependency(folly REQUIRED)
+find_dependency(fizz REQUIRED)
+find_dependency(glog REQUIRED)
+find_dependency(Threads REQUIRED)
+find_dependency(Libevent REQUIRED)
+find_dependency(OpenSSL REQUIRED)
+find_dependency(double-conversion REQUIRED)
if (NOT TARGET wangle::wangle)
include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake")

View File

@ -1,14 +1,15 @@
diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
index 85ae066..766d3d3 100644
index 1655b55..9f0fd88 100644
--- a/wangle/CMakeLists.txt
+++ b/wangle/CMakeLists.txt
@@ -64,18 +64,23 @@ set(CMAKE_INSTALL_DIR lib/cmake/wangle CACHE STRING
find_package(folly CONFIG REQUIRED)
find_package(fizz CONFIG REQUIRED)
@@ -76,23 +76,35 @@ endif()
if (NOT DEFINED fizz_SOURCE_DIR)
find_package(fizz CONFIG REQUIRED)
endif()
-find_package(fmt CONFIG REQUIRED)
find_package(OpenSSL REQUIRED)
-find_package(Glog REQUIRED)
add_compile_definitions(GLOG_USE_GLOG_EXPORT)
-find_package(gflags CONFIG QUIET)
+find_package(glog CONFIG REQUIRED)
+find_package(gflags CONFIG REQUIRED)
@ -31,10 +32,7 @@ index 85ae066..766d3d3 100644
find_package(Threads REQUIRED)
if (UNIX AND NOT APPLE)
find_package(Librt)
@@ -166,6 +171,14 @@ target_include_directories(
${LIBEVENT_INCLUDE_DIR}
${DOUBLE_CONVERSION_INCLUDE_DIR}
)
endif()
+set(Boost_LIBRARIES Boost::boost Boost::filesystem Boost::thread )
+set(FOLLY_LIBRARIES Folly::folly)
+set(FIZZ_LIBRARIES fizz::fizz)
@ -42,25 +40,21 @@ index 85ae066..766d3d3 100644
+set(GFLAGS_LIBRARIES gflags::gflags)
+set(LIBEVENT_LIB libevent::core libevent::extra)
+set(DOUBLE_CONVERSION_LIBRARIES double-conversion::double-conversion)
+
target_link_libraries(wangle PUBLIC
${FOLLY_LIBRARIES}
${FIZZ_LIBRARIES}
include(CheckAtomic)
diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in
index e0fd0dc..5f6cf14 100644
index 2ccf338..01d135f 100644
--- a/wangle/cmake/wangle-config.cmake.in
+++ b/wangle/cmake/wangle-config.cmake.in
@@ -15,13 +15,19 @@ set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle")
@@ -12,7 +12,22 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
-find_dependency(folly REQUIRED)
-find_dependency(fizz REQUIRED)
-find_dependency(glog REQUIRED)
-find_dependency(Threads REQUIRED)
-find_dependency(Libevent REQUIRED)
-find_dependency(OpenSSL REQUIRED)
-find_dependency(double-conversion REQUIRED)
set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set_and_check(WANGLE_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@")
+set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle")
+
+include(CMakeFindDependencyMacro)
+find_dependency(folly CONFIG)
+find_dependency(fizz CONFIG)
+find_dependency(gflags CONFIG)

View File

@ -4,10 +4,9 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/wangle
REF "v${VERSION}"
SHA512 d595350fe4ce16f96f93b4922d86035da7aa40c04a6557db09b715b800a275f19ca0e57028eaa558d3512999bfd8c2399d13f540f9f85ceacb4a13d33a3265db
SHA512 47c55ff1cdf2a2f4be6300709b9b099de269a37df887f2de89bb4d0d78af4e245b7a900daf5bc116c30438e2ca4a96f8d03b06303a3448a842b2f671e63c7772
HEAD_REF main
PATCHES
fix-config-cmake.patch
fix_dependency.patch
)

View File

@ -1,6 +1,6 @@
{
"name": "wangle",
"version-string": "2025.05.19.00",
"version-string": "2026.02.23.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",

View File

@ -1573,7 +1573,7 @@
"port-version": 0
},
"cachelib": {
"baseline": "2025.05.19.00",
"baseline": "2026.02.23.00",
"port-version": 0
},
"cadons-ctus": {
@ -2961,7 +2961,7 @@
"port-version": 1
},
"fbthrift": {
"baseline": "2025.05.19.00",
"baseline": "2026.02.23.00",
"port-version": 0
},
"fcl": {
@ -3021,7 +3021,7 @@
"port-version": 0
},
"fizz": {
"baseline": "2025.05.19.00",
"baseline": "2026.02.23.00",
"port-version": 0
},
"fkyaml": {
@ -3113,7 +3113,7 @@
"port-version": 0
},
"folly": {
"baseline": "2025.05.19.00",
"baseline": "2026.02.23.00",
"port-version": 0
},
"font-chef": {
@ -6685,7 +6685,7 @@
"port-version": 7
},
"mvfst": {
"baseline": "2025.05.19.00",
"baseline": "2026.02.23.00",
"port-version": 0
},
"mxml": {
@ -7869,7 +7869,7 @@
"port-version": 0
},
"proxygen": {
"baseline": "2025.05.19.00",
"baseline": "2026.02.23.00",
"port-version": 0
},
"psimd": {
@ -10593,7 +10593,7 @@
"port-version": 0
},
"wangle": {
"baseline": "2025.05.19.00",
"baseline": "2026.02.23.00",
"port-version": 0
},
"wasmedge": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "27b382586c2a10dee1a9ce2292b041da69566e3c",
"version-string": "2026.02.23.00",
"port-version": 0
},
{
"git-tree": "3a881680173228cd9774eaa64e4219ef4acbec33",
"version-string": "2025.05.19.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "62cd8c41f669b938eb078d7b255ffd0160f53917",
"version-string": "2026.02.23.00",
"port-version": 0
},
{
"git-tree": "292c96666c8ca212f5849986ee2c73d0da51c047",
"version-string": "2025.05.19.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "538e6c72a696be9e6a02150fcd50534cabf26acd",
"version-string": "2026.02.23.00",
"port-version": 0
},
{
"git-tree": "a4b1d6d22aceff251208022c426aa7bb7b8751df",
"version-string": "2025.05.19.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9906c8bf3be59d5410ea3d6c10b59a5c2c7b6557",
"version-string": "2026.02.23.00",
"port-version": 0
},
{
"git-tree": "f9c08705bb250c9a6e23d00429fe6ee2736d0eb7",
"version-string": "2025.05.19.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0d0cd3973d40641ef8ff9bd141046f57ec041ed8",
"version-string": "2026.02.23.00",
"port-version": 0
},
{
"git-tree": "2f2aa3ac3cdb7ef9e1b88af478f34e1814df0385",
"version-string": "2025.05.19.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5e7a81c7aeeb257add01312e65e1d8396a56ea4c",
"version-string": "2026.02.23.00",
"port-version": 0
},
{
"git-tree": "f79a533cbb5b4184b3e36ea1e3d994e56ef957bf",
"version-string": "2025.05.19.00",

View File

@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "c0da11bfe773e995165d1a052406e5b95374cf0d",
"git-tree": "3b61c1245f76a5ff7c65a47ce3d35e6e061597c6",
"version-string": "2021.08.30.00",
"port-version": 5
},

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6e088aaafa30afd0fbdabbe51a2afc2b69282e78",
"version-string": "2026.02.23.00",
"port-version": 0
},
{
"git-tree": "834d5b6f2371af834a9137f5f85675390e621ca8",
"version-string": "2025.05.19.00",