From 9a10201138756a01b0954342bfb18a05723ebf72 Mon Sep 17 00:00:00 2001 From: Andrew Kryczka Date: Mon, 24 Jun 2024 10:46:29 -0700 Subject: [PATCH] Update pinned folly version (#12801) Summary: https://github.com/facebook/folly/commit/843fd576793d91c4c55fa3495b1694e5d708c54b fixed the URL for libsodium. Updated folly version to latest, which includes that commit. I am not sure the URL will be stable, but it still seems better than substituting the URL. Pull Request resolved: https://github.com/facebook/rocksdb/pull/12801 Reviewed By: cbi42 Differential Revision: D58921033 Pulled By: ajkr fbshipit-source-id: 442ea3ff83ced2679ea9bfd04945e9449ce2ff96 (cherry picked from commit 13549817afd97ce29705c42e87fa945056fd2d11) --- .circleci/config.yml | 6 ++++++ Makefile | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fbeb41143..1c1feced2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -433,6 +433,9 @@ jobs: build-linux-cmake-with-folly: executor: linux-docker resource_class: xlarge + environment: + CC: gcc-10 + CXX: g++-10 steps: - pre-steps - setup-folly @@ -443,6 +446,9 @@ jobs: build-linux-cmake-with-folly-lite-no-test: executor: linux-docker resource_class: xlarge + environment: + CC: gcc-10 + CXX: g++-10 steps: - pre-steps - setup-folly diff --git a/Makefile b/Makefile index fc726dcd7..cafd48529 100644 --- a/Makefile +++ b/Makefile @@ -2494,13 +2494,11 @@ checkout_folly: fi @# Pin to a particular version for public CI, so that PR authors don't @# need to worry about folly breaking our integration. Update periodically - cd third-party/folly && git reset --hard 17054c85c2dee0e84cbee7ef28d7bae7d0b1630e + cd third-party/folly && git reset --hard c48fdd205c1c291651749d532b8055fe822bba25 @# NOTE: this hack is required for clang in some cases perl -pi -e 's/int rv = syscall/int rv = (int)syscall/' third-party/folly/folly/detail/Futex.cpp @# NOTE: this hack is required for gcc in some cases perl -pi -e 's/(__has_include..)/__cpp_rtti && $$1/' third-party/folly/folly/memory/MemoryResource.h - @# NOTE: this hack is only needed if building target build_folly in the future - perl -pi -e 's,https://github.com/jedisct1/libsodium/releases/download/1.0.17/libsodium-1.0.17.tar.gz,https://download.libsodium.org/libsodium/releases/old/unsupported/libsodium-1.0.17.tar.gz,' third-party/folly/build/fbcode_builder/manifests/libsodium @# NOTE: boost source will be needed for any build including `USE_FOLLY_LITE` builds as those depend on boost headers cd third-party/folly && $(PYTHON) build/fbcode_builder/getdeps.py fetch boost