This is an automated email from the ASF dual-hosted git repository.
philo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new f75689ef95 [VL] Bump Folly to 2025.05.19 in VCPKG (#11186)
f75689ef95 is described below
commit f75689ef9583d8bafd6bed76ddd5d5ac4d596309
Author: Yuan <[email protected]>
AuthorDate: Thu Dec 4 01:57:05 2025 +0000
[VL] Bump Folly to 2025.05.19 in VCPKG (#11186)
---
dev/vcpkg/ports/folly/boost-1.70.patch | 22 --
dev/vcpkg/ports/folly/fix-absolute-dir.patch | 14 ++
dev/vcpkg/ports/folly/fix-deps.patch | 308 ++++++++++++------------
dev/vcpkg/ports/folly/fix-unistd-include.patch | 8 +-
dev/vcpkg/ports/folly/fix-windows-minmax.patch | 12 -
dev/vcpkg/ports/folly/portfile.cmake | 73 ++----
dev/vcpkg/ports/folly/vcpkg-cmake-wrapper.cmake | 6 -
dev/vcpkg/ports/folly/vcpkg.json | 34 +--
dev/vcpkg/vcpkg-configuration.json | 6 -
dev/vcpkg/vcpkg.json | 1 -
10 files changed, 218 insertions(+), 266 deletions(-)
diff --git a/dev/vcpkg/ports/folly/boost-1.70.patch
b/dev/vcpkg/ports/folly/boost-1.70.patch
deleted file mode 100644
index da6b81788f..0000000000
--- a/dev/vcpkg/ports/folly/boost-1.70.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
-index 777ac21ef..a4fc13a09 100644
---- a/folly/portability/PThread.cpp
-+++ b/folly/portability/PThread.cpp
-@@ -20,6 +20,8 @@
- #include <boost/thread/exceptions.hpp>
- #include <boost/thread/tss.hpp>
- #include <boost/version.hpp>
-+#include <boost/shared_ptr.hpp>
-+#include <boost/thread/thread_only.hpp>
-
- #include <errno.h>
-
-@@ -682,7 +684,7 @@ int pthread_setspecific(pthread_key_t key, const void*
value) {
- boost::detail::thread::cleanup_caller_t(),
- boost::detail::thread::cleanup_func_t(),
- #else
-- boost::shared_ptr<boost::detail::tss_cleanup_function>(),
-+ 0,0,
- #endif
- const_cast<void*>(value),
- false);
diff --git a/dev/vcpkg/ports/folly/fix-absolute-dir.patch
b/dev/vcpkg/ports/folly/fix-absolute-dir.patch
new file mode 100644
index 0000000000..fac930a188
--- /dev/null
+++ b/dev/vcpkg/ports/folly/fix-absolute-dir.patch
@@ -0,0 +1,14 @@
+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
diff --git a/dev/vcpkg/ports/folly/fix-deps.patch
b/dev/vcpkg/ports/folly/fix-deps.patch
index 442ad80636..6aa5891798 100644
--- a/dev/vcpkg/ports/folly/fix-deps.patch
+++ b/dev/vcpkg/ports/folly/fix-deps.patch
@@ -1,32 +1,33 @@
diff --git a/CMake/folly-config.cmake.in b/CMake/folly-config.cmake.in
-index 0b96f0a10..1559f9f70 100644
+index 0b96f0a..d5a200f 100644
--- a/CMake/folly-config.cmake.in
+++ b/CMake/folly-config.cmake.in
-@@ -29,10 +29,30 @@ endif()
+@@ -29,10 +29,31 @@ endif()
set(FOLLY_LIBRARIES Folly::folly)
# Find folly's dependencies
-find_dependency(fmt)
+find_dependency(fmt CONFIG)
+find_dependency(double-conversion CONFIG)
-+find_dependency(glog CONFIG)
++find_dependency(FastFloat CONFIG)
++set(z_vcpkg_folly_gflags_backup ${GFLAGS_USE_TARGET_NAMESPACE})
++set(GFLAGS_USE_TARGET_NAMESPACE ON)
+find_dependency(gflags CONFIG)
++set(GFLAGS_USE_TARGET_NAMESPACE ${z_vcpkg_folly_gflags_backup})
++find_dependency(glog CONFIG)
+find_dependency(Libevent CONFIG)
-+if (NOT @CMAKE_DISABLE_FIND_PACKAGE_Zstd@)
-+ find_dependency(zstd CONFIG)
++find_dependency(ZLIB)
++if("@VCPKG_LOCK_FIND_PACKAGE_LZ4@")
++ find_dependency(lz4 CONFIG)
+endif()
-+if (@CMAKE_REQUIRE_FIND_PACKAGE_ZLIB@)
-+ find_dependency(ZLIB MODULE)
++if("@VCPKG_LOCK_FIND_PACKAGE_ZSTD@")
++ find_dependency(zstd CONFIG)
+endif()
-+find_dependency(OpenSSL MODULE)
-+if (NOT @CMAKE_DISABLE_FIND_PACKAGE_unofficial-sodium@)
-+ find_dependency(unofficial-sodium CONFIG)
++if("@VCPKG_LOCK_FIND_PACKAGE_SNAPPY@")
++ find_dependency(Snappy CONFIG)
+endif()
-+if (NOT @CMAKE_DISABLE_FIND_PACKAGE_Snappy@)
-+ find_dependency(Snappy CONFIG)
-+endif()
-+if (NOT @CMAKE_DISABLE_FIND_PACKAGE_LZ4@)
-+ find_dependency(lz4 CONFIG)
++if("@VCPKG_LOCK_FIND_PACKAGE_LIBSODIUM@")
++ find_dependency(unofficial-sodium CONFIG)
+endif()
set(Boost_USE_STATIC_LIBS "@FOLLY_BOOST_LINK_STATIC@")
@@ -35,8 +36,22 @@ index 0b96f0a10..1559f9f70 100644
COMPONENTS
context
filesystem
+diff --git a/CMake/folly-config.h.cmake b/CMake/folly-config.h.cmake
+index 9a309fb..7e6e05f 100644
+--- a/CMake/folly-config.h.cmake
++++ b/CMake/folly-config.h.cmake
+@@ -16,6 +16,9 @@
+
+ #pragma once
+
++#cmakedefine01 FOLLY_HAS_LIBURING
++#cmakedefine01 FOLLY_HAS_LIBAIO
++
+ #ifdef __APPLE__
+ #include <TargetConditionals.h> // @manual
+ #endif
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
-index 41a513a30..d75908f77 100644
+index 6ce4c67..a347cf0 100644
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
@@ -35,7 +35,7 @@ else()
@@ -48,174 +63,163 @@ index 41a513a30..d75908f77 100644
COMPONENTS
context
filesystem
-@@ -45,37 +45,37 @@ find_package(Boost 1.51.0 MODULE
+@@ -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})
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
--
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
+
-find_package(DoubleConversion MODULE REQUIRED)
--list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
--
++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)
++list(APPEND FOLLY_LINK_LIBRARIES FastFloat::fast_float)
+
-find_package(Gflags MODULE)
--set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
--if(LIBGFLAGS_FOUND)
-- list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
-- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
-- set(FOLLY_LIBGFLAGS_LIBRARY ${LIBGFLAGS_LIBRARY})
-- set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
--endif()
++set(GFLAGS_USE_TARGET_NAMESPACE ON)
++find_package(LIBGFLAGS NAMES gflags REQUIRED)
++set(LIBGFLAGS_LIBRARY gflags::gflags)
+ set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
+ if(LIBGFLAGS_FOUND)
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
+@@ -64,16 +68,22 @@ if(LIBGFLAGS_FOUND)
+ set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
+ endif()
-find_package(Glog MODULE)
--set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
--list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
-+find_package(double-conversion CONFIG REQUIRED)
-+list(APPEND FOLLY_LINK_LIBRARIES double-conversion::double-conversion)
++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_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
-find_package(LibEvent MODULE REQUIRED)
--list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
-+find_package(glog CONFIG REQUIRED)
-+set(FOLLY_HAVE_LIBGLOG 1)
-+list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
-
--find_package(ZLIB MODULE)
--set(FOLLY_HAVE_LIBZ ${ZLIB_FOUND})
--if (ZLIB_FOUND)
-- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS})
-- list(APPEND FOLLY_LINK_LIBRARIES ${ZLIB_LIBRARIES})
-- list(APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
-+find_package(gflags CONFIG)
-+if(TARGET gflags::gflags)
-+ set(FOLLY_HAVE_LIBGFLAGS 1)
-+ list(APPEND FOLLY_LINK_LIBRARIES gflags::gflags)
-+ set(FOLLY_LIBGFLAGS_LIBRARY gflags::gflags)
-+endif()
-+
-+find_package(Libevent CONFIG REQUIRED)
-+list(APPEND FOLLY_LINK_LIBRARIES libevent::core libevent::extra)
++find_package(LIBEVENT NAMES Libevent REQUIRED)
++set(LIBEVENT_LIB libevent::core libevent::extra)
+if(NOT WIN32)
-+ list(APPEND FOLLY_LINK_LIBRARIES libevent::pthreads)
++ list(APPEND LIBEVENT_LIB libevent::pthreads)
+endif()
-+
-+if (CMAKE_REQUIRE_FIND_PACKAGE_ZLIB)
-+ find_package(ZLIB MODULE REQUIRED)
-+ set(FOLLY_HAVE_LIBZ ${ZLIB_FOUND})
-+ if (ZLIB_FOUND)
-+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS})
-+ list(APPEND FOLLY_LINK_LIBRARIES ${ZLIB_LIBRARIES})
-+ list(APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
-+ endif()
- endif()
-
- find_package(OpenSSL 1.1.1 MODULE REQUIRED)
-@@ -103,25 +103,30 @@ if (LIBLZMA_FOUND)
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
+
+ find_package(ZLIB MODULE)
++set(ZLIB_LIBRARIES ZLIB::ZLIB) # consistent with proxygen
+ set(FOLLY_HAVE_LIBZ ${ZLIB_FOUND})
+ if (ZLIB_FOUND)
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS})
+@@ -106,21 +116,24 @@ if (LIBLZMA_FOUND)
list(APPEND FOLLY_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
endif()
-find_package(LZ4 MODULE)
--set(FOLLY_HAVE_LIBLZ4 ${LZ4_FOUND})
--if (LZ4_FOUND)
-- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LZ4_INCLUDE_DIR})
-- list(APPEND FOLLY_LINK_LIBRARIES ${LZ4_LIBRARY})
-+if(NOT CMAKE_DISABLE_FIND_PACKAGE_LZ4)
-+ find_package(lz4 CONFIG)
-+ if(TARGET lz4::lz4)
-+ set(FOLLY_HAVE_LIBLZ4 1)
-+ list(APPEND FOLLY_LINK_LIBRARIES lz4::lz4)
-+ endif()
++find_package(LZ4 NAMES lz4)
++set(LZ4_LIBRARY lz4::lz4)
+ set(FOLLY_HAVE_LIBLZ4 ${LZ4_FOUND})
+ if (LZ4_FOUND)
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LZ4_INCLUDE_DIR})
+ list(APPEND FOLLY_LINK_LIBRARIES ${LZ4_LIBRARY})
endif()
-find_package(Zstd MODULE)
--set(FOLLY_HAVE_LIBZSTD ${ZSTD_FOUND})
--if(ZSTD_FOUND)
-- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR})
-- list(APPEND FOLLY_LINK_LIBRARIES ${ZSTD_LIBRARY})
-+if(NOT CMAKE_DISABLE_FIND_PACKAGE_Zstd)
-+ find_package(zstd CONFIG)
-+ if(TARGET zstd::libzstd_shared )
-+ set(FOLLY_HAVE_LIBZSTD 1)
-+ list(APPEND FOLLY_LINK_LIBRARIES zstd::libzstd_shared)
-+ elseif( TARGET zstd::libzstd_static )
-+ set(FOLLY_HAVE_LIBZSTD 1)
-+ list(APPEND FOLLY_LINK_LIBRARIES zstd::libzstd_static)
-+ endif()
++find_package(ZSTD NAMES zstd)
++set(ZSTD_LIBRARY zstd::libzstd)
+ set(FOLLY_HAVE_LIBZSTD ${ZSTD_FOUND})
+ if(ZSTD_FOUND)
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR})
+ list(APPEND FOLLY_LINK_LIBRARIES ${ZSTD_LIBRARY})
endif()
-find_package(Snappy MODULE)
--set(FOLLY_HAVE_LIBSNAPPY ${SNAPPY_FOUND})
--if (SNAPPY_FOUND)
-- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${SNAPPY_INCLUDE_DIR})
-- list(APPEND FOLLY_LINK_LIBRARIES ${SNAPPY_LIBRARY})
-+if(NOT CMAKE_DISABLE_FIND_PACKAGE_Snappy)
-+ find_package(Snappy CONFIG)
-+ if(TARGET Snappy::snappy)
-+ list(APPEND FOLLY_LINK_LIBRARIES Snappy::snappy)
-+ endif()
- endif()
-
- find_package(LibDwarf)
-@@ -132,17 +137,24 @@ find_package(Libiberty)
- list(APPEND FOLLY_LINK_LIBRARIES ${LIBIBERTY_LIBRARIES})
++find_package(SNAPPY NAMES Snappy)
++set(SNAPPY_LIBRARY Snappy::snappy)
+ 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})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBIBERTY_INCLUDE_DIRS})
--find_package(LibAIO)
--list(APPEND FOLLY_LINK_LIBRARIES ${LIBAIO_LIBRARIES})
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBAIO_INCLUDE_DIRS})
-+if(WITH_libaio)
-+ find_package(LibAIO)
-+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBAIO_LIBRARIES})
-+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBAIO_INCLUDE_DIRS})
-+endif()
+ find_package(LibAIO)
++set(FOLLY_HAS_LIBAIO ${VCPKG_LOCK_FIND_PACKAGE_LibAIO})
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBAIO_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBAIO_INCLUDE_DIRS})
--find_package(LibUring)
--list(APPEND FOLLY_LINK_LIBRARIES ${LIBURING_LIBRARIES})
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBURING_INCLUDE_DIRS})
-+if(WITH_liburing)
-+ find_package(LibUring)
-+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBURING_LIBRARIES})
-+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBURING_INCLUDE_DIRS})
-+endif()
+ find_package(LibUring)
++set(FOLLY_HAS_LIBURING ${VCPKG_LOCK_FIND_LibUring})
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBURING_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBURING_INCLUDE_DIRS})
-find_package(Libsodium)
--list(APPEND FOLLY_LINK_LIBRARIES ${LIBSODIUM_LIBRARIES})
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBSODIUM_INCLUDE_DIRS})
-+if(NOT CMAKE_DISABLE_FIND_PACKAGE_unofficial-sodium)
-+ find_package(unofficial-sodium CONFIG)
-+ if(TARGET unofficial-sodium::sodium)
-+ list(APPEND FOLLY_LINK_LIBRARIES unofficial-sodium::sodium)
-+ endif()
++find_package(LIBSODIUM NAMES unofficial-sodium)
++if(LIBSODIUM_FOUND)
++ set(LIBSODIUM_LIBRARIES unofficial-sodium::sodium)
+endif()
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBSODIUM_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBSODIUM_INCLUDE_DIRS})
- list(APPEND FOLLY_LINK_LIBRARIES ${CMAKE_DL_LIBS})
- list(APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_DL_LIBS})
-@@ -153,10 +165,10 @@ if (PYTHON_EXTENSIONS)
- endif ()
-
- find_package(LibUnwind)
--list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS})
+@@ -160,6 +178,8 @@ list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS})
if (LIBUNWIND_FOUND)
set(FOLLY_HAVE_LIBUNWIND ON)
-+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
-+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS})
++ list(REMOVE_ITEM FOLLY_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
++ list(APPEND FOLLY_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
endif()
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
list(APPEND FOLLY_LINK_LIBRARIES "execinfo")
-@@ -298,11 +310,7 @@ endif()
-
- add_library(folly_deps INTERFACE)
-
--find_package(fmt CONFIG)
--if (NOT DEFINED fmt_CONFIG)
-- # Fallback on a normal search on the current system
-- find_package(Fmt MODULE REQUIRED)
--endif()
-+find_package(fmt CONFIG REQUIRED)
- target_link_libraries(folly_deps INTERFACE fmt::fmt)
-
- list(REMOVE_DUPLICATES FOLLY_INCLUDE_DIRECTORIES)
+diff --git a/folly/io/async/AsyncIO.cpp b/folly/io/async/AsyncIO.cpp
+index 93cda44..ac090bb 100644
+--- a/folly/io/async/AsyncIO.cpp
++++ b/folly/io/async/AsyncIO.cpp
+@@ -35,7 +35,7 @@
+ #include <sys/eventfd.h>
+ #endif
+
+-#if __has_include(<libaio.h>)
++#if FOLLY_HAS_LIBAIO
+
+ // debugging helpers
+ namespace {
+diff --git a/folly/io/async/AsyncIO.h b/folly/io/async/AsyncIO.h
+index b1a6f52..ba84609 100644
+--- a/folly/io/async/AsyncIO.h
++++ b/folly/io/async/AsyncIO.h
+@@ -18,7 +18,7 @@
+
+ #include <folly/experimental/io/AsyncBase.h>
+
+-#if __has_include(<libaio.h>)
++#if FOLLY_HAS_LIBAIO
+
+ #include <libaio.h>
+
+diff --git a/folly/io/async/Liburing.h b/folly/io/async/Liburing.h
+index 8e81aaa..c7f4a67 100644
+--- a/folly/io/async/Liburing.h
++++ b/folly/io/async/Liburing.h
+@@ -17,7 +17,5 @@
+ #pragma once
+
+ #if defined(__linux__) && __has_include(<liburing.h>)
+-#define FOLLY_HAS_LIBURING 1
+ #else
+-#define FOLLY_HAS_LIBURING 0
+ #endif
+diff --git a/folly/io/async/SimpleAsyncIO.cpp
b/folly/io/async/SimpleAsyncIO.cpp
+index 807a2be..551a003 100644
+--- a/folly/io/async/SimpleAsyncIO.cpp
++++ b/folly/io/async/SimpleAsyncIO.cpp
+@@ -25,7 +25,7 @@
+
+ namespace folly {
+
+-#if __has_include(<libaio.h>)
++#if FOLLY_HAS_LIBAIO
+ static constexpr bool has_aio = true;
+ using aio_type = AsyncIO;
+ #else
diff --git a/dev/vcpkg/ports/folly/fix-unistd-include.patch
b/dev/vcpkg/ports/folly/fix-unistd-include.patch
index 78a4e09233..2ab22edf1e 100644
--- a/dev/vcpkg/ports/folly/fix-unistd-include.patch
+++ b/dev/vcpkg/ports/folly/fix-unistd-include.patch
@@ -1,7 +1,7 @@
-diff --git a/folly/experimental/symbolizer/Elf.cpp
b/folly/experimental/symbolizer/Elf.cpp
-index 6a7f74fa4..6546fe074 100644
---- a/folly/experimental/symbolizer/Elf.cpp
-+++ b/folly/experimental/symbolizer/Elf.cpp
+diff --git a/folly/debugging/symbolizer/Elf.cpp
b/folly/debugging/symbolizer/Elf.cpp
+index 6a7f74f..6546fe0 100644
+--- a/folly/debugging/symbolizer/Elf.cpp
++++ b/folly/debugging/symbolizer/Elf.cpp
@@ -49,6 +49,8 @@
#define FOLLY_ELF_NATIVE_CLASS __WORDSIZE
#endif // __ELF_NATIVE_CLASS
diff --git a/dev/vcpkg/ports/folly/fix-windows-minmax.patch
b/dev/vcpkg/ports/folly/fix-windows-minmax.patch
deleted file mode 100644
index 24e4b9eac1..0000000000
--- a/dev/vcpkg/ports/folly/fix-windows-minmax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake
-index ad03039aa..1c76e0f00 100644
---- a/CMake/FollyCompilerMSVC.cmake
-+++ b/CMake/FollyCompilerMSVC.cmake
-@@ -289,6 +289,7 @@ function(apply_folly_compile_options_to_target THETARGET)
- # And the extra defines:
- target_compile_definitions(${THETARGET}
- PUBLIC
-+ NOMINMAX
- _CRT_NONSTDC_NO_WARNINGS # Don't deprecate posix names of functions.
- _CRT_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of
various standard library functions, because safety is for chumps.
- _SCL_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of
various standard library functions, because safety is for chumps.
diff --git a/dev/vcpkg/ports/folly/portfile.cmake
b/dev/vcpkg/ports/folly/portfile.cmake
index 8d0cc8ebb5..cd35241634 100644
--- a/dev/vcpkg/ports/folly/portfile.cmake
+++ b/dev/vcpkg/ports/folly/portfile.cmake
@@ -1,24 +1,20 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-# Required to run build/generate_escape_tables.py et al.
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-vcpkg_add_to_path("${PYTHON3_DIR}")
+if(VCPKG_TARGET_IS_WINDOWS)
+ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF "v${VERSION}"
- SHA512
fe9a0b449d84f7d43ebaea29ead5bfd17f8f6c43bbf2928d93045cbaf394ffba059e29241e9850c376f7c765784b207cd16a4cce65ad5ec4131c9ca570b6b2c0
+ SHA512
6d377c48cf1c0796da6fad34b930e9608f3cd765a675414eaad45ff46e9d0b9bb5f027b187ec135e88bb60a83cb91c07d266a6673621caf3f9961942b55276e2
HEAD_REF main
PATCHES
- boost-1.70.patch
- fix-windows-minmax.patch
fix-deps.patch
disable-uninitialized-resize-on-new-stl.patch
fix-unistd-include.patch
+ fix-absolute-dir.patch
)
-
+file(REMOVE "${SOURCE_PATH}/CMake/FindFastFloat.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/FindLibsodium.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/FindZstd.cmake")
@@ -29,28 +25,20 @@ file(REMOVE
"${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake")
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake")
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake")
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake")
-file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibUnwind.cmake")
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake")
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake")
-if(VCPKG_CRT_LINKAGE STREQUAL static)
- set(MSVC_USE_STATIC_RUNTIME ON)
-else()
- set(MSVC_USE_STATIC_RUNTIME OFF)
-endif()
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_STATIC_RUNTIME)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
- "zlib" CMAKE_REQUIRE_FIND_PACKAGE_ZLIB
- "liburing" WITH_liburing
- "libaio" WITH_libaio
- INVERTED_FEATURES
- "bzip2" CMAKE_DISABLE_FIND_PACKAGE_BZip2
- "lzma" CMAKE_DISABLE_FIND_PACKAGE_LibLZMA
- "lz4" CMAKE_DISABLE_FIND_PACKAGE_LZ4
- "zstd" CMAKE_DISABLE_FIND_PACKAGE_Zstd
- "snappy" CMAKE_DISABLE_FIND_PACKAGE_Snappy
- "libsodium" CMAKE_DISABLE_FIND_PACKAGE_unofficial-sodium
+ "bzip2" VCPKG_LOCK_FIND_PACKAGE_BZip2
+ "libaio" VCPKG_LOCK_FIND_PACKAGE_LibAIO
+ "libsodium" VCPKG_LOCK_FIND_PACKAGE_LIBSODIUM
+ "liburing" VCPKG_LOCK_FIND_PACKAGE_LibUring
+ "lz4" VCPKG_LOCK_FIND_PACKAGE_LZ4
+ "snappy" VCPKG_LOCK_FIND_PACKAGE_SNAPPY
+ "zstd" VCPKG_LOCK_FIND_PACKAGE_ZSTD
)
vcpkg_cmake_configure(
@@ -60,39 +48,26 @@ vcpkg_cmake_configure(
# https://github.com/facebook/folly/issues/1623
-DFOLLY_NO_EXCEPTION_TRACER=ON
-DMSVC_USE_STATIC_RUNTIME=${MSVC_USE_STATIC_RUNTIME}
- -DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_LibAIO=ON
- -DLIBAIO_FOUND=OFF
+ -DCMAKE_INSTALL_DIR=share/folly
+ -DCMAKE_POLICY_DEFAULT_CMP0167=NEW
+ -DVCPKG_LOCK_FIND_PACKAGE_fmt=ON
+ -DVCPKG_LOCK_FIND_PACKAGE_LibDwarf=OFF
+ -DVCPKG_LOCK_FIND_PACKAGE_Libiberty=OFF
+ -DVCPKG_LOCK_FIND_PACKAGE_LibUnwind=${VCPKG_TARGET_IS_LINUX}
+ -DVCPKG_LOCK_FIND_PACKAGE_ZLIB=ON
# Required by Velox.
-DFOLLY_HAVE_INT128_T=ON
- -DCMAKE_INSTALL_DIR=share/folly
+ -DFOLLY_MEMCPY_IS_MEMCPY=ON -DFOLLY_MEMSET_IS_MEMSET=ON
${FEATURE_OPTIONS}
MAYBE_UNUSED_VARIABLES
MSVC_USE_STATIC_RUNTIME
)
-vcpkg_cmake_install(ADD_BIN_TO_PATH)
-
+vcpkg_cmake_install()
vcpkg_copy_pdbs()
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
"${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
-
+vcpkg_fixup_pkgconfig()
vcpkg_cmake_config_fixup()
-# Release folly-targets.cmake does not link to the right libraries in debug
mode.
-# We substitute with generator expressions so that the right libraries are
linked for debug and release.
-set(FOLLY_TARGETS_CMAKE
"${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake")
-FILE(READ ${FOLLY_TARGETS_CMAKE} _contents)
-string(REPLACE "\${VCPKG_IMPORT_PREFIX}/lib/zlib.lib" "ZLIB::ZLIB" _contents
"${_contents}")
-STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/lib/"
"\${VCPKG_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents
"${_contents}")
-STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/debug/lib/"
"\${VCPKG_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents
"${_contents}")
-string(REPLACE "-vc140-mt.lib" "-vc140-mt\$<\$<CONFIG:DEBUG>:-gd>.lib"
_contents "${_contents}")
-FILE(WRITE ${FOLLY_TARGETS_CMAKE} "${_contents}")
-
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-# Handle copyright
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
-
-vcpkg_fixup_pkgconfig()
diff --git a/dev/vcpkg/ports/folly/vcpkg-cmake-wrapper.cmake
b/dev/vcpkg/ports/folly/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index cce45a2e43..0000000000
--- a/dev/vcpkg/ports/folly/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(FOLLY_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
-
-_find_package(${ARGS})
-
-set(CMAKE_MODULE_PATH ${FOLLY_PREV_MODULE_PATH})
\ No newline at end of file
diff --git a/dev/vcpkg/ports/folly/vcpkg.json b/dev/vcpkg/ports/folly/vcpkg.json
index 4d32f9027b..99bb39dc1d 100644
--- a/dev/vcpkg/ports/folly/vcpkg.json
+++ b/dev/vcpkg/ports/folly/vcpkg.json
@@ -1,10 +1,10 @@
{
"name": "folly",
- "version-string": "2024.07.01.00",
+ "version-string": "2025.05.19.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",
- "supports": "(windows & x64 & !uwp) | (!windows & (x64 | arm64))",
+ "supports": "(windows & x64 & !uwp & !mingw) | (!windows & !android & (x64 |
arm64))",
"dependencies": [
"boost-chrono",
"boost-context",
@@ -20,12 +20,17 @@
"boost-thread",
"boost-variant",
"double-conversion",
+ "fast-float",
"fmt",
"gflags",
"glog",
"libevent",
+ "liblzma",
+ {
+ "name": "libunwind",
+ "platform": "linux"
+ },
"openssl",
- "libdwarf",
{
"name": "vcpkg-cmake",
"host": true
@@ -33,9 +38,7 @@
{
"name": "vcpkg-cmake-config",
"host": true
- }
- ],
- "default-features": [
+ },
"zlib"
],
"features": {
@@ -47,7 +50,10 @@
},
"libaio": {
"description": "Support compile with libaio",
- "supports": "linux & x64"
+ "supports": "linux",
+ "dependencies": [
+ "libaio"
+ ]
},
"libsodium": {
"description": "Support libsodium for cryto",
@@ -57,6 +63,7 @@
},
"liburing": {
"description": "Support compile with liburing",
+ "supports": "linux",
"dependencies": [
"liburing"
]
@@ -76,13 +83,12 @@
"snappy": {
"description": "Support Snappy for compression",
"dependencies": [
- "snappy"
- ]
- },
- "zlib": {
- "description": "Support zlib for compression",
- "dependencies": [
- "zlib"
+ {
+ "name": "snappy",
+ "features": [
+ "rtti"
+ ]
+ }
]
},
"zstd": {
diff --git a/dev/vcpkg/vcpkg-configuration.json
b/dev/vcpkg/vcpkg-configuration.json
index 0ffc49fda9..a3558f7b66 100644
--- a/dev/vcpkg/vcpkg-configuration.json
+++ b/dev/vcpkg/vcpkg-configuration.json
@@ -3,12 +3,6 @@
"overlay-ports": [ "./ports" ],
"overlay-triplets": [ "./triplets" ],
"registries": [
- {
- "kind": "git",
- "repository": "https://github.com/Microsoft/vcpkg";,
- "baseline": "8ccb84df727bdf83045e53c319af05c554838b80",
- "packages": [ "boost*", "boost-*"]
- },
{
"kind": "git",
"repository": "https://github.com/Microsoft/vcpkg";,
diff --git a/dev/vcpkg/vcpkg.json b/dev/vcpkg/vcpkg.json
index f1f25b32f8..aba59968f2 100644
--- a/dev/vcpkg/vcpkg.json
+++ b/dev/vcpkg/vcpkg.json
@@ -108,7 +108,6 @@
{ "name": "fmt", "version": "10.1.1" },
{ "name": "liblzma", "version": "5.6.2" },
{ "name": "xsimd", "version": "10.0.0" },
- { "name": "snappy", "version": "1.1.8"},
{ "name": "protobuf", "version": "3.21.8"},
{ "name": "abseil", "version": "20230802.1"},
{ "name": "re2", "version": "2023-07-01"},
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
