Skip to content
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

build: Minor leveldb subtree update #24461

Merged
merged 2 commits into from Mar 7, 2022
Merged

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Mar 2, 2022

A minor change to:

  • Consistently use the same symbol names in the whole project.
  • Fix compiling with C++20.

MarcoFalke added 2 commits March 2, 2022 15:24
330dd6235f Merge bitcoin-core/leveldb-subtree#31: Use memory_order symbols consistently
93ee8d875e Merge pull request bitcoin#965 from ShawnZhong:cpp20

git-subtree-dir: src/leveldb
git-subtree-split: 330dd6235f50c01e49b4cfadf6df9e026dc61f0d
@maflcko maflcko added this to the 24.0 milestone Mar 2, 2022
@fanquake
Copy link
Member

fanquake commented Mar 4, 2022

Guix Build:

bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
40e9180ddbc0ac76e988b24f9b10b789d14bc82299a7b807c598386f0c492bf7  guix-build-fa0c32eb74f4/output/aarch64-linux-gnu/SHA256SUMS.part
fe7010da4987f4ee5c6ed299e6dbb909a387a839dc04a9d5a60465ad9cbe3825  guix-build-fa0c32eb74f4/output/aarch64-linux-gnu/bitcoin-fa0c32eb74f4-aarch64-linux-gnu-debug.tar.gz
65e12e7588b803085ab03136e028f68b488c70412daad40bd8f662aaaad41307  guix-build-fa0c32eb74f4/output/aarch64-linux-gnu/bitcoin-fa0c32eb74f4-aarch64-linux-gnu.tar.gz
2eec1d2b01753909f5efaea725d531c62a6473f2bde8ad3e47e1f4ca97660d55  guix-build-fa0c32eb74f4/output/arm-linux-gnueabihf/SHA256SUMS.part
795ac7ea08ec9d0b6ea20390d46b330c21fb5e9b35c789cf6b05ae1c4d60a075  guix-build-fa0c32eb74f4/output/arm-linux-gnueabihf/bitcoin-fa0c32eb74f4-arm-linux-gnueabihf-debug.tar.gz
2f52f9b70a3c5deaad1f22a0fce86300da3651573b2a23f103464dbae7130174  guix-build-fa0c32eb74f4/output/arm-linux-gnueabihf/bitcoin-fa0c32eb74f4-arm-linux-gnueabihf.tar.gz
0b56bc686a3880cd5eac141a8ff38b1b43433a3f2896a78169c58a49980ecda7  guix-build-fa0c32eb74f4/output/arm64-apple-darwin/SHA256SUMS.part
34e1dc684ef60d7e7f01509df2b735060cf1adc5fb79564bec3fc746465d3804  guix-build-fa0c32eb74f4/output/arm64-apple-darwin/bitcoin-fa0c32eb74f4-arm64-apple-darwin.tar.gz
53fa9d6c57420402ba682d5c8f45a015a2b9332be1e1b16f40920a45fed1cc72  guix-build-fa0c32eb74f4/output/arm64-apple-darwin/bitcoin-fa0c32eb74f4-osx-unsigned.dmg
4e1c8224c22afd9e141c3d8ff68a227fa916df0f2fe03f9d544697e2fffe710e  guix-build-fa0c32eb74f4/output/arm64-apple-darwin/bitcoin-fa0c32eb74f4-osx-unsigned.tar.gz
2fe613cd3b4161ccafb940d057c6a3f8acdf09282632e673c57a9c5226e13986  guix-build-fa0c32eb74f4/output/dist-archive/bitcoin-fa0c32eb74f4.tar.gz
381e580e51b10a0ac6b797f754b5536a5ad1d77c6bbfe98ad02689f6c1dfa8e1  guix-build-fa0c32eb74f4/output/powerpc64-linux-gnu/SHA256SUMS.part
c705a2b06f50a66a42683c7ce93c5ae6f99e2b894e7068a49e32e890683d4599  guix-build-fa0c32eb74f4/output/powerpc64-linux-gnu/bitcoin-fa0c32eb74f4-powerpc64-linux-gnu-debug.tar.gz
3824bcfe88ce23623d31a9d361d22d649a26897bbaba82dd736fbd1bab8269c6  guix-build-fa0c32eb74f4/output/powerpc64-linux-gnu/bitcoin-fa0c32eb74f4-powerpc64-linux-gnu.tar.gz
14a031dc8bd572794681c48bf53a8af7b0a57cdccfff148f9bd0088796467f07  guix-build-fa0c32eb74f4/output/powerpc64le-linux-gnu/SHA256SUMS.part
81110fde33ae80bc8c756a9138c0d8b54a832d47f4ce0cdcb737716cb1b687f7  guix-build-fa0c32eb74f4/output/powerpc64le-linux-gnu/bitcoin-fa0c32eb74f4-powerpc64le-linux-gnu-debug.tar.gz
235ddeff7c66a6e5bb0888098ef7bd027ef04e367e709f04fec1f34fef32f192  guix-build-fa0c32eb74f4/output/powerpc64le-linux-gnu/bitcoin-fa0c32eb74f4-powerpc64le-linux-gnu.tar.gz
fe6de14df3a1108a7232406bab14e57dfe7560d770851e2046660a778af883f0  guix-build-fa0c32eb74f4/output/riscv64-linux-gnu/SHA256SUMS.part
5cd800641a61e102bea4414e5c9598ad88131a9dd145beb716de45aebd247458  guix-build-fa0c32eb74f4/output/riscv64-linux-gnu/bitcoin-fa0c32eb74f4-riscv64-linux-gnu-debug.tar.gz
1146214e9a34d8e4d3ccfbfacf3cf925af8c4af617c646d781d5af08a085e7dd  guix-build-fa0c32eb74f4/output/riscv64-linux-gnu/bitcoin-fa0c32eb74f4-riscv64-linux-gnu.tar.gz
8c24b6be55bdfa0dfe891a8949159f880d44d6ac63c2cfcf386107ba71a18bfb  guix-build-fa0c32eb74f4/output/x86_64-apple-darwin/SHA256SUMS.part
ac4e657d907d92c7aba59de9ecc7eba536be1b7702f079e5395e665120b3af88  guix-build-fa0c32eb74f4/output/x86_64-apple-darwin/bitcoin-fa0c32eb74f4-osx-unsigned.dmg
e6ef146bac37cfb5fafa401b647f164ee42cae1b654bc10f9b314c8ed96a63d4  guix-build-fa0c32eb74f4/output/x86_64-apple-darwin/bitcoin-fa0c32eb74f4-osx-unsigned.tar.gz
9c42ecfc9530e6ac0857a62e28671f4a664f63b7bd25836be65440bc61566eee  guix-build-fa0c32eb74f4/output/x86_64-apple-darwin/bitcoin-fa0c32eb74f4-osx64.tar.gz
8591bc19df89427180d73307a88f362dbd1e31dde565f3cc8ed19eceb369d959  guix-build-fa0c32eb74f4/output/x86_64-linux-gnu/SHA256SUMS.part
472f1a5fdae71102dc74fd1f22b00a4bf1e6d6ed9205e09b7f75d797c72ac1db  guix-build-fa0c32eb74f4/output/x86_64-linux-gnu/bitcoin-fa0c32eb74f4-x86_64-linux-gnu-debug.tar.gz
9bb288a0ecc07b4ea98ff451cb89bb2630296fbe23cdd874352c3c8627aac420  guix-build-fa0c32eb74f4/output/x86_64-linux-gnu/bitcoin-fa0c32eb74f4-x86_64-linux-gnu.tar.gz
dc13d1b785d682d0f97a669932a210770814dc62f0a2b2f94eb1e7679f646c45  guix-build-fa0c32eb74f4/output/x86_64-w64-mingw32/SHA256SUMS.part
c13c16dee4a580791074209e9083232a4b5a184caa0dd61cc248cf57d5fe7b69  guix-build-fa0c32eb74f4/output/x86_64-w64-mingw32/bitcoin-fa0c32eb74f4-win-unsigned.tar.gz
9829a8a88de455cb467ca03e3df80fa94e518efca808d07867bd40ef290d261f  guix-build-fa0c32eb74f4/output/x86_64-w64-mingw32/bitcoin-fa0c32eb74f4-win64-debug.zip
28d8df0f71be839f97536774f82b82b732aaa253d386bb4b0628967d9ea057ae  guix-build-fa0c32eb74f4/output/x86_64-w64-mingw32/bitcoin-fa0c32eb74f4-win64-setup-unsigned.exe
53461de4707b0be8c03b0580edf2d0a11222c70f53e125958652cba99be2e99c  guix-build-fa0c32eb74f4/output/x86_64-w64-mingw32/bitcoin-fa0c32eb74f4-win64.zip

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

