Skip to content

Commit cf80c2a

Browse files
ajkrmayuehappy
authored andcommitted
Update pinned folly version (#12801)
Summary: facebook/folly@843fd57 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: facebook/rocksdb#12801 Reviewed By: cbi42 Differential Revision: D58921033 Pulled By: ajkr fbshipit-source-id: 442ea3ff83ced2679ea9bfd04945e9449ce2ff96 (cherry picked from commit 13549817afd97ce29705c42e87fa945056fd2d11)
1 parent 4f6af2c commit cf80c2a

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -2494,13 +2494,11 @@ checkout_folly:
24942494
fi
24952495
@# Pin to a particular version for public CI, so that PR authors don't
24962496
@# need to worry about folly breaking our integration. Update periodically
2497-
cd third-party/folly && git reset --hard 17054c85c2dee0e84cbee7ef28d7bae7d0b1630e
2497+
cd third-party/folly && git reset --hard c48fdd205c1c291651749d532b8055fe822bba25
24982498
@# NOTE: this hack is required for clang in some cases
24992499
perl -pi -e 's/int rv = syscall/int rv = (int)syscall/' third-party/folly/folly/detail/Futex.cpp
25002500
@# NOTE: this hack is required for gcc in some cases
25012501
perl -pi -e 's/(__has_include.<experimental.memory_resource>.)/__cpp_rtti && $$1/' third-party/folly/folly/memory/MemoryResource.h
2502-
@# NOTE: this hack is only needed if building target build_folly in the future
2503-
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
25042502
@# NOTE: boost source will be needed for any build including `USE_FOLLY_LITE` builds as those depend on boost headers
25052503
cd third-party/folly && $(PYTHON) build/fbcode_builder/getdeps.py fetch boost
25062504

0 commit comments

Comments
 (0)