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.

Sign up for GitHub

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

Jump to bottom

build: sync ax_boost_base from upstream #26002

Merged
merged 1 commit into from
Sep 9, 2022
Merged

build: sync ax_boost_base from upstream #26002

merged 1 commit into from
Sep 9, 2022

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Sep 4, 2022

I upstreamed our change, autoconf-archive/autoconf-archive#260, so sync with upstream.

Slightly simplifies #25465.

@fanquake
build: sync ax_boost_base from upstream
85f0f93 
I upstreamed our change,
autoconf-archive/autoconf-archive#260, so sync
with upstream.

Slightly simplifies bitcoin#25465.
@fanquake fanquake mentioned this pull request Sep 4, 2022
Merged
@Sjors
Copy link
Member

Sjors commented Sep 5, 2022

tACK 85f0f93

File matches the new upstream and I can still compile on an Intel mac (though this change is for arm64).

@jarolrod
Copy link
Member

jarolrod commented Sep 8, 2022 •
edited
Loading

GUIX hashes

x86:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

880cfc0fee4645c5c7aa25ad6f307ec401ca504212159f6be98d4c677855c34a  guix-build-85f0f933b4b7/output/aarch64-linux-gnu/SHA256SUMS.part
b75c5b9b323783a4ed9b085d5dff68a126850901f764e5d02c3c17b1816c5a75  guix-build-85f0f933b4b7/output/aarch64-linux-gnu/bitcoin-85f0f933b4b7-aarch64-linux-gnu-debug.tar.gz
7a7c2a3c29af69253384cb57f311f28772e8018f7337b9527bcacdfaf33741c8  guix-build-85f0f933b4b7/output/aarch64-linux-gnu/bitcoin-85f0f933b4b7-aarch64-linux-gnu.tar.gz
e7ed3447aad799cf3bf8f90eab748a4f3ccfd2d64fddc9ea9b64810be27f326e  guix-build-85f0f933b4b7/output/arm-linux-gnueabihf/SHA256SUMS.part
ca7070ba1a62521666bb588a9b122e21cfb41a6b831ce7092ea90c0468925e08  guix-build-85f0f933b4b7/output/arm-linux-gnueabihf/bitcoin-85f0f933b4b7-arm-linux-gnueabihf-debug.tar.gz
df4f69c2d3ec37986818111bcf3b768a6954fb4d7a0133798b8b2f133dead2e7  guix-build-85f0f933b4b7/output/arm-linux-gnueabihf/bitcoin-85f0f933b4b7-arm-linux-gnueabihf.tar.gz
1f98a08591f24cde11090104795dddaa4ba103c8b991b37f0e1bd135eba7afc6  guix-build-85f0f933b4b7/output/arm64-apple-darwin/SHA256SUMS.part
1039a8ebe1786349c517dd245f046198877e17e778c10288670a1be2b78be37e  guix-build-85f0f933b4b7/output/arm64-apple-darwin/bitcoin-85f0f933b4b7-arm64-apple-darwin-unsigned.dmg
4e58622efc7a43882b60f650200a32495ecd3fd1536bfba5036dfeb9c6579d7e  guix-build-85f0f933b4b7/output/arm64-apple-darwin/bitcoin-85f0f933b4b7-arm64-apple-darwin-unsigned.tar.gz
cec05d3b6e12b77618daf0a5a12f97ee26fa82cf8ec14cb9b8e488730e22c668  guix-build-85f0f933b4b7/output/arm64-apple-darwin/bitcoin-85f0f933b4b7-arm64-apple-darwin.tar.gz
601b0afffe444155c4d17558a8c656f7aa9b2486c58f05011b2c27540b318338  guix-build-85f0f933b4b7/output/dist-archive/bitcoin-85f0f933b4b7.tar.gz
bcabc8924045ebfc513d4ef74900c493fec30f6a4b76dfe48c506fbb1fb7716f  guix-build-85f0f933b4b7/output/powerpc64-linux-gnu/SHA256SUMS.part
d35c50ff87626f59a7f03c487de99bccbf4afc2e843991f0f2654b540f6ee1dc  guix-build-85f0f933b4b7/output/powerpc64-linux-gnu/bitcoin-85f0f933b4b7-powerpc64-linux-gnu-debug.tar.gz
cadde4ab8ba96c07ab8d8c15cff4c737336c0895c27edcf7aa79260269a00e14  guix-build-85f0f933b4b7/output/powerpc64-linux-gnu/bitcoin-85f0f933b4b7-powerpc64-linux-gnu.tar.gz
84bbd4fedde5644469de3d63eb3bd9ad248ae54c1e29955e6a8b9db6f2843f86  guix-build-85f0f933b4b7/output/powerpc64le-linux-gnu/SHA256SUMS.part
c9576f7835917591a8e8b308eb2c15aa5fd139fb61dd16b476479e117f3e9ca0  guix-build-85f0f933b4b7/output/powerpc64le-linux-gnu/bitcoin-85f0f933b4b7-powerpc64le-linux-gnu-debug.tar.gz
8bbac730cd84ff00a9a3ecb6ae89cfad4ca8bcac8e85ffb21c510f96539484d9  guix-build-85f0f933b4b7/output/powerpc64le-linux-gnu/bitcoin-85f0f933b4b7-powerpc64le-linux-gnu.tar.gz
860e104ec4e036b8532af0ef18bb10437bb8e563a433bfebc6807af3fa6e8d47  guix-build-85f0f933b4b7/output/riscv64-linux-gnu/SHA256SUMS.part
2d434668d3f1aa21803f39d1c98612b95c0d3c7987fe58042fefe01698f759ed  guix-build-85f0f933b4b7/output/riscv64-linux-gnu/bitcoin-85f0f933b4b7-riscv64-linux-gnu-debug.tar.gz
49c820c8bae043740570ac699425d2159ec57d561f5c50459ac159f16be066c7  guix-build-85f0f933b4b7/output/riscv64-linux-gnu/bitcoin-85f0f933b4b7-riscv64-linux-gnu.tar.gz
dbf653b7f80b914e206ea8210d6e4565630b34c1a6e995d47bccf568b49b860b  guix-build-85f0f933b4b7/output/x86_64-apple-darwin/SHA256SUMS.part
74b4b8666e94c3296eebfbadfabcc553ad881f9d00e867fbe3bf795ea16360b8  guix-build-85f0f933b4b7/output/x86_64-apple-darwin/bitcoin-85f0f933b4b7-x86_64-apple-darwin-unsigned.dmg
0bf721ab756eee7f165f6a73ba0add944ff0432592eeb0219e328fc632e9c8d0  guix-build-85f0f933b4b7/output/x86_64-apple-darwin/bitcoin-85f0f933b4b7-x86_64-apple-darwin-unsigned.tar.gz
41e2b4dc1cd1b8d9a33cdaa5678fb0b94f161f1cc8bbadf10f6835bfc257a8a5  guix-build-85f0f933b4b7/output/x86_64-apple-darwin/bitcoin-85f0f933b4b7-x86_64-apple-darwin.tar.gz
083e4091bb1380581eb7cac02f79aa7d8243d1470d0b9e9082f30f7e23b996c4  guix-build-85f0f933b4b7/output/x86_64-linux-gnu/SHA256SUMS.part
504eaf131532d41df639b590850fd58d58e4bb8da99c8e1d8ce9ba377094035d  guix-build-85f0f933b4b7/output/x86_64-linux-gnu/bitcoin-85f0f933b4b7-x86_64-linux-gnu-debug.tar.gz
20b5b083031386c75710b8c83239ad7546e68234bada640f65b50f1f10748a2f  guix-build-85f0f933b4b7/output/x86_64-linux-gnu/bitcoin-85f0f933b4b7-x86_64-linux-gnu.tar.gz
767f7450cb31d4f6caca47727f14d591662c6dad6224e1a0b2869987f4d21150  guix-build-85f0f933b4b7/output/x86_64-w64-mingw32/SHA256SUMS.part
ecdf7dc55fdd1927eaab30acb8769dd02242ebe4bed2b189a30e67175f8c4b65  guix-build-85f0f933b4b7/output/x86_64-w64-mingw32/bitcoin-85f0f933b4b7-win64-debug.zip
1d6fab6426f713b028c3ff4c479936faf4aeb1d4bb9dd3623879ad7d7ffa8026  guix-build-85f0f933b4b7/output/x86_64-w64-mingw32/bitcoin-85f0f933b4b7-win64-setup-unsigned.exe
16f59fd98eae86072b4506c2f90163867be627e5ecd5b23558c67926de3ac756  guix-build-85f0f933b4b7/output/x86_64-w64-mingw32/bitcoin-85f0f933b4b7-win64-unsigned.tar.gz
cb7542427f9b9dcfa623273e97115067825814456df17a098a4ee1d6b8c2977f  guix-build-85f0f933b4b7/output/x86_64-w64-mingw32/bitcoin-85f0f933b4b7-win64.zip

arm64:

$ env HOSTS='arm-linux-gnueabihf arm64-apple-darwin powerpc64-linux-gnu powerpc64le-linux-gnu riscv64-linux-gnu x86_64-apple-darwin x86_64-linux-gnu x86_64-w64-mingw32' ./contrib/guix/guix-build
$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

e7ed3447aad799cf3bf8f90eab748a4f3ccfd2d64fddc9ea9b64810be27f326e  guix-build-85f0f933b4b7/output/arm-linux-gnueabihf/SHA256SUMS.part
ca7070ba1a62521666bb588a9b122e21cfb41a6b831ce7092ea90c0468925e08  guix-build-85f0f933b4b7/output/arm-linux-gnueabihf/bitcoin-85f0f933b4b7-arm-linux-gnueabihf-debug.tar.gz
df4f69c2d3ec37986818111bcf3b768a6954fb4d7a0133798b8b2f133dead2e7  guix-build-85f0f933b4b7/output/arm-linux-gnueabihf/bitcoin-85f0f933b4b7-arm-linux-gnueabihf.tar.gz
1f98a08591f24cde11090104795dddaa4ba103c8b991b37f0e1bd135eba7afc6  guix-build-85f0f933b4b7/output/arm64-apple-darwin/SHA256SUMS.part
1039a8ebe1786349c517dd245f046198877e17e778c10288670a1be2b78be37e  guix-build-85f0f933b4b7/output/arm64-apple-darwin/bitcoin-85f0f933b4b7-arm64-apple-darwin-unsigned.dmg
4e58622efc7a43882b60f650200a32495ecd3fd1536bfba5036dfeb9c6579d7e  guix-build-85f0f933b4b7/output/arm64-apple-darwin/bitcoin-85f0f933b4b7-arm64-apple-darwin-unsigned.tar.gz
cec05d3b6e12b77618daf0a5a12f97ee26fa82cf8ec14cb9b8e488730e22c668  guix-build-85f0f933b4b7/output/arm64-apple-darwin/bitcoin-85f0f933b4b7-arm64-apple-darwin.tar.gz
601b0afffe444155c4d17558a8c656f7aa9b2486c58f05011b2c27540b318338  guix-build-85f0f933b4b7/output/dist-archive/bitcoin-85f0f933b4b7.tar.gz
bcabc8924045ebfc513d4ef74900c493fec30f6a4b76dfe48c506fbb1fb7716f  guix-build-85f0f933b4b7/output/powerpc64-linux-gnu/SHA256SUMS.part
d35c50ff87626f59a7f03c487de99bccbf4afc2e843991f0f2654b540f6ee1dc  guix-build-85f0f933b4b7/output/powerpc64-linux-gnu/bitcoin-85f0f933b4b7-powerpc64-linux-gnu-debug.tar.gz
cadde4ab8ba96c07ab8d8c15cff4c737336c0895c27edcf7aa79260269a00e14  guix-build-85f0f933b4b7/output/powerpc64-linux-gnu/bitcoin-85f0f933b4b7-powerpc64-linux-gnu.tar.gz
84bbd4fedde5644469de3d63eb3bd9ad248ae54c1e29955e6a8b9db6f2843f86  guix-build-85f0f933b4b7/output/powerpc64le-linux-gnu/SHA256SUMS.part
c9576f7835917591a8e8b308eb2c15aa5fd139fb61dd16b476479e117f3e9ca0  guix-build-85f0f933b4b7/output/powerpc64le-linux-gnu/bitcoin-85f0f933b4b7-powerpc64le-linux-gnu-debug.tar.gz
8bbac730cd84ff00a9a3ecb6ae89cfad4ca8bcac8e85ffb21c510f96539484d9  guix-build-85f0f933b4b7/output/powerpc64le-linux-gnu/bitcoin-85f0f933b4b7-powerpc64le-linux-gnu.tar.gz
860e104ec4e036b8532af0ef18bb10437bb8e563a433bfebc6807af3fa6e8d47  guix-build-85f0f933b4b7/output/riscv64-linux-gnu/SHA256SUMS.part
2d434668d3f1aa21803f39d1c98612b95c0d3c7987fe58042fefe01698f759ed  guix-build-85f0f933b4b7/output/riscv64-linux-gnu/bitcoin-85f0f933b4b7-riscv64-linux-gnu-debug.tar.gz
49c820c8bae043740570ac699425d2159ec57d561f5c50459ac159f16be066c7  guix-build-85f0f933b4b7/output/riscv64-linux-gnu/bitcoin-85f0f933b4b7-riscv64-linux-gnu.tar.gz
dbf653b7f80b914e206ea8210d6e4565630b34c1a6e995d47bccf568b49b860b  guix-build-85f0f933b4b7/output/x86_64-apple-darwin/SHA256SUMS.part
74b4b8666e94c3296eebfbadfabcc553ad881f9d00e867fbe3bf795ea16360b8  guix-build-85f0f933b4b7/output/x86_64-apple-darwin/bitcoin-85f0f933b4b7-x86_64-apple-darwin-unsigned.dmg
0bf721ab756eee7f165f6a73ba0add944ff0432592eeb0219e328fc632e9c8d0  guix-build-85f0f933b4b7/output/x86_64-apple-darwin/bitcoin-85f0f933b4b7-x86_64-apple-darwin-unsigned.tar.gz
41e2b4dc1cd1b8d9a33cdaa5678fb0b94f161f1cc8bbadf10f6835bfc257a8a5  guix-build-85f0f933b4b7/output/x86_64-apple-darwin/bitcoin-85f0f933b4b7-x86_64-apple-darwin.tar.gz
083e4091bb1380581eb7cac02f79aa7d8243d1470d0b9e9082f30f7e23b996c4  guix-build-85f0f933b4b7/output/x86_64-linux-gnu/SHA256SUMS.part
504eaf131532d41df639b590850fd58d58e4bb8da99c8e1d8ce9ba377094035d  guix-build-85f0f933b4b7/output/x86_64-linux-gnu/bitcoin-85f0f933b4b7-x86_64-linux-gnu-debug.tar.gz
20b5b083031386c75710b8c83239ad7546e68234bada640f65b50f1f10748a2f  guix-build-85f0f933b4b7/output/x86_64-linux-gnu/bitcoin-85f0f933b4b7-x86_64-linux-gnu.tar.gz
767f7450cb31d4f6caca47727f14d591662c6dad6224e1a0b2869987f4d21150  guix-build-85f0f933b4b7/output/x86_64-w64-mingw32/SHA256SUMS.part
ecdf7dc55fdd1927eaab30acb8769dd02242ebe4bed2b189a30e67175f8c4b65  guix-build-85f0f933b4b7/output/x86_64-w64-mingw32/bitcoin-85f0f933b4b7-win64-debug.zip
1d6fab6426f713b028c3ff4c479936faf4aeb1d4bb9dd3623879ad7d7ffa8026  guix-build-85f0f933b4b7/output/x86_64-w64-mingw32/bitcoin-85f0f933b4b7-win64-setup-unsigned.exe
16f59fd98eae86072b4506c2f90163867be627e5ecd5b23558c67926de3ac756  guix-build-85f0f933b4b7/output/x86_64-w64-mingw32/bitcoin-85f0f933b4b7-win64-unsigned.tar.gz
cb7542427f9b9dcfa623273e97115067825814456df17a098a4ee1d6b8c2977f  guix-build-85f0f933b4b7/output/x86_64-w64-mingw32/bitcoin-85f0f933b4b7-win64.zip

@fanquake fanquake merged commit a9049dd into bitcoin:master Sep 9, 2022
@fanquake fanquake deleted the sync_boost_base branch September 9, 2022 08:22
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Sep 11, 2022
@fanquake
Merge bitcoin#26002: build: sync ax_boost_base from upstream
86a56a4 
85f0f93 build: sync ax_boost_base from upstream (fanquake)

Pull request description:

  I upstreamed our change, autoconf-archive/autoconf-archive#260, so sync with upstream.

  Slightly simplifies bitcoin#25465.

ACKs for top commit:
  Sjors:
    tACK 85f0f93

Tree-SHA512: 3ebb354a3266fd5dfc7ffd8f92d422d5840624c0f7af8b09f3dce44b2c2595d790ac859a9c518a62595455cf90e9242c3ab6b48131344ef62ca938f91a352982
@bitcoin bitcoin locked and limited conversation to collaborators Sep 9, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
Build system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fanquake @Sjors @jarolrod