ACK fa0c32e

Only change is bitcoin-core/leveldb-subtree#31.

./test/lint/git-subtree-check.sh src/leveldb
src/leveldb in HEAD currently refers to tree ec962385fa0c9a3b47a1f519216b4b67bb0cad8c
src/leveldb in HEAD was last updated in commit 1b20109b04061304eab84cf921a030300b4f9fe3 (tree ec962385fa0c9a3b47a1f519216b4b67bb0cad8c)
GOOD

@fanquake fanquake merged commit b9894a1 into bitcoin:master Mar 7, 2022
@maflcko maflcko deleted the 2203-leveldb-🔛 branch March 7, 2022 12:24
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Mar 7, 2022
1b20109 Squashed 'src/leveldb/' changes from f8ae182c1e..330dd6235f (MarcoFalke)

Pull request description:

  A minor change to:

  * Consistently use the same symbol names in the whole project.
  * Fix compiling with C++20.

ACKs for top commit:
  fanquake:
    ACK fa0c32e

Tree-SHA512: b5d4540dd621cf4aa8caac811bae03bb74e502a31dbdda9354182e4caa39905550e62ad3cf8ea7d7f9bfc3e5120d119d34ab0f1e633716ec8089876037cbf192
@bitcoin bitcoin locked and limited conversation to collaborators Mar 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants