[folly] add libunwind back

ports/folly/fix-libunwind.patch

@@ -0,0 +1,31 @@
+diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
+index 0702380..984c749 100644
+--- a/CMake/folly-deps.cmake
++++ b/CMake/folly-deps.cmake
+@@ -99,6 +99,13 @@ if (BZIP2_FOUND)
+ list(APPEND FOLLY_LINK_LIBRARIES ${BZIP2_LIBRARIES})
+ endif()
+
++find_package(LibUnwind)
++if (LIBUNWIND_FOUND)
++ set(FOLLY_HAVE_LIBUNWIND ON)
++ list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
++ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS})
++endif()
++
+ find_package(LibLZMA MODULE)
+ set(FOLLY_HAVE_LIBLZMA ${LIBLZMA_FOUND})
+ if (LIBLZMA_FOUND)
+@@ -166,12 +173,6 @@ if (PYTHON_EXTENSIONS)
+ find_package(Cython 0.26 REQUIRED)
+ endif ()
+
+-find_package(LibUnwind)
+-if (LIBUNWIND_FOUND)
+- set(FOLLY_HAVE_LIBUNWIND ON)
+- list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
+- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS})
+-endif()
+ if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ list(APPEND FOLLY_LINK_LIBRARIES "execinfo")
+ endif ()

ports/folly/portfile.cmake

@@ -17,6 +17,7 @@ vcpkg_from_github(
  fix-deps.patch
  disable-uninitialized-resize-on-new-stl.patch
  fix-unistd-include.patch
+ fix-libunwind.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
@@ -29,7 +30,6 @@ 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")
 
@@ -46,7 +46,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "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

ports/folly/vcpkg.json

@@ -1,6 +1,7 @@
 {
  "name": "folly",
  "version-string": "2024.10.14.00",
+ "port-version": 1,
  "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",
@@ -25,6 +26,11 @@
  "gflags",
  "glog",
  "libevent",
+ "liblzma",
+ {
+ "name": "libunwind",
+ "platform": "linux"
+ },
  "openssl",
  {
  "name": "vcpkg-cmake",

ports/libunwind/portfile.cmake

@@ -23,6 +23,7 @@ vcpkg_configure_make(
  AUTOCONFIG
  OPTIONS
  --disable-tests
+ --enable-minidebuginfo
 )
 vcpkg_install_make()
 vcpkg_fixup_pkgconfig()

ports/libunwind/vcpkg.json

@@ -1,9 +1,12 @@
 {
  "name": "libunwind",
  "version": "1.8.1",
- "port-version": 1,
+ "port-version": 2,
  "description": "Unix libray for portable stack unwinding",
  "homepage": "https://www.nongnu.org/libunwind",
  "license": "MIT",
- "supports": "linux"
+ "supports": "linux",
+ "dependencies": [
+ "liblzma"
+ ]
 }

versions/baseline.json

@@ -2846,7 +2846,7 @@
  },
  "folly": {
  "baseline": "2024.10.14.00",
- "port-version": 0
+ "port-version": 1
  },
  "font-chef": {
  "baseline": "1.1.0",
@@ -5234,7 +5234,7 @@
  },
  "libunwind": {
  "baseline": "1.8.1",
- "port-version": 1
+ "port-version": 2
  },
  "liburing": {
  "baseline": "2.7",

versions/f-/folly.json

@@ -1,5 +1,10 @@
 {
  "versions": [
+ {
+ "git-tree": "2f7ed360ddd1e7bf4dd0c9b35aaa9a8bd7e3fc92",
+ "version-string": "2024.10.14.00",
+ "port-version": 1
+ },
  {
  "git-tree": "0cd7435de58f63add1ed638ac479505fbbc3a26d",
  "version-string": "2024.10.14.00",

versions/l-/libunwind.json

@@ -1,5 +1,10 @@
 {
  "versions": [
+ {
+ "git-tree": "d9bd4526e93e77c007518879e00a2cc163a87d20",
+ "version": "1.8.1",
+ "port-version": 2
+ },
  {
  "git-tree": "e96e575a728361e6c29a57287a0050ad325e88fb",
  "version": "1.8.1",