From 66830f7fe111e4764d718cbe6e21f8793a9e12f4 Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Wed, 5 Jun 2024 15:08:18 +0200 Subject: [PATCH] maint: Update to boost 1.84.0 (#1574) Signed-off-by: Julien Jerphanion Co-authored-by: Johan Mabille --- .../0005-Deactivate-libunwind-features.patch | 25 +++ .../vcpkg_overlays/folly/portfile.cmake | 1 + cpp/vcpkg.json | 152 +++++++++--------- 3 files changed, 102 insertions(+), 76 deletions(-) create mode 100644 cpp/third_party/vcpkg_overlays/folly/0005-Deactivate-libunwind-features.patch diff --git a/cpp/third_party/vcpkg_overlays/folly/0005-Deactivate-libunwind-features.patch b/cpp/third_party/vcpkg_overlays/folly/0005-Deactivate-libunwind-features.patch new file mode 100644 index 0000000000..740bd39e62 --- /dev/null +++ b/cpp/third_party/vcpkg_overlays/folly/0005-Deactivate-libunwind-features.patch @@ -0,0 +1,25 @@ +From c1ea3a2b60e2a153663abe5c3aa1c9bf51754b25 Mon Sep 17 00:00:00 2001 +From: Julien Jerphanion +Date: Fri, 17 May 2024 17:17:53 +0200 +Subject: [PATCH] Deactivate libunwind features + +Signed-off-by: Julien Jerphanion +--- + folly/experimental/symbolizer/StackTrace.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/folly/experimental/symbolizer/StackTrace.cpp b/folly/experimental/symbolizer/StackTrace.cpp +index bf79dced7..bdc8edc50 100644 +--- a/folly/experimental/symbolizer/StackTrace.cpp ++++ b/folly/experimental/symbolizer/StackTrace.cpp +@@ -24,6 +24,7 @@ + #include + #include + ++#define FOLLY_HAVE_LIBUNWIND 0 + #if FOLLY_HAVE_LIBUNWIND + // Must be first to ensure that UNW_LOCAL_ONLY is defined + #define UNW_LOCAL_ONLY 1 +-- +2.45.1 + diff --git a/cpp/third_party/vcpkg_overlays/folly/portfile.cmake b/cpp/third_party/vcpkg_overlays/folly/portfile.cmake index c5c0e2c575..48e66c696b 100644 --- a/cpp/third_party/vcpkg_overlays/folly/portfile.cmake +++ b/cpp/third_party/vcpkg_overlays/folly/portfile.cmake @@ -24,6 +24,7 @@ vcpkg_from_github( 0002-Workaround-demangling-callback.patch 0003-Set-FOLLY_HAVE_SO_TIMESTAMPING-to-0.patch 0004-Do-not-use-PRId64.patch + 0005-Deactivate-libunwind-features.patch ) file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake") diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json index 59f4262a93..0bdbabf783 100644 --- a/cpp/vcpkg.json +++ b/cpp/vcpkg.json @@ -73,82 +73,82 @@ { "name": "azure-core-cpp", "version": "1.11.2" }, { "name": "aws-c-s3", "version": "0.3.24" }, { "name": "bitmagic", "version": "7.12.3" }, - { "name": "boost-algorithm", "version": "1.80.0#1" }, - { "name": "boost-align", "version": "1.80.0#1" }, - { "name": "boost-any", "version": "1.80.0#1" }, - { "name": "boost-array", "version": "1.80.0#1" }, - { "name": "boost-assert", "version": "1.80.0#1" }, - { "name": "boost-atomic", "version": "1.80.0#1" }, - { "name": "boost-bind", "version": "1.80.0#1" }, - { "name": "boost-build", "version": "1.80.0#2" }, - { "name": "boost-callable-traits", "version": "1.80.0#1" }, - { "name": "boost-chrono", "version": "1.80.0#1" }, - { "name": "boost-circular-buffer", "version": "1.80.0#1" }, - { "name": "boost-concept-check", "version": "1.80.0#1" }, - { "name": "boost-config", "version": "1.80.0#1" }, - { "name": "boost-container", "version": "1.80.0#1" }, - { "name": "boost-container-hash", "version": "1.80.0#1" }, - { "name": "boost-context", "version": "1.80.0#1" }, - { "name": "boost-conversion", "version": "1.80.0#1" }, - { "name": "boost-core", "version": "1.80.0#1" }, - { "name": "boost-crc", "version": "1.80.0#1" }, - { "name": "boost-date-time", "version": "1.80.0#1" }, - { "name": "boost-detail", "version": "1.80.0#1" }, - { "name": "boost-dynamic-bitset", "version": "1.80.0#1" }, - { "name": "boost-endian", "version": "1.80.0#1" }, - { "name": "boost-exception", "version": "1.80.0#1" }, - { "name": "boost-filesystem", "version": "1.80.0#1" }, - { "name": "boost-foreach", "version": "1.80.0#1" }, - { "name": "boost-function", "version": "1.80.0#1" }, - { "name": "boost-function-types", "version": "1.80.0#1" }, - { "name": "boost-fusion", "version": "1.80.0#1" }, - { "name": "boost-integer", "version": "1.80.0#1" }, - { "name": "boost-interprocess", "version": "1.80.0#1" }, - { "name": "boost-intrusive", "version": "1.80.0#1" }, - { "name": "boost-io", "version": "1.80.0#1" }, - { "name": "boost-iterator", "version": "1.80.0#1" }, - { "name": "boost-lexical-cast", "version": "1.80.0#1" }, - { "name": "boost-locale", "version": "1.80.0#1" }, - { "name": "boost-math", "version": "1.80.0#1" }, - { "name": "boost-modular-build-helper", "version": "1.80.0#4" }, - { "name": "boost-move", "version": "1.80.0#1" }, - { "name": "boost-mp11", "version": "1.80.0#1" }, - { "name": "boost-mpl", "version": "1.80.0#1" }, - { "name": "boost-multiprecision", "version": "1.80.0#1" }, - { "name": "boost-multi-index", "version": "1.80.0#1" }, - { "name": "boost-numeric-conversion", "version": "1.80.0#1" }, - { "name": "boost-optional", "version": "1.80.0#1" }, - { "name": "boost-phoenix", "version": "1.80.0#1" }, - { "name": "boost-pool", "version": "1.80.0#1" }, - { "name": "boost-predef", "version": "1.80.0#1" }, - { "name": "boost-preprocessor", "version": "1.80.0#1" }, - { "name": "boost-program-options", "version": "1.80.0#1" }, - { "name": "boost-proto", "version": "1.80.0#1" }, - { "name": "boost-random", "version": "1.80.0#1" }, - { "name": "boost-range", "version": "1.80.0#1" }, - { "name": "boost-ratio", "version": "1.80.0#1" }, - { "name": "boost-rational", "version": "1.80.0#1" }, - { "name": "boost-regex", "version": "1.80.0#1" }, - { "name": "boost-scope-exit", "version": "1.80.0#1" }, - { "name": "boost-serialization", "version": "1.80.0#1" }, - { "name": "boost-smart-ptr", "version": "1.80.0#1" }, - { "name": "boost-spirit", "version": "1.80.0#1" }, - { "name": "boost-static-assert", "version": "1.80.0#1" }, - { "name": "boost-system", "version": "1.80.0#1" }, - { "name": "boost-thread", "version": "1.80.0#1" }, - { "name": "boost-throw-exception", "version": "1.80.0#1" }, - { "name": "boost-tokenizer", "version": "1.80.0#1" }, - { "name": "boost-tuple", "version": "1.80.0#1" }, - { "name": "boost-type-index", "version": "1.80.0#1" }, - { "name": "boost-type-traits", "version": "1.80.0#1" }, - { "name": "boost-typeof", "version": "1.80.0#1" }, - { "name": "boost-uninstall", "version": "1.80.0#1" }, - { "name": "boost-unordered", "version": "1.80.0#1" }, - { "name": "boost-utility", "version": "1.80.0#1" }, - { "name": "boost-variant", "version": "1.80.0#1" }, - { "name": "boost-variant2", "version": "1.80.0#1" }, - { "name": "boost-vcpkg-helpers", "version": "1.80.0#1" }, - { "name": "boost-winapi", "version": "1.80.0#1" }, + { "name": "boost-algorithm", "version": "1.84.0" }, + { "name": "boost-align", "version": "1.84.0" }, + { "name": "boost-any", "version": "1.84.0" }, + { "name": "boost-array", "version": "1.84.0" }, + { "name": "boost-assert", "version": "1.84.0" }, + { "name": "boost-atomic", "version": "1.84.0" }, + { "name": "boost-bind", "version": "1.84.0" }, + { "name": "boost-build", "version": "1.84.0" }, + { "name": "boost-callable-traits", "version": "1.84.0" }, + { "name": "boost-chrono", "version": "1.84.0" }, + { "name": "boost-circular-buffer", "version": "1.84.0" }, + { "name": "boost-concept-check", "version": "1.84.0" }, + { "name": "boost-config", "version": "1.84.0" }, + { "name": "boost-container", "version": "1.84.0" }, + { "name": "boost-container-hash", "version": "1.84.0" }, + { "name": "boost-context", "version": "1.84.0" }, + { "name": "boost-conversion", "version": "1.84.0" }, + { "name": "boost-core", "version": "1.84.0" }, + { "name": "boost-crc", "version": "1.84.0" }, + { "name": "boost-date-time", "version": "1.84.0" }, + { "name": "boost-detail", "version": "1.84.0" }, + { "name": "boost-dynamic-bitset", "version": "1.84.0" }, + { "name": "boost-endian", "version": "1.84.0" }, + { "name": "boost-exception", "version": "1.84.0" }, + { "name": "boost-filesystem", "version": "1.84.0" }, + { "name": "boost-foreach", "version": "1.84.0" }, + { "name": "boost-function", "version": "1.84.0" }, + { "name": "boost-function-types", "version": "1.84.0" }, + { "name": "boost-fusion", "version": "1.84.0" }, + { "name": "boost-integer", "version": "1.84.0" }, + { "name": "boost-interprocess", "version": "1.84.0" }, + { "name": "boost-intrusive", "version": "1.84.0" }, + { "name": "boost-io", "version": "1.84.0" }, + { "name": "boost-iterator", "version": "1.84.0" }, + { "name": "boost-lexical-cast", "version": "1.84.0" }, + { "name": "boost-locale", "version": "1.84.0" }, + { "name": "boost-math", "version": "1.84.0" }, + { "name": "boost-modular-build-helper", "version": "1.84.0" }, + { "name": "boost-move", "version": "1.84.0" }, + { "name": "boost-mp11", "version": "1.84.0" }, + { "name": "boost-mpl", "version": "1.84.0" }, + { "name": "boost-multiprecision", "version": "1.84.0" }, + { "name": "boost-multi-index", "version": "1.84.0" }, + { "name": "boost-numeric-conversion", "version": "1.84.0" }, + { "name": "boost-optional", "version": "1.84.0" }, + { "name": "boost-phoenix", "version": "1.84.0" }, + { "name": "boost-pool", "version": "1.84.0" }, + { "name": "boost-predef", "version": "1.84.0" }, + { "name": "boost-preprocessor", "version": "1.84.0" }, + { "name": "boost-program-options", "version": "1.84.0" }, + { "name": "boost-proto", "version": "1.84.0" }, + { "name": "boost-random", "version": "1.84.0" }, + { "name": "boost-range", "version": "1.84.0" }, + { "name": "boost-ratio", "version": "1.84.0" }, + { "name": "boost-rational", "version": "1.84.0" }, + { "name": "boost-regex", "version": "1.84.0" }, + { "name": "boost-scope-exit", "version": "1.84.0" }, + { "name": "boost-serialization", "version": "1.84.0" }, + { "name": "boost-smart-ptr", "version": "1.84.0" }, + { "name": "boost-spirit", "version": "1.84.0" }, + { "name": "boost-static-assert", "version": "1.84.0" }, + { "name": "boost-system", "version": "1.84.0" }, + { "name": "boost-thread", "version": "1.84.0" }, + { "name": "boost-throw-exception", "version": "1.84.0" }, + { "name": "boost-tokenizer", "version": "1.84.0" }, + { "name": "boost-tuple", "version": "1.84.0" }, + { "name": "boost-type-index", "version": "1.84.0" }, + { "name": "boost-type-traits", "version": "1.84.0" }, + { "name": "boost-typeof", "version": "1.84.0" }, + { "name": "boost-uninstall", "version": "1.84.0" }, + { "name": "boost-unordered", "version": "1.84.0" }, + { "name": "boost-utility", "version": "1.84.0" }, + { "name": "boost-variant", "version": "1.84.0" }, + { "name": "boost-variant2", "version": "1.84.0" }, + { "name": "boost-vcpkg-helpers", "version": "1.84.0" }, + { "name": "boost-winapi", "version": "1.84.0" }, { "name": "curl", "version": "8.4.0" }, { "name": "double-conversion", "version": "3.2.1" }, { "name": "fmt", "version": "10.2.1" },