partial merge #17398: Update leveldb to 1.22+#4230
partial merge #17398: Update leveldb to 1.22+#4230PastaPastaPasta merged 8 commits intodashpay:developfrom
Conversation
|
Please rebase and fix linter failure |
|
14128 was just merged via #4227 so linter should be happy after rebase |
|
Rebased and updated |
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
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 |
UdjinM6
changed the title
Upstream leveldb switched build systems, which means we need to define a few different values. Co-authored-by: UdjinM6 <[email protected]>
Co-authored-by: UdjinM6 <[email protected]>
| * 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.
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
* 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 <[email protected]> * 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 <[email protected]> * build: CRC32C build system integration Co-authored-by: UdjinM6 <[email protected]>
3 participants
Depends on the merger of #4242