-
Notifications
You must be signed in to change notification settings - Fork 1.2k
partial merge #17398: Update leveldb to 1.22+ #4230
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.
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
Conversation
Please rebase and fix linter failure |
14128 was just merged via #4227 so linter should be happy after rebase |
Rebased and updated |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like we also need (at least) 16314. Also, I just realilzed that I don't understand how to merge this - we are mixing per-PR vs per-commit backports here. Let's move all unrelated backports (14785, 16314, 17052) into their own PR and keep this one for commits from 17398 only.
14785, 16314, 17052 are in their own PR (they're repeated here as the PR won't be complete otherwise) and upon merge the diffs will only be related to LevelDB |
Upstream leveldb switched build systems, which means we need to define a few different values. Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, utACK
@@ -19,6 +19,7 @@ maintained: | |||
* for `src/leveldb`: https://github.com/bitcoin-core/leveldb.git (branch bitcoin-fork) | |||
* for `src/univalue`: https://github.com/bitcoin-core/univalue.git (branch master) | |||
* for `src/crypto/ctaes`: https://github.com/bitcoin-core/ctaes.git (branch master) | |||
* for `src/crc32c`: https://github.com/google/crc32c.git (branch master) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
test: Add crc32c to subtree check linter
doesn't do bitcoin@84ff1b2#diff-a12151b9941bfec9b94144ff38616fb4e3c081bc96a25591f966eef045eafeecR17
Why?
B/c we don't have this linter. I guess that's fine
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
* Update to leveldb upstream using subtree merge * Import crc32c using subtree merge as as 'src/crc32c' * build: Update build system for new leveldb Upstream leveldb switched build systems, which means we need to define a few different values. Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com> * doc: Add crc32c subtree to developer notes * test: Add crc32c to subtree check linter * test: Add crc32c exception to various linters and generation scripts * build: Add LCOV exception for crc32c Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com> * build: CRC32C build system integration Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
Depends on the merger of #4242