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

upstream: Update minisketch subtree #24262

Merged
merged 2 commits into from Feb 4, 2022

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Feb 4, 2022

Marco mentioned issues running the native valgrind job (it sets -Werror) on arm64 hardware due to compile errors:

minisketch/src/minisketch.cpp:66:20: error: unused function 'EnableClmul' [-Werror,-Wunused-function]

Pull the subtree to fix this. The only change here is sipa/minisketch#58.

7eeb778fef Merge sipa/minisketch#58: Move `#ifdef HAVE_CLMUL` guard outside of the EnableClmul definition
4d9db2b897 Move `#ifdef HAVE_CLMUL` guard outside of the EnableClmul definition

git-subtree-dir: src/minisketch
git-subtree-split: 7eeb778fef45e21abca01ede85cf0a82e8a510df
@maflcko
Copy link
Member

maflcko commented Feb 4, 2022

Concept ACK. Going to test on my arm64 box, which currently fails

@maflcko
Copy link
Member

maflcko commented Feb 4, 2022

cr ACK 4382d09

@maflcko
Copy link
Member

maflcko commented Feb 4, 2022

t ACK

@maflcko maflcko merged commit b2a8371 into bitcoin:master Feb 4, 2022
@fanquake fanquake deleted the update_minisketch_subtree branch February 4, 2022 23:54
@fanquake
Copy link
Member Author

