This is an automated email from the ASF dual-hosted git repository.
philo-he pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 3605200903 [VL] Support FB_OS v2026.09.07.00 (#13102)
3605200903 is described below
commit 3605200903f1a500e94a9fa41df40caf1ca6c105
Author: Yuan <[email protected]>
AuthorDate: Thu Sep 24 17:58:56 2026 +0100
[VL] Support FB_OS v2026.09.07.00 (#13102)
---
.../fbthrift/compactv1-protocol-refiller.patch | 23 ----
dev/vcpkg/ports/fbthrift/fix-deps.patch | 24 ++---
dev/vcpkg/ports/fbthrift/folly-has-liburing.diff | 13 ---
dev/vcpkg/ports/fbthrift/portfile.cmake | 4 +-
dev/vcpkg/ports/fbthrift/vcpkg.json | 2 +-
dev/vcpkg/ports/fizz/fix-build.patch | 120 +++++++++++++++++++++
dev/vcpkg/ports/fizz/portfile.cmake | 43 ++++++++
dev/vcpkg/ports/fizz/vcpkg.json | 27 +++++
.../disable-uninitialized-resize-on-new-stl.patch | 14 +--
dev/vcpkg/ports/folly/fix-deps.patch | 22 ++--
dev/vcpkg/ports/folly/fix-perf_scoped-target.patch | 14 ---
dev/vcpkg/ports/folly/portfile.cmake | 3 +-
dev/vcpkg/ports/folly/vcpkg.json | 2 +-
dev/vcpkg/ports/mvfst/portfile.cmake | 4 +-
dev/vcpkg/ports/mvfst/removexsk.patch | 13 ---
dev/vcpkg/ports/mvfst/vcpkg.json | 2 +-
dev/vcpkg/ports/wangle/fix_dependency.patch | 76 +++++++++++++
dev/vcpkg/ports/wangle/portfile.cmake | 51 +++++++++
dev/vcpkg/ports/wangle/usage | 4 +
dev/vcpkg/ports/{fbthrift => wangle}/vcpkg.json | 20 ++--
dev/vcpkg/vcpkg.json | 2 +-
ep/build-velox/src/setup-centos8.sh | 2 +-
ep/build-velox/src/setup-openeuler24.sh | 2 +-
23 files changed, 364 insertions(+), 123 deletions(-)
diff --git a/dev/vcpkg/ports/fbthrift/compactv1-protocol-refiller.patch
b/dev/vcpkg/ports/fbthrift/compactv1-protocol-refiller.patch
deleted file mode 100644
index 315590b44d..0000000000
--- a/dev/vcpkg/ports/fbthrift/compactv1-protocol-refiller.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/thrift/lib/cpp2/protocol/ProtocolReaderWithRefill.h
-+++ b/thrift/lib/cpp2/protocol/ProtocolReaderWithRefill.h
-@@ -172,6 +172,20 @@
- protocol_.skipBytes(bytes);
- }
-
-+ protected:
-+ /**
-+ * Allow derived refill readers to use this helper where they cannot access
-+ * CompactProtocolReader::in_ directly (due to not having a friend
-+ * declaration).
-+ * Allows users to implement refill readers for CompactV1ProtocolReader if
-+ * necessary, without supporting it in the Thrift codebase or having to
patch
-+ * in a friend declaration.
-+ */
-+ template <typename T>
-+ T readLEFromBuffer() {
-+ return protocol_.in_.template readLE<T>();
-+ }
-+
- private:
- /**
- * Make sure a varint can be read from the current buffer after idx bytes.
diff --git a/dev/vcpkg/ports/fbthrift/fix-deps.patch
b/dev/vcpkg/ports/fbthrift/fix-deps.patch
index 0e423cdf07..8fd493c3d3 100644
--- a/dev/vcpkg/ports/fbthrift/fix-deps.patch
+++ b/dev/vcpkg/ports/fbthrift/fix-deps.patch
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f214f5..b45f528 100644
+index c48d560..2f88099 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -118,12 +118,15 @@ endif ()
+@@ -135,14 +135,17 @@ endif ()
# Find required dependencies for thrift/lib
if (THRIFT_LIB_ONLY OR build_all)
@@ -12,27 +12,27 @@ index 2f214f5..b45f528 100644
+ set(LIBGFLAGS_LIBRARY gflags::gflags)
+ find_package(glog CONFIG REQUIRED)
+ set(GLOG_LIBRARIES glog::glog)
- find_package(fizz CONFIG REQUIRED)
- find_package(wangle CONFIG REQUIRED)
+ if (THRIFT_RPC)
+ find_package(fizz CONFIG REQUIRED)
+ find_package(wangle CONFIG REQUIRED)
+ endif ()
find_package(ZLIB REQUIRED)
- find_package(Zstd REQUIRED)
+ find_package(zstd CONFIG REQUIRED)
+ set(ZSTD_LIBRARIES zstd::libzstd)
find_package(Xxhash REQUIRED)
- find_package(mvfst CONFIG REQUIRED)
- # https://cmake.org/cmake/help/v3.9/module/FindThreads.html
+ if (THRIFT_RPC)
+ find_package(mvfst CONFIG REQUIRED)
diff --git a/thrift/cmake/FBThriftConfig.cmake.in
b/thrift/cmake/FBThriftConfig.cmake.in
-index e279485..4dd8bd1 100644
+index 9aee56b..4d3616b 100644
--- a/thrift/cmake/FBThriftConfig.cmake.in
+++ b/thrift/cmake/FBThriftConfig.cmake.in
-@@ -29,9 +29,16 @@ else()
- set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1")
+@@ -45,8 +45,15 @@ if (NOT Xxhash_FOUND)
+ return()
endif()
--find_dependency(Xxhash REQUIRED)
-find_dependency(ZLIB REQUIRED)
--find_package(mvfst CONFIG REQUIRED)
-+find_dependency(xxHash CONFIG)
+-find_package(mvfst CONFIG)
+find_dependency(ZLIB)
+find_dependency(mvfst CONFIG)
+find_dependency(fizz CONFIG)
diff --git a/dev/vcpkg/ports/fbthrift/folly-has-liburing.diff
b/dev/vcpkg/ports/fbthrift/folly-has-liburing.diff
deleted file mode 100644
index 47dc5b6ce4..0000000000
--- a/dev/vcpkg/ports/fbthrift/folly-has-liburing.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/thrift/lib/cpp2/security/SSLUtil.cpp
b/thrift/lib/cpp2/security/SSLUtil.cpp
-index 571ffef..8803f37 100644
---- a/thrift/lib/cpp2/security/SSLUtil.cpp
-+++ b/thrift/lib/cpp2/security/SSLUtil.cpp
-@@ -144,7 +144,7 @@ folly::AsyncSocketTransport::UniquePtr toFDSocket(
-
- auto sock = fizzSock->template getUnderlyingTransport<folly::AsyncSocket>();
- folly::AsyncSocketTransport::UniquePtr ret;
--#if defined(__linux__) && __has_include(<liburing.h>)
-+#if defined(__linux__) && FOLLY_HAS_LIBURING
- if (!sock &&
- fizzSock->template getUnderlyingTransport<folly::AsyncIoUringSocket>())
{
- // `AsyncFdSocket` currently lacks uring support, so hardcode
`AsyncSocket`
diff --git a/dev/vcpkg/ports/fbthrift/portfile.cmake
b/dev/vcpkg/ports/fbthrift/portfile.cmake
index ea16a0152c..144fd14691 100644
--- a/dev/vcpkg/ports/fbthrift/portfile.cmake
+++ b/dev/vcpkg/ports/fbthrift/portfile.cmake
@@ -2,13 +2,11 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/fbthrift
REF "v${VERSION}"
- SHA512
32f2a648496a321b6aaf55197c2dc1412d030ca82f8d8a5ca0516379379a0f71dc17e2edcb2be3972f76603935c7dcae29769c067caa1ec8a33e7f4efb251581
+ SHA512
f8693bd82c6cee898886bb9ec1cb5c5c6672fbb3bed6b520c40d6cfff66e1ff5c15266f2141c8d1f80e0ebbdce4988981ce98986f6badc0445455fa71b1a7acd
HEAD_REF main
PATCHES
fix-deps.patch
- folly-has-liburing.diff
fix-fmt-include.patch
- compactv1-protocol-refiller.patch # patch from velox
)
file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake")
diff --git a/dev/vcpkg/ports/fbthrift/vcpkg.json
b/dev/vcpkg/ports/fbthrift/vcpkg.json
index b9d08323f2..fe72dd23a7 100644
--- a/dev/vcpkg/ports/fbthrift/vcpkg.json
+++ b/dev/vcpkg/ports/fbthrift/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "fbthrift",
- "version-string": "2026.02.23.00",
+ "version-string": "2026.09.07.00",
"description": "Facebook's branch of Apache Thrift, including a new C++
server.",
"homepage": "https://github.com/facebook/fbthrift";,
"license": "Apache-2.0",
diff --git a/dev/vcpkg/ports/fizz/fix-build.patch
b/dev/vcpkg/ports/fizz/fix-build.patch
new file mode 100644
index 0000000000..2aa4304156
--- /dev/null
+++ b/dev/vcpkg/ports/fizz/fix-build.patch
@@ -0,0 +1,120 @@
+diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
+index 4685146..e3221d0 100644
+--- a/fizz/CMakeLists.txt
++++ b/fizz/CMakeLists.txt
+@@ -65,26 +65,29 @@ include(FizzOptions)
+ # Glog is only required in the default GLOG backend; XLOG routes through
+ # folly::xlog and DISABLED strips logging entirely.
+ if(FIZZ_LOGGING_BACKEND STREQUAL "GLOG")
+- find_package(Glog REQUIRED)
++ find_package(glog CONFIG REQUIRED)
++ set(GLOG_LIBRARIES glog::glog)
+ add_compile_definitions(GLOG_USE_GLOG_EXPORT)
+ endif()
+ find_package(Threads REQUIRED)
+-find_package(Zstd REQUIRED)
++find_package(zstd CONFIG REQUIRED)
++set(ZSTD_LIBRARY zstd::libzstd)
+ if (UNIX AND NOT APPLE)
+ 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 "")
+ SET(FIZZ_INCLUDE_DIRECTORIES "")
+
+-find_package(gflags CONFIG QUIET)
+-if (gflags_FOUND)
++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)
+@@ -95,7 +98,7 @@ if (gflags_FOUND)
+ endif()
+ list(APPEND CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARIES})
+ list(APPEND CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
+-else()
++elseif(0)
+ find_package(Gflags REQUIRED MODULE)
+ list(APPEND FIZZ_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
+ list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
+@@ -103,12 +106,13 @@ else()
+ list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
+ endif()
+
++find_package(gflags CONFIG REQUIRED)
+ find_package(ZLIB REQUIRED)
+
+-find_package(Libevent CONFIG QUIET)
+-if(TARGET event)
++find_package(Libevent CONFIG REQUIRED)
++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})
+@@ -214,10 +218,6 @@ target_include_directories(
+ $<BUILD_INTERFACE:${FIZZ_BASE_DIR}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/generated>
+ $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
+- ${FOLLY_INCLUDE_DIR}
+- ${OPENSSL_INCLUDE_DIR}
+- ${sodium_INCLUDE_DIR}
+- ${ZSTD_INCLUDE_DIR}
+ PRIVATE
+ ${FIZZ_INCLUDE_DIRECTORIES}
+ )
+@@ -268,7 +268,7 @@ target_link_libraries(fizz
+ Folly::folly_portability_unistd
+ Folly::folly_detail_base64_detail_base64_api
+ ${OPENSSL_LIBRARIES}
+- sodium
++ unofficial-sodium::sodium
+ Threads::Threads
+ ZLIB::ZLIB
+ ${ZSTD_LIBRARY}
+@@ -348,8 +348,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
+ SET(FIZZ_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+
+ if(BUILD_TESTS)
+- find_package(GMock 1.8.0 MODULE REQUIRED)
+- find_package(GTest 1.8.0 MODULE REQUIRED)
++ find_package(GTest CONFIG REQUIRED)
+ endif()
+
+ add_library(fizz_test_support
+diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
+index 07b4d01..3004ad2 100644
+--- a/fizz/cmake/fizz-config.cmake.in
++++ b/fizz/cmake/fizz-config.cmake.in
+@@ -32,9 +32,18 @@ set(FIZZ_LIBRARIES fizz::fizz)
+
+ include(CMakeFindDependencyMacro)
+
+-find_dependency(Sodium)
++find_dependency(unofficial-sodium CONFIG)
+ find_dependency(folly CONFIG)
+ find_dependency(ZLIB)
++find_dependency(Libevent CONFIG)
++find_dependency(fmt CONFIG)
++find_dependency(OpenSSL)
++find_dependency(glog CONFIG)
++find_dependency(double-conversion CONFIG)
++find_dependency(Threads)
++find_dependency(gflags CONFIG)
++find_dependency(zstd CONFIG)
++find_dependency(GTest CONFIG)
+ if(FIZZ_HAVE_OQS)
+ find_dependency(liboqs CONFIG)
+ endif()
diff --git a/dev/vcpkg/ports/fizz/portfile.cmake
b/dev/vcpkg/ports/fizz/portfile.cmake
new file mode 100644
index 0000000000..8c0b3a601c
--- /dev/null
+++ b/dev/vcpkg/ports/fizz/portfile.cmake
@@ -0,0 +1,43 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO facebookincubator/fizz
+ REF "v${VERSION}"
+ SHA512
6092badf0fd666957e70d37bf23d7c2a5a8453e00701fc0ab37e90ea680a4be6fa3ec7e1f5ef82726bc3cfa517f337a319fc6b77afa40bab0dbe64f25f8f3ae8
+ HEAD_REF main
+ PATCHES
+ fix-build.patch
+)
+
+# Prefer installed config files
+file(REMOVE
+ "${SOURCE_PATH}/fizz/cmake/FindGMock.cmake"
+ "${SOURCE_PATH}/fizz/cmake/FindGflags.cmake"
+ "${SOURCE_PATH}/fizz/cmake/FindGlog.cmake"
+ "${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake"
+)
+
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}/fizz"
+ OPTIONS
+ -DBUILD_TESTS=OFF
+ -DBUILD_EXAMPLES=OFF
+ -DINCLUDE_INSTALL_DIR:STRING=include
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fizz)
+vcpkg_copy_pdbs()
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake"
"lib/cmake/fizz" "share/fizz")
+
+file(REMOVE_RECURSE
+ "${CURRENT_PACKAGES_DIR}/debug/include"
+ "${CURRENT_PACKAGES_DIR}/include/fizz/crypto/aead/test/facebook"
+ "${CURRENT_PACKAGES_DIR}/include/fizz/record/test/facebook"
+ "${CURRENT_PACKAGES_DIR}/include/fizz/server/test/facebook"
+ "${CURRENT_PACKAGES_DIR}/include/fizz/tool/test"
+ "${CURRENT_PACKAGES_DIR}/include/fizz/util/test")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/dev/vcpkg/ports/fizz/vcpkg.json b/dev/vcpkg/ports/fizz/vcpkg.json
new file mode 100644
index 0000000000..9e3c7ca78d
--- /dev/null
+++ b/dev/vcpkg/ports/fizz/vcpkg.json
@@ -0,0 +1,27 @@
+{
+ "name": "fizz",
+ "version-string": "2026.09.07.00",
+ "description": "a TLS 1.3 implementation by Facebook",
+ "homepage": "https://github.com/facebookincubator/fizz";,
+ "license": "BSD-3-Clause",
+ "dependencies": [
+ "double-conversion",
+ "fmt",
+ "folly",
+ "gflags",
+ "glog",
+ "gtest",
+ "libevent",
+ "libsodium",
+ "openssl",
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ },
+ "zstd"
+ ]
+}
diff --git
a/dev/vcpkg/ports/folly/disable-uninitialized-resize-on-new-stl.patch
b/dev/vcpkg/ports/folly/disable-uninitialized-resize-on-new-stl.patch
index 6e7b6b5718..5a50a6fce4 100644
--- a/dev/vcpkg/ports/folly/disable-uninitialized-resize-on-new-stl.patch
+++ b/dev/vcpkg/ports/folly/disable-uninitialized-resize-on-new-stl.patch
@@ -1,10 +1,10 @@
diff --git a/folly/memory/UninitializedMemoryHacks.h
b/folly/memory/UninitializedMemoryHacks.h
-index daf5eb735..1ac44d6b2 100644
+index 9babda4..6e2f505 100644
--- a/folly/memory/UninitializedMemoryHacks.h
+++ b/folly/memory/UninitializedMemoryHacks.h
-@@ -101,6 +101,9 @@ template <
- typename
std::enable_if<std::is_trivially_destructible<T>::value>::type>
- inline void resizeWithoutInitialization(
+@@ -105,6 +105,9 @@ template <typename T>
+ requires std::is_trivially_destructible_v<T>
+ inline void resizeWithoutInitializationImpl(
std::basic_string<T>& s, std::size_t n) {
+#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L
+ s.resize(n);
@@ -12,15 +12,15 @@ index daf5eb735..1ac44d6b2 100644
if (n <= s.size()) {
s.resize(n);
} else {
-@@ -111,6 +114,7 @@ inline void resizeWithoutInitialization(
+@@ -115,6 +118,7 @@ inline void resizeWithoutInitializationImpl(
}
- detail::unsafeStringSetLargerSize(s, n);
+ unsafeStringSetLargerSize(s, n);
}
+#endif // defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L
}
/**
-@@ -278,8 +282,11 @@ struct MakeUnsafeStringSetLargerSize {
+@@ -316,8 +320,11 @@ struct MakeUnsafeStringSetLargerSize {
} // namespace folly
#if defined(FOLLY_DECLARE_STRING_RESIZE_WITHOUT_INIT)
diff --git a/dev/vcpkg/ports/folly/fix-deps.patch
b/dev/vcpkg/ports/folly/fix-deps.patch
index 500b3a71db..279cc70c0a 100644
--- a/dev/vcpkg/ports/folly/fix-deps.patch
+++ b/dev/vcpkg/ports/folly/fix-deps.patch
@@ -51,19 +51,13 @@ index 1da1cc1..701ec99 100644
#include <TargetConditionals.h> // @manual
#endif
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
-index 1c41750..6ab485c 100644
+index 2902d1f..a94047d 100644
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
-@@ -57,14 +57,17 @@ find_package(Boost 1.69.0 REQUIRED
+@@ -57,10 +57,12 @@ 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)
-+find_package(double-conversion CONFIG REQUIRED)
-+set(DOUBLE_CONVERSION_LIBRARY double-conversion::double-conversion)
- list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
-
-find_package(FastFloat MODULE REQUIRED)
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${FASTFLOAT_INCLUDE_DIR})
+find_package(FastFloat CONFIG REQUIRED)
@@ -76,7 +70,7 @@ index 1c41750..6ab485c 100644
set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
if(LIBGFLAGS_FOUND)
list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
-@@ -73,7 +76,8 @@ if(LIBGFLAGS_FOUND)
+@@ -69,7 +71,8 @@ if(LIBGFLAGS_FOUND)
set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
endif()
@@ -86,7 +80,7 @@ index 1c41750..6ab485c 100644
set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
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")
+@@ -79,11 +82,16 @@ if (EXISTS "${GLOG_INCLUDE_DIR}/glog/export.h")
list(APPEND FOLLY_CXX_FLAGS -DGLOG_USE_GLOG_EXPORT)
endif()
@@ -104,7 +98,7 @@ index 1c41750..6ab485c 100644
set(FOLLY_HAVE_LIBZ ${ZLIB_FOUND})
if (ZLIB_FOUND)
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS})
-@@ -120,21 +129,24 @@ if (LIBLZMA_FOUND)
+@@ -116,21 +124,24 @@ if (LIBLZMA_FOUND)
list(APPEND FOLLY_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
endif()
@@ -132,7 +126,7 @@ index 1c41750..6ab485c 100644
set(FOLLY_HAVE_LIBSNAPPY ${SNAPPY_FOUND})
if (SNAPPY_FOUND)
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${SNAPPY_INCLUDE_DIR})
-@@ -150,14 +162,19 @@ list(APPEND FOLLY_LINK_LIBRARIES ${LIBIBERTY_LIBRARIES})
+@@ -146,14 +157,19 @@ list(APPEND FOLLY_LINK_LIBRARIES ${LIBIBERTY_LIBRARIES})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBIBERTY_INCLUDE_DIRS})
find_package(LibAIO)
@@ -153,7 +147,7 @@ index 1c41750..6ab485c 100644
list(APPEND FOLLY_LINK_LIBRARIES ${LIBSODIUM_LIBRARIES})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBSODIUM_INCLUDE_DIRS})
-@@ -174,6 +191,8 @@ list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
+@@ -170,6 +186,8 @@ list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS})
if (LIBUNWIND_FOUND)
set(FOLLY_HAVE_LIBUNWIND ON)
@@ -163,7 +157,7 @@ index 1c41750..6ab485c 100644
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
list(APPEND FOLLY_LINK_LIBRARIES "execinfo")
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 49dd964..b84f338 100644
+index 567d735..f1e4200 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -273,7 +273,8 @@ folly_resolve_deferred_dependencies()
diff --git a/dev/vcpkg/ports/folly/fix-perf_scoped-target.patch
b/dev/vcpkg/ports/folly/fix-perf_scoped-target.patch
deleted file mode 100644
index 7bd8873cf1..0000000000
--- a/dev/vcpkg/ports/folly/fix-perf_scoped-target.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
diff --git a/dev/vcpkg/ports/folly/portfile.cmake
b/dev/vcpkg/ports/folly/portfile.cmake
index 10d4d25d47..b99b92d194 100644
--- a/dev/vcpkg/ports/folly/portfile.cmake
+++ b/dev/vcpkg/ports/folly/portfile.cmake
@@ -6,13 +6,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF "v${VERSION}"
- SHA512
8ee08591724fb1f6183cc0456c13cd00474e425d41824add2751fd3823e23b95ea69ec1b246bc85c95d30add854ee53dafd2bc1b824d0b555917dcbaf6943a6f
+ SHA512
38032aa0cf88d63dbed8b4330130f71c993ef5e1b3ee640d66a86e56f28b023dff81c762617c2252a79863bfa699c0d95fdb447d64e52d65757a1e874e42193e
HEAD_REF main
PATCHES
fix-deps.patch
disable-uninitialized-resize-on-new-stl.patch
fix-unistd-include.patch
- fix-perf_scoped-target.patch
)
file(REMOVE "${SOURCE_PATH}/CMake/FindFastFloat.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
diff --git a/dev/vcpkg/ports/folly/vcpkg.json b/dev/vcpkg/ports/folly/vcpkg.json
index fe9cb28d1e..2c5a0c9841 100644
--- a/dev/vcpkg/ports/folly/vcpkg.json
+++ b/dev/vcpkg/ports/folly/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "folly",
- "version-string": "2026.02.23.00",
+ "version-string": "2026.09.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",
diff --git a/dev/vcpkg/ports/mvfst/portfile.cmake
b/dev/vcpkg/ports/mvfst/portfile.cmake
index ac4a90d544..feadb16303 100644
--- a/dev/vcpkg/ports/mvfst/portfile.cmake
+++ b/dev/vcpkg/ports/mvfst/portfile.cmake
@@ -2,10 +2,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/mvfst
REF "v${VERSION}"
- SHA512
6669e5b3163f422b3b5b11f298ff16f4f6f196aef765fa4a3da7a4caa69b7675e4ab8a9f9eac0e2f07e5fa30e723af7ab2310d67ec5d1357723da15444333dea
+ SHA512
00c2673086d62f672e827b3d175f287689199340716e66644088c5e13492a457a3432c6932df74a6bf02e0d4c26a59adbaa79af4e38d6b4b83483f4afba5fa3a
HEAD_REF main
- PATCHES
- removexsk.patch # patch to workaround on centos7
)
vcpkg_cmake_configure(
diff --git a/dev/vcpkg/ports/mvfst/removexsk.patch
b/dev/vcpkg/ports/mvfst/removexsk.patch
deleted file mode 100644
index 8dc0bd1c6d..0000000000
--- a/dev/vcpkg/ports/mvfst/removexsk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/quic/CMakeLists.txt b/quic/CMakeLists.txt
-index eeb657bf7..d7896bb39 100644
---- a/quic/CMakeLists.txt
-+++ b/quic/CMakeLists.txt
-@@ -80,7 +80,7 @@ add_subdirectory(priority)
- add_subdirectory(happyeyeballs)
- add_subdirectory(folly_utils)
- add_subdirectory(datagram)
--add_subdirectory(xsk)
-+#add_subdirectory(xsk)
- add_subdirectory(api)
- add_subdirectory(client)
- add_subdirectory(server)
diff --git a/dev/vcpkg/ports/mvfst/vcpkg.json b/dev/vcpkg/ports/mvfst/vcpkg.json
index c86b498ea9..7786bb6f7e 100644
--- a/dev/vcpkg/ports/mvfst/vcpkg.json
+++ b/dev/vcpkg/ports/mvfst/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "mvfst",
- "version-string": "2026.02.23.00",
+ "version-string": "2026.09.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",
diff --git a/dev/vcpkg/ports/wangle/fix_dependency.patch
b/dev/vcpkg/ports/wangle/fix_dependency.patch
new file mode 100644
index 0000000000..ad8e48efa4
--- /dev/null
+++ b/dev/vcpkg/ports/wangle/fix_dependency.patch
@@ -0,0 +1,76 @@
+diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
+index 52fcf21..da49037 100644
+--- a/wangle/CMakeLists.txt
++++ b/wangle/CMakeLists.txt
+@@ -76,7 +76,6 @@ endif()
+ if (NOT DEFINED fizz_SOURCE_DIR)
+ find_package(fizz CONFIG REQUIRED)
+ endif()
+-find_package(fmt CONFIG REQUIRED)
+ find_package(OpenSSL REQUIRED)
+
+ # Logging backend selection. Default is glog (preserves historical behavior);
+@@ -96,21 +95,33 @@ endif()
+ # Glog is only required in the default GLOG backend; XLOG routes through
+ # folly::xlog and DISABLED strips logging entirely.
+ if(WANGLE_LOGGING_BACKEND STREQUAL "GLOG")
+- find_package(Glog REQUIRED)
++ find_package(glog CONFIG REQUIRED)
+ add_compile_definitions(GLOG_USE_GLOG_EXPORT)
+ endif()
+-find_package(gflags CONFIG QUIET)
++find_package(gflags CONFIG REQUIRED)
++find_package(Boost REQUIRED
++ COMPONENTS
++ filesystem
++ thread
++)
++
+ if (gflags_FOUND)
+ message(STATUS "Found gflags from package config")
+ message(STATUS "gflags_CONFIG=${gflags_CONFIG}")
+ else()
+ find_package(Gflags REQUIRED)
+ endif()
+-find_package(LibEvent MODULE REQUIRED)
++find_package(Libevent CONFIG REQUIRED)
+ find_package(Threads REQUIRED)
+ if (UNIX AND NOT APPLE)
+ find_package(Librt)
+ endif()
++set(Boost_LIBRARIES Boost::boost Boost::filesystem Boost::thread
)
++set(FOLLY_LIBRARIES Folly::folly)
++set(FIZZ_LIBRARIES fizz::fizz)
++set(GLOG_LIBRARIES glog::glog)
++set(GFLAGS_LIBRARIES gflags::gflags)
++set(LIBEVENT_LIB libevent::core libevent::extra)
+
+ include(CheckAtomic)
+
+diff --git a/wangle/cmake/wangle-config.cmake.in
b/wangle/cmake/wangle-config.cmake.in
+index 2ccf338..9221c85 100644
+--- a/wangle/cmake/wangle-config.cmake.in
++++ b/wangle/cmake/wangle-config.cmake.in
+@@ -12,7 +12,21 @@
+ @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 CONFIG)
++find_dependency(fizz CONFIG)
++find_dependency(gflags CONFIG)
++find_dependency(glog CONFIG)
++find_dependency(Threads)
++find_dependency(Libevent CONFIG)
++find_dependency(OpenSSL)
++find_dependency(Boost
++ COMPONENTS
++ filesystem
++ thread
++)
+
+ if (NOT TARGET wangle::wangle)
+ include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake")
diff --git a/dev/vcpkg/ports/wangle/portfile.cmake
b/dev/vcpkg/ports/wangle/portfile.cmake
new file mode 100644
index 0000000000..ef97da8287
--- /dev/null
+++ b/dev/vcpkg/ports/wangle/portfile.cmake
@@ -0,0 +1,51 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO facebook/wangle
+ REF "v${VERSION}"
+ SHA512
455495869aa311e65c65b5c60eb8fb2983168c6764a2dfb921cf1893bfb5a56b11e6ecd2af8af4235ceeab6a1e3c66570c22ad60c07571de33843938c266ec6b
+ HEAD_REF main
+ PATCHES
+ fix_dependency.patch
+)
+
+file(REMOVE
+ "${SOURCE_PATH}/wangle/cmake/FindDoubleConversion.cmake"
+ "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake"
+ "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake"
+ "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake"
+ "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake"
+ "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake"
+ "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake"
+)
+
+
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}/wangle"
+ OPTIONS
+ -DBUILD_TESTS=OFF
+ -DBUILD_EXAMPLES=OFF
+ -DINCLUDE_INSTALL_DIR:STRING=include
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wangle)
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake"
_contents)
+STRING(REPLACE "\${_IMPORT_PREFIX}/lib/"
"\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
+STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/"
"\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake"
"${_contents}")
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE
+ "${CURRENT_PACKAGES_DIR}/debug/include"
+ "${CURRENT_PACKAGES_DIR}/include/wangle/util/test"
+ "${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs"
+ "${CURRENT_PACKAGES_DIR}/include/wangle/service/test"
+ "${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test"
+)
+
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION
"${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/dev/vcpkg/ports/wangle/usage b/dev/vcpkg/ports/wangle/usage
new file mode 100644
index 0000000000..50903e726c
--- /dev/null
+++ b/dev/vcpkg/ports/wangle/usage
@@ -0,0 +1,4 @@
+The package wangle is compatible with built-in CMake targets:
+
+ find_package(wangle REQUIRED)
+ target_link_libraries(main PRIVATE wangle::wangle)
diff --git a/dev/vcpkg/ports/fbthrift/vcpkg.json
b/dev/vcpkg/ports/wangle/vcpkg.json
similarity index 50%
copy from dev/vcpkg/ports/fbthrift/vcpkg.json
copy to dev/vcpkg/ports/wangle/vcpkg.json
index b9d08323f2..dacc33e7ca 100644
--- a/dev/vcpkg/ports/fbthrift/vcpkg.json
+++ b/dev/vcpkg/ports/wangle/vcpkg.json
@@ -1,23 +1,21 @@
{
- "name": "fbthrift",
- "version-string": "2026.02.23.00",
- "description": "Facebook's branch of Apache Thrift, including a new C++
server.",
- "homepage": "https://github.com/facebook/fbthrift";,
+ "name": "wangle",
+ "version-string": "2026.09.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",
- "supports": "x64 & static",
"dependencies": [
"boost-context",
"boost-filesystem",
- "boost-program-options",
"boost-regex",
"boost-system",
"boost-thread",
+ "double-conversion",
"fizz",
- "fmt",
"folly",
"gflags",
"glog",
- "mvfst",
+ "libevent",
"openssl",
{
"name": "vcpkg-cmake",
@@ -26,10 +24,6 @@
{
"name": "vcpkg-cmake-config",
"host": true
- },
- "wangle",
- "xxhash",
- "zlib",
- "zstd"
+ }
]
}
diff --git a/dev/vcpkg/vcpkg.json b/dev/vcpkg/vcpkg.json
index 55cf757364..cf8d2e0376 100644
--- a/dev/vcpkg/vcpkg.json
+++ b/dev/vcpkg/vcpkg.json
@@ -126,7 +126,7 @@
{ "name": "gflags", "version": "2.2.2"},
{ "name": "azure-identity-cpp", "version": "1.11.0"},
{ "name": "openssl", "version": "3.5.2"},
- { "name": "fbthrift", "version": "2026.02.23.00"},
+ { "name": "fbthrift", "version": "2026.09.07.00"},
{ "name": "grpc", "version": "1.51.1"},
{ "name": "s2geometry", "version": "0.11.1" }
]
diff --git a/ep/build-velox/src/setup-centos8.sh
b/ep/build-velox/src/setup-centos8.sh
index 95b0e5586f..4aa8096a91 100755
--- a/ep/build-velox/src/setup-centos8.sh
+++ b/ep/build-velox/src/setup-centos8.sh
@@ -43,7 +43,7 @@ export CC=/opt/rh/gcc-toolset-12/root/bin/gcc
export CXX=/opt/rh/gcc-toolset-12/root/bin/g++
DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)/deps-download}
-FB_OS_VERSION="v2026.01.05.00"
+FB_OS_VERSION="v2026.09.07.00"
FMT_VERSION="11.2.0"
FAST_FLOAT_VERSION="v8.0.2"
BOOST_VERSION="boost-1.84.0"
diff --git a/ep/build-velox/src/setup-openeuler24.sh
b/ep/build-velox/src/setup-openeuler24.sh
index 682e705832..b7a1024cc6 100755
--- a/ep/build-velox/src/setup-openeuler24.sh
+++ b/ep/build-velox/src/setup-openeuler24.sh
@@ -45,7 +45,7 @@ VERSION=$(cat /etc/os-release | grep VERSION_ID)
export INSTALL_PREFIX=${INSTALL_PREFIX:-"/usr/local"}
DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)/deps-download}
-FB_OS_VERSION="v2026.01.05.00"
+FB_OS_VERSION="v2026.09.07.00"
FMT_VERSION="11.2.0"
BOOST_VERSION="boost-1.84.0"
DUCKDB_VERSION="v0.8.1"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
