update folly to v2023.11.20.00 (#2871)

* update folly to v2023.11.20.00

* pkgconfig patch

* Fix patch csum

* Enable reorder patch

* Enable GLOG_NO_ABBREVIATED_SEVERITIES patch

* MSVC patch

* Fix patch csum

* Do not apply useless patch

* Clean up
pull/2876/head
jj683 1 year ago committed by GitHub
parent 7fed3ebea2
commit ab2ee7af42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      packages/f/folly/patches/2023.11.20/msvc.patch
  2. 18
      packages/f/folly/patches/2023.11.20/pkgconfig.patch
  3. 3
      packages/f/folly/xmake.lua

@ -0,0 +1,13 @@
diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake
--- a/CMake/FollyCompilerMSVC.cmake
+++ b/CMake/FollyCompilerMSVC.cmake
@@ -298,6 +298,9 @@ function(apply_folly_compile_options_to_target THETARGET)
$<$<BOOL:${MSVC_ENABLE_CPP_LATEST}>:_HAS_AUTO_PTR_ETC=1> # We're building in C++ 17 or greater mode, but certain dependencies (Boost) still have dependencies on unary_function and binary_function, so we have to make sure not to remove them.
$<$<BOOL:${MSVC_ENABLE_LEAN_AND_MEAN_WINDOWS}>:WIN32_LEAN_AND_MEAN> # Don't include most of Windows.h
$<$<BOOL:${MSVC_SUPPRESS_BOOST_CONFIG_OUTDATED}>:BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE> # MSVC moves faster than boost, so add a quick way to disable the messages.
+
+ NOMINMAX
+ GLOG_NO_ABBREVIATED_SEVERITIES
)
# Ignore a warning about an object file not defining any symbols,

@ -0,0 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -512,12 +512,12 @@ endif()
file(
GENERATE
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libfolly_$<CONFIG>.pc
INPUT ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc.gen
${target_arg}
)
install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/libfolly_${CMAKE_BUILD_TYPE}.pc
DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
COMPONENT dev
)

@ -12,9 +12,12 @@ package("folly")
add_versions("2022.02.14", "6a50d4cc954f0f77efc85af231ee6b7f676a0d743c12b7080fb03fd3da3ffbf2")
add_versions("2022.04.25", "7d5cd59613780d7d2b9c946c810bfd6b0d11ed3a8a74c5ab00d4e9de5d1b2104")
add_versions("2022.08.29", "3adac6d4b203c2917185fd190fc04d615051cb2a4f6b988ddf3c42034efc8d4d")
add_versions("2023.11.20", "7aabcfc5d85ca88fbd06bca1a7381654ec8b0c31fe919788b8d7c18ba50f38ff")
add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980")
add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495")
add_patches("<=2023.11.20", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674")
add_patches("<=2023.11.20", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d")
if is_plat("windows") then
add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})

Loading…
Cancel
Save