fanquake commented Feb 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
c3b7ae29fd41b6421b773c8785be749e584d17d82f76075d5bf297bf2e5aac38  guix-build-4382d098964c/output/aarch64-linux-gnu/SHA256SUMS.part
7741935dd784f89ac19ba4a123f03979681fa344735b2f282fcf00e637f8ef96  guix-build-4382d098964c/output/aarch64-linux-gnu/bitcoin-4382d098964c-aarch64-linux-gnu-debug.tar.gz
66057a5c5472ea07ede8f772433d616eb41a40cb1f2828852bc737c1a91efce7  guix-build-4382d098964c/output/aarch64-linux-gnu/bitcoin-4382d098964c-aarch64-linux-gnu.tar.gz
634649d452aa2397a0f2e9e9f6bcd98782ed7d983dc388161c975768328fc236  guix-build-4382d098964c/output/arm-linux-gnueabihf/SHA256SUMS.part
0b6f4da96542012da6ded4c72f81fe0b18a91d894e7049a831b859b01e165fbc  guix-build-4382d098964c/output/arm-linux-gnueabihf/bitcoin-4382d098964c-arm-linux-gnueabihf-debug.tar.gz
ed81e691a83108ac04037c0a92590e1a50f7b87086eeb646753014df81ac62bd  guix-build-4382d098964c/output/arm-linux-gnueabihf/bitcoin-4382d098964c-arm-linux-gnueabihf.tar.gz
d8c1398453abc39ea2a93324ad2c59abbb21126d951520dc134e6f34a33534ca  guix-build-4382d098964c/output/arm64-apple-darwin/SHA256SUMS.part
9d85fa96078982b9703637d1d4f6992801674d48edd6bb1186118d619b8e4c64  guix-build-4382d098964c/output/arm64-apple-darwin/bitcoin-4382d098964c-arm64-apple-darwin.tar.gz
4b2cecac17329cac0886b3fe6778ac0b5e4a88b5d48ebf7950d8f27ccb86bbb2  guix-build-4382d098964c/output/arm64-apple-darwin/bitcoin-4382d098964c-osx-unsigned.dmg
3ea262084d53ed2528aa7768c685ed80b309ceda76bd21fb8951a47f29f48a17  guix-build-4382d098964c/output/arm64-apple-darwin/bitcoin-4382d098964c-osx-unsigned.tar.gz
9d3850ab625f1fab86cc7559e3be59da1cbe8cd258dc6f301ecdfb3e11782159  guix-build-4382d098964c/output/dist-archive/bitcoin-4382d098964c.tar.gz
c69f3870c97e5512096a18b07232fcd00913422183bb172bb65f619ff0abe816  guix-build-4382d098964c/output/powerpc64-linux-gnu/SHA256SUMS.part
c2d91a19058bf2fed1545c44e732164c2180f4902be8c11a74335bc4d979037a  guix-build-4382d098964c/output/powerpc64-linux-gnu/bitcoin-4382d098964c-powerpc64-linux-gnu-debug.tar.gz
6ed2deb28470f09718e7cf50e182eea8ee4befed1c6fa373980410f92657d0d7  guix-build-4382d098964c/output/powerpc64-linux-gnu/bitcoin-4382d098964c-powerpc64-linux-gnu.tar.gz
068dbb01c0d3bf6f676fd0ada7d21b08d8417c091d11494f904fb57f450c478d  guix-build-4382d098964c/output/powerpc64le-linux-gnu/SHA256SUMS.part
ee3ad31173a33d8b955237cb3ab678b1f5baf6a60c8043424f932f6950d48f3e  guix-build-4382d098964c/output/powerpc64le-linux-gnu/bitcoin-4382d098964c-powerpc64le-linux-gnu-debug.tar.gz
00813714a6fc93de26815abc7add069004d206fa7e135771ebcbce08f6f7f610  guix-build-4382d098964c/output/powerpc64le-linux-gnu/bitcoin-4382d098964c-powerpc64le-linux-gnu.tar.gz
c6a3099669f9e2d9f77cbfbad210f1b488dce326f63cf346eac117cb3eed94fb  guix-build-4382d098964c/output/riscv64-linux-gnu/SHA256SUMS.part
f8c44f40e10b9ce0672ba8bbdbd471e7aa834e2f99e6669d7c91280699a16a69  guix-build-4382d098964c/output/riscv64-linux-gnu/bitcoin-4382d098964c-riscv64-linux-gnu-debug.tar.gz
4482eb53d2d76b214117dbed0eecfabce2153e343c2e914e528577396283f3ef  guix-build-4382d098964c/output/riscv64-linux-gnu/bitcoin-4382d098964c-riscv64-linux-gnu.tar.gz
6a08fd838184f9d42301ab3699a30e6592a86e85109093ac12a6910f4af40470  guix-build-4382d098964c/output/x86_64-apple-darwin/SHA256SUMS.part
4ea53e41ebaefbe4f3ccc0dc1ee8ac941fe33985d1a90585e4d025c499a68d73  guix-build-4382d098964c/output/x86_64-apple-darwin/bitcoin-4382d098964c-osx-unsigned.dmg
921edc84d49658126af66fde9a7dfc782f05fdc3a0657cb5b70ee08fca05f2da  guix-build-4382d098964c/output/x86_64-apple-darwin/bitcoin-4382d098964c-osx-unsigned.tar.gz
7933f2db8fff21389400dfaabfad7f875cd54a627430c323c35b39f01ec7f03e  guix-build-4382d098964c/output/x86_64-apple-darwin/bitcoin-4382d098964c-osx64.tar.gz
f701f7c52e9055846d37c28fcb001dda95255fe562630174ca48b320a58a58b5  guix-build-4382d098964c/output/x86_64-linux-gnu/SHA256SUMS.part
436db0326bb9692c897f943253a26089b47725e1bcf8a309c3009687bfa6d725  guix-build-4382d098964c/output/x86_64-linux-gnu/bitcoin-4382d098964c-x86_64-linux-gnu-debug.tar.gz
7a26ae9e7c38d736577579b6c0815921f3a528c44a0189ef267d3cb351c49012  guix-build-4382d098964c/output/x86_64-linux-gnu/bitcoin-4382d098964c-x86_64-linux-gnu.tar.gz

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Feb 6, 2022
8fcb19f Squashed 'src/minisketch/' changes from 89629eb2c7..7eeb778fef (fanquake)

Pull request description:

  Marco mentioned issues running the native valgrind job (it sets `-Werror`) on arm64 hardware due to compile errors:
  ```bash
  minisketch/src/minisketch.cpp:66:20: error: unused function 'EnableClmul' [-Werror,-Wunused-function]
  ```

  Pull the subtree to fix this. The only change here is sipa/minisketch#58.

ACKs for top commit:
  MarcoFalke:
    cr ACK 4382d09

Tree-SHA512: 8dbb2d8a4269e187987a9e6084c6265ed8256859b0776474c2d332df64427cd55608932e1e2053dcc3d8d1699a82c667afae20c3db7a35407bea662ada65a5f7
@bitcoin bitcoin locked and limited conversation to collaborators Feb 4, 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