Skip to content

Conversation

kwvg
Copy link
Collaborator

@kwvg kwvg commented Jul 2, 2021

Depends on the merger of #4242

@kwvg kwvg requested a review from UdjinM6 July 4, 2021 06:13
@PastaPastaPasta
Copy link
Member

Please rebase and fix linter failure

@UdjinM6
Copy link

UdjinM6 commented Jul 8, 2021

14128 was just merged via #4227 so linter should be happy after rebase

@kwvg
Copy link
Collaborator Author

kwvg commented Jul 9, 2021

Rebased and updated

Copy link

@UdjinM6 UdjinM6 left a 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.

@kwvg kwvg requested a review from UdjinM6 July 11, 2021 08:29
@kwvg
Copy link
Collaborator Author

kwvg commented Jul 11, 2021

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 UdjinM6 changed the title merge #17398: Update leveldb to 1.22+ partial merge #17398: Update leveldb to 1.22+ Jul 13, 2021
@PastaPastaPasta PastaPastaPasta added this to the 18 milestone Jul 14, 2021
kwvg and others added 6 commits July 15, 2021 22:53
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>
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, utACK

@UdjinM6 UdjinM6 requested a review from PastaPastaPasta July 15, 2021 18:46
@@ -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)
Copy link
Member

@PastaPastaPasta PastaPastaPasta Jul 15, 2021

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

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@PastaPastaPasta PastaPastaPasta merged commit da33c96 into dashpay:develop Jul 15, 2021
gades pushed a commit to cosanta/cosanta-core that referenced this pull request May 4, 2022
* 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>
@kwvg kwvg deleted the leveldb branch July 18, 2023 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants