Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

maint: Update to folly 2023.09.25.00 #1576

Merged
merged 18 commits into from
Jun 5, 2024
Merged

maint: Update to folly 2023.09.25.00 #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4e319e1
build: Dynamically link the C++ stdlib
jjerphan May 15, 2024
691edbe
Add overlay for boost 1.80
jjerphan May 15, 2024
313bbea
patch: Set FOLLY_HAVE_SO_TIMESTAMPING to 0
jjerphan May 15, 2024
cdc6b1f
patch: Do not use PRId64
jjerphan May 15, 2024
3f60831
Test fix patch
jjerphan May 16, 2024
f6f8d99
Remove STATIC_LINK_STD_LIB in CMakePresets
jjerphan May 16, 2024
beb85b0
Use C++20
jjerphan May 16, 2024
f55ca51
Do not explicitly specify libgcc_s and stdlibc++
jjerphan May 16, 2024
fcbb258
Promote warning to errors
jjerphan May 16, 2024
f1de2ae
Update to boost 1.84
jjerphan May 17, 2024
1d0b34a
patch: Deactivate libunwind features
jjerphan May 17, 2024
c70edea
Remove vcpkg overlay for boost-filesystem
jjerphan May 17, 2024
1c4f6e9
maint: Update to folly 2023.09.25.00
jjerphan May 17, 2024
2543d9d
Define getNamePrefix
jjerphan May 21, 2024
665a9a1
Merge branch 'master' into maint/update-to-folly-2023.09.25.00
jjerphan Jun 4, 2024
e2e9d39
Inline missing group id constant
jjerphan Jun 4, 2024
042f3a1
Revert "Inline missing group id constant"
jjerphan Jun 4, 2024
e39456b
Merge branch 'master' into maint/update-to-folly-2023.09.25.00
jjerphan Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions cpp/arcticdb/async/task_scheduler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,12 @@ class InstrumentedNamedFactory : public folly::ThreadFactory{
ARCTICDB_SAMPLE_THREAD();
func();
});

}
// we use a modern version of folly when consuming dependencies from conda
#ifdef ARCTICDB_USING_CONDA

}

virtual const std::string& getNamePrefix() const override{
return named_factory_.getNamePrefix();
}
#endif

private:
std::mutex mutex_;
Expand Down
27 changes: 0 additions & 27 deletions cpp/third_party/vcpkg_overlays/folly/0001-Include-missing-headers.patch
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions cpp/third_party/vcpkg_overlays/folly/0002-Workaround-demangling-callback.patch
View file
Open in desktop

This file was deleted.

25 changes: 25 additions & 0 deletions cpp/third_party/vcpkg_overlays/folly/0005-Deactivate-libunwind-features.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From c1ea3a2b60e2a153663abe5c3aa1c9bf51754b25 Mon Sep 17 00:00:00 2001
From: Julien Jerphanion <git@jjerphan.xyz>
Date: Fri, 17 May 2024 17:17:53 +0200
Subject: [PATCH] Deactivate libunwind features

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
---
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 <folly/portability/Config.h>
#include <folly/tracing/AsyncStack.h>

+#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

7 changes: 3 additions & 4 deletions cpp/third_party/vcpkg_overlays/folly/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF d8ed9cd2869c74b00fa6f1a7603301183f5c2249 #v2022.10.31.00
SHA512 55040dadb8a847f0d04c37a2dce920bb456a59decebc90920831998df9671feb33daf1f4235115adcce5eb9c469b97b9d96fa7a67a5914c434ebc1efc04f4770
REF 61c11d77eb9a8bdc60f673017fccfbe900125cb6 # v2023.09.25.00
SHA512 061413eaa14d8fc6d122f9fbf5ba66690d824461d256b3df1445f8de55832398ddb952d33121f7f576d18051809e3d6e648f465e3f4b4fa7df07781c1ba7219b
HEAD_REF main
PATCHES
no_exception_tracer.patch
Expand All @@ -20,10 +20,9 @@ vcpkg_from_github(
fix-deps.patch
dont-inherit-cpp-version.patch
ignore-uninitialized-local-variable-used.patch
0001-Include-missing-headers.patch
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")
Expand Down
4 changes: 2 additions & 2 deletions cpp/third_party/vcpkg_overlays/folly/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "folly",
"version-string": "2022.10.31.00",
"port-version": 6,
"version-string": "2023.09.25.00",
"port-version": 0,
"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",
Expand Down
154 changes: 77 additions & 77 deletions cpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,86 +73,86 @@
{ "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" },
{ "name": "folly", "version-string": "2022.10.31.00#3" },
{ "name": "folly", "version-string": "2023.09.25.00" },
{ "name": "gflags", "version": "2.2.2#5" },
{ "name": "glog", "version": "0.6.0#2" },
{ "name": "gtest", "version": "1.12.1" },
Expand Down
Loading