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

guix: use GCC 12.3.0 to build releases #27897

Merged
merged 4 commits into from
Mar 14, 2024

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jun 16, 2023

Switch to using GCC 12.3.0 to build release binaries.

Temporarily disables the powerpc64le-linux-gnu target due to non-determinism issues when building across aarch64 and x86_64. Trying to fix the non-determinism was going to require trying to selectively disable optimization flags, which is already not ideal (and didn't fix all issues), and the migration to GCC 12 as our release compiler is now the blocker for multiple other (c++20 and similar) changes, so leaving this blocked on the powerpc64le binaries does not seem like a good tradeoff.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 16, 2023

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK TheCharlatan
Concept ACK hebasto, theuni

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #25972 (build: no-longer disable WARN_CXXFLAGS when CXXFLAGS is set by fanquake)
  • #25573 ([POC] guix: produce a fully -static-pie bitcoind by fanquake)
  • #25391 (guix: Use LTO to build releases by fanquake)
  • #24123 (build: Pointer Authentication and Branch Target Identification for aarch64 Linux (Guix) by fanquake)
  • #21778 (build: LLD based macOS toolchain by fanquake)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@theuni
Copy link
Member

theuni commented Jun 21, 2023

Concept ACK.

I'm having trouble finding where ppc64 became unsupported in guix though. There were lots of refactors and I'm guessing some wildcard change is maybe responsible? I'd like to understand why it was disabled just in case it was accidental. In that case, we'd want to upstream a fix I think?

fanquake added a commit that referenced this pull request Jun 22, 2023
cbee1d7 depends: modernize clang flags (Cory Fields)
2a85857 ci: disable false-positive warnings for now (Cory Fields)

Pull request description:

  This is a cleaner and simpler alternative to #25098. Inspired by [this conversation](#27737 (comment)). The diff is large but the change itself is quite small.

  Fixes builds with llvm >= 11 in guix by working around the problem. As a bonus, this is much cleaner and more maintainable than what we had before.

  See the updated comment for more info. At a high level: rather than playing tricks and trying to work around clang's default includes, disable them and re-add what we want.

ACKs for top commit:
  fanquake:
    ACK cbee1d7 - tested Guix and the depends cross-compile. Would like to move this along, to unblock #27676, which itself might be a blocker for #27897. Note that macOS might seem somewhat in flux for the moment, but once we finish the migration to LLVM Clang + LLD, things will be must simpler, and ultimately more maintainable.
  TheCharlatan:
    ACK cbee1d7

Tree-SHA512: 5a8300be528f550e15ab23d869e77df7a62201c6d40c0384795a9eecee38118a676e0b79b2b76c5e597597181443caada54a01b75a544dbcde76da1deba8e3a4
@fanquake fanquake force-pushed the update_guix_post_25_branch_off branch from 7ffe71a to 83cecce Compare June 22, 2023 14:20
@maflcko
Copy link
Member

maflcko commented Jun 23, 2023

I think you forgot to bump the CI?

diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
index 3adfbf6e4..e0671e734 100755
--- a/ci/test/00_setup_env_win64.sh
+++ b/ci/test/00_setup_env_win64.sh
@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_win64
-export CI_IMAGE_NAME_TAG=ubuntu:22.04  # Check that Jammy can cross-compile to win64
+export CI_IMAGE_NAME_TAG=debian:bookworm  # Check that Bookworm (gcc 12, similar to guix) can cross-compile
 export HOST=x86_64-w64-mingw32
 export DPKG_ADD_ARCH="i386"
 export PACKAGES="python3 nsis g++-mingw-w64-x86-64-posix wine-binfmt wine64 wine32 file"

and the same for arm? Similar to commit 0999999

Copy link
Member

@theuni theuni left a comment

Choose a reason for hiding this comment

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

Looking good to me.

Mind adding a more verbose commit message for "guix: remove input labels"? I could use some help with the motivation for that one.

contrib/guix/manifest.scm Outdated Show resolved Hide resolved
contrib/guix/libexec/build.sh Outdated Show resolved Hide resolved
@hebasto
Copy link
Member

hebasto commented Jun 27, 2023

Switch to using GCC 12 to build release binaries.

Concept ACK on this.

@hebasto
Copy link
Member

hebasto commented Jun 30, 2023

macOS builds are failing because libtapi fails to configure against the newer GCC.

FWIW, libtapi configuration step succeeds for the Guix master branch (94ac93042f09b4ba68b7b64ed1feeebd3dab1ea4). However, the further build step fails.

@fanquake
Copy link
Member Author

fanquake commented Jul 3, 2023

@theuni I will address your comments soon. Currently working on some additional changes so we can push the time-machine commit further along, and potentially take advantage of the now merged: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64100. I've opened one additional issue upstream: https://lists.gnu.org/archive/html/bug-guix/2023-07/msg00009.html.

@fanquake
Copy link
Member Author

fanquake commented Jul 6, 2023

Sent some additional patches upstream, to update packages we use:
https://lists.gnu.org/archive/html/guix-patches/2023-07/msg00159.html (mingw: Update to 11.0.0.)
https://lists.gnu.org/archive/html/guix-patches/2023-07/msg00138.html (nsis: Update to 3.09.)
https://lists.gnu.org/archive/html/guix-patches/2023-07/msg00104.html (python-asn1crypto: Update to 1.5.1.), https://lists.gnu.org/archive/html/guix-patches/2023-07/msg00171.html (config: Update to 91f6a7f61...)
https://lists.gnu.org/archive/html/guix-patches/2023-07/msg00169.html (autoconf-archive: Update to 2023.02.20.).

@fanquake
Copy link
Member Author

Guix Build (aarch64):

6dcb27a8e89def2e9ab3de7a79b9923795353bbf5dcb29832820a8105f701f07  guix-build-10d56530e097/output/aarch64-linux-gnu/SHA256SUMS.part
bd8242c2ce7cf1e5f5b6ae76a6d5d79061919b86cb80860fcd0a38f9e65a5ea6  guix-build-10d56530e097/output/aarch64-linux-gnu/bitcoin-10d56530e097-aarch64-linux-gnu-debug.tar.gz
d2f4525d5a65e76ec2f62697be2e5b2f4d52d584ab63ab708471f674977b8fea  guix-build-10d56530e097/output/aarch64-linux-gnu/bitcoin-10d56530e097-aarch64-linux-gnu.tar.gz
8e922ca2ec17e3987ad92cc378fac1accad5fd1b1c9e2ecb68bdabf1b905e12b  guix-build-10d56530e097/output/arm-linux-gnueabihf/SHA256SUMS.part
06ef9e7bc84f470509f97c4dfb7a23a3cde770eaff78f6b93faa94afc40454c2  guix-build-10d56530e097/output/arm-linux-gnueabihf/bitcoin-10d56530e097-arm-linux-gnueabihf-debug.tar.gz
d2c2486a35b9935d68d71ef3cdcc4f58522887910a165868e441085337ba0639  guix-build-10d56530e097/output/arm-linux-gnueabihf/bitcoin-10d56530e097-arm-linux-gnueabihf.tar.gz
721f036529908cd406e3e1e0f6a2451b34e77c4cadb68e0fb8c711fad4853cd5  guix-build-10d56530e097/output/arm64-apple-darwin/SHA256SUMS.part
a777361b7bcc9fd3353a91e185d48508079ef5ec88494970d12eeaf9e8106c22  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin-unsigned.tar.gz
8de7ba4927de09308e02b9c05b84d8cf75bf8e46e87a8330d72682e873e8fdfd  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin-unsigned.zip
6bd05be85a6e32c1a99949400bc390a84c7b7f79cf40facf4e1db7a99e354dba  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin.tar.gz
a18b6aeabfb3b201b5b68305968505e3d10d50e1fd1f8e142da97d8878664c8a  guix-build-10d56530e097/output/dist-archive/bitcoin-10d56530e097.tar.gz
cf0f43b1d9ac91d7993c7ee63316e938935ee6998d7c00409a7a1f8e71b59249  guix-build-10d56530e097/output/powerpc64-linux-gnu/SHA256SUMS.part
80beedf085d1a1bb15ced0a411f9d74668e7bbafce6f1701ebbcb1895634023b  guix-build-10d56530e097/output/powerpc64-linux-gnu/bitcoin-10d56530e097-powerpc64-linux-gnu-debug.tar.gz
d12eac8a15649fd343773738fb3893bba4a90ddce4a5ccd397ff24bd36dea7a8  guix-build-10d56530e097/output/powerpc64-linux-gnu/bitcoin-10d56530e097-powerpc64-linux-gnu.tar.gz
0ab804612d75915d84a89221167ce411483a5cbcba40b46663de0391fbe427a2  guix-build-10d56530e097/output/riscv64-linux-gnu/SHA256SUMS.part
7a980cfdf17b4f0ad51dd6fcc59a923e2d825352dc06dc51c8021ff43ceb3d32  guix-build-10d56530e097/output/riscv64-linux-gnu/bitcoin-10d56530e097-riscv64-linux-gnu-debug.tar.gz
06aad03534b5986d1a091f0f04289c38197041342b5a398205feb7b5fa94a880  guix-build-10d56530e097/output/riscv64-linux-gnu/bitcoin-10d56530e097-riscv64-linux-gnu.tar.gz
c82ca396f11e6383f5d4a9c616fd070d642702841c477001f2577a0830c96a82  guix-build-10d56530e097/output/x86_64-apple-darwin/SHA256SUMS.part
835cc72a7582e8d049efeca7d074aa4ce73699dc7c9f0545a4b69cf8f72a3b01  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin-unsigned.tar.gz
37af26f6761bd0a731c355b66d6f763f179142f6c6661c81e45bca8e5458fc50  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin-unsigned.zip
b239b17dd90875baf50cb4426115a5b26f3c64fc817124ec157183c58bccaef1  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin.tar.gz
b6a114afbce9f51332feeda77e51360fce8c9e090dbdd51f5d7953f3b53024e9  guix-build-10d56530e097/output/x86_64-linux-gnu/SHA256SUMS.part
99a2d0f622a9b9e99e5c334ec97f0dfb60ae2d1e159a84ae3d764aff7f05c973  guix-build-10d56530e097/output/x86_64-linux-gnu/bitcoin-10d56530e097-x86_64-linux-gnu-debug.tar.gz
eac4a6d47595f28dd92fa770ad361c649123fc01c2337f5160f82937ee3c1ced  guix-build-10d56530e097/output/x86_64-linux-gnu/bitcoin-10d56530e097-x86_64-linux-gnu.tar.gz
9ce4d66d6d89efcb90d4cff27e0430267930484244a420254b0842eb2255c63d  guix-build-10d56530e097/output/x86_64-w64-mingw32/SHA256SUMS.part
c3c0420b702965b2a4b7f9d5528f75ac067f3717df33c26d79d2c6a43e62271d  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-debug.zip
402938d010fed8140953425e77d6c0adf432bc0b6c3bc41b202fc3ab57dc3e78  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-setup-unsigned.exe
98c9a31988b46554a696d30576590b7999a8957020bf8942caf0e499094794f7  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-unsigned.tar.gz
37360c7fd4fae718c581a76e820bf495ea4470d6938c02c7ff3561523bcca3ca  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64.zip

Copy link
Member

@theuni theuni left a comment

Choose a reason for hiding this comment

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

Re- Concept ACK.

Removing ppcle for now is less than ideal, but it's not worth having as a blocker for basically all pending toolchain/c++20 work.

Only suggestion is: Are there any upstream non-determinism bug reports we can link to? If not, IMO we should file them so the knowledge exists somewhere other than in your head :)

@fanquake
Copy link
Member Author

(copying what I added to the PR description)

Temporarily disables the powerpc64le-linux-gnu target due to non-determinism issues when building across aarch64 and x86_64. Trying to fix the non-determinism was going to require trying to selectively disable optimization flags, which is already not ideal (and didn't fix all issues), and the migration to GCC 12 as our release compiler is now the blocker for multiple other (c++20 and similar) changes, so leaving this blocked on the powerpc64le binaries does not seem like a good tradeoff.

Are there any upstream non-determinism bug reports we can link to?

Not yet. We still need to minify a reproducer, which is also non-trivial. I will work on doing that, but also don't want it as a blocker to moving forward here.

@fanquake
Copy link
Member Author

Guix build (x86_64) (matches aarch64):

6dcb27a8e89def2e9ab3de7a79b9923795353bbf5dcb29832820a8105f701f07  guix-build-10d56530e097/output/aarch64-linux-gnu/SHA256SUMS.part
bd8242c2ce7cf1e5f5b6ae76a6d5d79061919b86cb80860fcd0a38f9e65a5ea6  guix-build-10d56530e097/output/aarch64-linux-gnu/bitcoin-10d56530e097-aarch64-linux-gnu-debug.tar.gz
d2f4525d5a65e76ec2f62697be2e5b2f4d52d584ab63ab708471f674977b8fea  guix-build-10d56530e097/output/aarch64-linux-gnu/bitcoin-10d56530e097-aarch64-linux-gnu.tar.gz
8e922ca2ec17e3987ad92cc378fac1accad5fd1b1c9e2ecb68bdabf1b905e12b  guix-build-10d56530e097/output/arm-linux-gnueabihf/SHA256SUMS.part
06ef9e7bc84f470509f97c4dfb7a23a3cde770eaff78f6b93faa94afc40454c2  guix-build-10d56530e097/output/arm-linux-gnueabihf/bitcoin-10d56530e097-arm-linux-gnueabihf-debug.tar.gz
d2c2486a35b9935d68d71ef3cdcc4f58522887910a165868e441085337ba0639  guix-build-10d56530e097/output/arm-linux-gnueabihf/bitcoin-10d56530e097-arm-linux-gnueabihf.tar.gz
721f036529908cd406e3e1e0f6a2451b34e77c4cadb68e0fb8c711fad4853cd5  guix-build-10d56530e097/output/arm64-apple-darwin/SHA256SUMS.part
a777361b7bcc9fd3353a91e185d48508079ef5ec88494970d12eeaf9e8106c22  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin-unsigned.tar.gz
8de7ba4927de09308e02b9c05b84d8cf75bf8e46e87a8330d72682e873e8fdfd  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin-unsigned.zip
6bd05be85a6e32c1a99949400bc390a84c7b7f79cf40facf4e1db7a99e354dba  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin.tar.gz
a18b6aeabfb3b201b5b68305968505e3d10d50e1fd1f8e142da97d8878664c8a  guix-build-10d56530e097/output/dist-archive/bitcoin-10d56530e097.tar.gz
cf0f43b1d9ac91d7993c7ee63316e938935ee6998d7c00409a7a1f8e71b59249  guix-build-10d56530e097/output/powerpc64-linux-gnu/SHA256SUMS.part
80beedf085d1a1bb15ced0a411f9d74668e7bbafce6f1701ebbcb1895634023b  guix-build-10d56530e097/output/powerpc64-linux-gnu/bitcoin-10d56530e097-powerpc64-linux-gnu-debug.tar.gz
d12eac8a15649fd343773738fb3893bba4a90ddce4a5ccd397ff24bd36dea7a8  guix-build-10d56530e097/output/powerpc64-linux-gnu/bitcoin-10d56530e097-powerpc64-linux-gnu.tar.gz
0ab804612d75915d84a89221167ce411483a5cbcba40b46663de0391fbe427a2  guix-build-10d56530e097/output/riscv64-linux-gnu/SHA256SUMS.part
7a980cfdf17b4f0ad51dd6fcc59a923e2d825352dc06dc51c8021ff43ceb3d32  guix-build-10d56530e097/output/riscv64-linux-gnu/bitcoin-10d56530e097-riscv64-linux-gnu-debug.tar.gz
06aad03534b5986d1a091f0f04289c38197041342b5a398205feb7b5fa94a880  guix-build-10d56530e097/output/riscv64-linux-gnu/bitcoin-10d56530e097-riscv64-linux-gnu.tar.gz
c82ca396f11e6383f5d4a9c616fd070d642702841c477001f2577a0830c96a82  guix-build-10d56530e097/output/x86_64-apple-darwin/SHA256SUMS.part
835cc72a7582e8d049efeca7d074aa4ce73699dc7c9f0545a4b69cf8f72a3b01  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin-unsigned.tar.gz
37af26f6761bd0a731c355b66d6f763f179142f6c6661c81e45bca8e5458fc50  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin-unsigned.zip
b239b17dd90875baf50cb4426115a5b26f3c64fc817124ec157183c58bccaef1  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin.tar.gz
b6a114afbce9f51332feeda77e51360fce8c9e090dbdd51f5d7953f3b53024e9  guix-build-10d56530e097/output/x86_64-linux-gnu/SHA256SUMS.part
99a2d0f622a9b9e99e5c334ec97f0dfb60ae2d1e159a84ae3d764aff7f05c973  guix-build-10d56530e097/output/x86_64-linux-gnu/bitcoin-10d56530e097-x86_64-linux-gnu-debug.tar.gz
eac4a6d47595f28dd92fa770ad361c649123fc01c2337f5160f82937ee3c1ced  guix-build-10d56530e097/output/x86_64-linux-gnu/bitcoin-10d56530e097-x86_64-linux-gnu.tar.gz
9ce4d66d6d89efcb90d4cff27e0430267930484244a420254b0842eb2255c63d  guix-build-10d56530e097/output/x86_64-w64-mingw32/SHA256SUMS.part
c3c0420b702965b2a4b7f9d5528f75ac067f3717df33c26d79d2c6a43e62271d  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-debug.zip
402938d010fed8140953425e77d6c0adf432bc0b6c3bc41b202fc3ab57dc3e78  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-setup-unsigned.exe
98c9a31988b46554a696d30576590b7999a8957020bf8942caf0e499094794f7  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-unsigned.tar.gz
37360c7fd4fae718c581a76e820bf495ea4470d6938c02c7ff3561523bcca3ca  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64.zip

@tobtoht
Copy link

tobtoht commented Mar 12, 2024

$ uname --machine && find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
x86_64
6dcb27a8e89def2e9ab3de7a79b9923795353bbf5dcb29832820a8105f701f07  guix-build-10d56530e097/output/aarch64-linux-gnu/SHA256SUMS.part
bd8242c2ce7cf1e5f5b6ae76a6d5d79061919b86cb80860fcd0a38f9e65a5ea6  guix-build-10d56530e097/output/aarch64-linux-gnu/bitcoin-10d56530e097-aarch64-linux-gnu-debug.tar.gz
d2f4525d5a65e76ec2f62697be2e5b2f4d52d584ab63ab708471f674977b8fea  guix-build-10d56530e097/output/aarch64-linux-gnu/bitcoin-10d56530e097-aarch64-linux-gnu.tar.gz
8e922ca2ec17e3987ad92cc378fac1accad5fd1b1c9e2ecb68bdabf1b905e12b  guix-build-10d56530e097/output/arm-linux-gnueabihf/SHA256SUMS.part
06ef9e7bc84f470509f97c4dfb7a23a3cde770eaff78f6b93faa94afc40454c2  guix-build-10d56530e097/output/arm-linux-gnueabihf/bitcoin-10d56530e097-arm-linux-gnueabihf-debug.tar.gz
d2c2486a35b9935d68d71ef3cdcc4f58522887910a165868e441085337ba0639  guix-build-10d56530e097/output/arm-linux-gnueabihf/bitcoin-10d56530e097-arm-linux-gnueabihf.tar.gz
721f036529908cd406e3e1e0f6a2451b34e77c4cadb68e0fb8c711fad4853cd5  guix-build-10d56530e097/output/arm64-apple-darwin/SHA256SUMS.part
a777361b7bcc9fd3353a91e185d48508079ef5ec88494970d12eeaf9e8106c22  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin-unsigned.tar.gz
8de7ba4927de09308e02b9c05b84d8cf75bf8e46e87a8330d72682e873e8fdfd  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin-unsigned.zip
6bd05be85a6e32c1a99949400bc390a84c7b7f79cf40facf4e1db7a99e354dba  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin.tar.gz
a18b6aeabfb3b201b5b68305968505e3d10d50e1fd1f8e142da97d8878664c8a  guix-build-10d56530e097/output/dist-archive/bitcoin-10d56530e097.tar.gz
cf0f43b1d9ac91d7993c7ee63316e938935ee6998d7c00409a7a1f8e71b59249  guix-build-10d56530e097/output/powerpc64-linux-gnu/SHA256SUMS.part
80beedf085d1a1bb15ced0a411f9d74668e7bbafce6f1701ebbcb1895634023b  guix-build-10d56530e097/output/powerpc64-linux-gnu/bitcoin-10d56530e097-powerpc64-linux-gnu-debug.tar.gz
d12eac8a15649fd343773738fb3893bba4a90ddce4a5ccd397ff24bd36dea7a8  guix-build-10d56530e097/output/powerpc64-linux-gnu/bitcoin-10d56530e097-powerpc64-linux-gnu.tar.gz
0ab804612d75915d84a89221167ce411483a5cbcba40b46663de0391fbe427a2  guix-build-10d56530e097/output/riscv64-linux-gnu/SHA256SUMS.part
7a980cfdf17b4f0ad51dd6fcc59a923e2d825352dc06dc51c8021ff43ceb3d32  guix-build-10d56530e097/output/riscv64-linux-gnu/bitcoin-10d56530e097-riscv64-linux-gnu-debug.tar.gz
06aad03534b5986d1a091f0f04289c38197041342b5a398205feb7b5fa94a880  guix-build-10d56530e097/output/riscv64-linux-gnu/bitcoin-10d56530e097-riscv64-linux-gnu.tar.gz
c82ca396f11e6383f5d4a9c616fd070d642702841c477001f2577a0830c96a82  guix-build-10d56530e097/output/x86_64-apple-darwin/SHA256SUMS.part
835cc72a7582e8d049efeca7d074aa4ce73699dc7c9f0545a4b69cf8f72a3b01  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin-unsigned.tar.gz
37af26f6761bd0a731c355b66d6f763f179142f6c6661c81e45bca8e5458fc50  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin-unsigned.zip
b239b17dd90875baf50cb4426115a5b26f3c64fc817124ec157183c58bccaef1  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin.tar.gz
b6a114afbce9f51332feeda77e51360fce8c9e090dbdd51f5d7953f3b53024e9  guix-build-10d56530e097/output/x86_64-linux-gnu/SHA256SUMS.part
99a2d0f622a9b9e99e5c334ec97f0dfb60ae2d1e159a84ae3d764aff7f05c973  guix-build-10d56530e097/output/x86_64-linux-gnu/bitcoin-10d56530e097-x86_64-linux-gnu-debug.tar.gz
eac4a6d47595f28dd92fa770ad361c649123fc01c2337f5160f82937ee3c1ced  guix-build-10d56530e097/output/x86_64-linux-gnu/bitcoin-10d56530e097-x86_64-linux-gnu.tar.gz
9ce4d66d6d89efcb90d4cff27e0430267930484244a420254b0842eb2255c63d  guix-build-10d56530e097/output/x86_64-w64-mingw32/SHA256SUMS.part
c3c0420b702965b2a4b7f9d5528f75ac067f3717df33c26d79d2c6a43e62271d  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-debug.zip
402938d010fed8140953425e77d6c0adf432bc0b6c3bc41b202fc3ab57dc3e78  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-setup-unsigned.exe
98c9a31988b46554a696d30576590b7999a8957020bf8942caf0e499094794f7  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-unsigned.tar.gz
37360c7fd4fae718c581a76e820bf495ea4470d6938c02c7ff3561523bcca3ca  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64.zip

@DrahtBot
Copy link
Contributor

Guix builds (on x86_64)

File commit a945f09
(master)
commit 7f0706f
(master and this pull)
SHA256SUMS.part 53f80f146bc8ab69... 4b9e6171e4cc4638...
*-aarch64-linux-gnu-debug.tar.gz dbe0d1d1eb074739... 7f9937e310de4441...
*-aarch64-linux-gnu.tar.gz 955c88325ca1cb74... 1151ca899061b256...
*-arm-linux-gnueabihf-debug.tar.gz e5e17199f24f1d0e... dca93994ef6b5a8c...
*-arm-linux-gnueabihf.tar.gz a6b2defa7bdfb7d2... 6b6828d740c9d536...
*-arm64-apple-darwin-unsigned.tar.gz 030aa291751e430d... 72dd9625fb3a8f9b...
*-arm64-apple-darwin-unsigned.zip 44a5227e210c924e... a5915e582e9842ac...
*-arm64-apple-darwin.tar.gz a7a8145bd773616e... 9f97d1819f0193ad...
*-powerpc64-linux-gnu-debug.tar.gz 450b38fbde9bea0e... 42b8c0dca86cfda8...
*-powerpc64-linux-gnu.tar.gz 340f198fc527ced9... 24556f4ac1e34466...
*-powerpc64le-linux-gnu-debug.tar.gz f3e4e82504b7a2fb... 4cc4bb05e79b05ac...
*-powerpc64le-linux-gnu.tar.gz a7e058daa9c4e72c... 7ebb9b70f1c67dc7...
*-riscv64-linux-gnu-debug.tar.gz 9feec25b9a221ace... 06b510662200a19b...
*-riscv64-linux-gnu.tar.gz 7a006a21a5802228... ae628ccc41ea9209...
*-x86_64-apple-darwin-unsigned.tar.gz 4dd8fa5f1767c90f... 58be111bf9e3ca58...
*-x86_64-apple-darwin-unsigned.zip 256a5e877dbfc918... 97fdeedd4d560777...
*-x86_64-apple-darwin.tar.gz 2fc9a5821c776103... f1f92ce4f26ac5c8...
*-x86_64-linux-gnu-debug.tar.gz ece840d2037f8278... afd13c1438bdcbe7...
*-x86_64-linux-gnu.tar.gz 29cf3509e6c8b97f... 25a1eea577a19fd8...
*.tar.gz 220e536d0844a859... 974e6423b8e877db...
guix_build.log ed6d8eac5cc222b1... fdcf75de1b6a2fc9...
guix_build.log.diff 1e28349d0be9291a...

@TheCharlatan
Copy link
Contributor

Concept ACK

@TheCharlatan
Copy link
Contributor

Guix builds (x86 & aarch64)

6dcb27a8e89def2e9ab3de7a79b9923795353bbf5dcb29832820a8105f701f07  guix-build-10d56530e097/output/aarch64-linux-gnu/SHA256SUMS.part
bd8242c2ce7cf1e5f5b6ae76a6d5d79061919b86cb80860fcd0a38f9e65a5ea6  guix-build-10d56530e097/output/aarch64-linux-gnu/bitcoin-10d56530e097-aarch64-linux-gnu-debug.tar.gz
d2f4525d5a65e76ec2f62697be2e5b2f4d52d584ab63ab708471f674977b8fea  guix-build-10d56530e097/output/aarch64-linux-gnu/bitcoin-10d56530e097-aarch64-linux-gnu.tar.gz
8e922ca2ec17e3987ad92cc378fac1accad5fd1b1c9e2ecb68bdabf1b905e12b  guix-build-10d56530e097/output/arm-linux-gnueabihf/SHA256SUMS.part
06ef9e7bc84f470509f97c4dfb7a23a3cde770eaff78f6b93faa94afc40454c2  guix-build-10d56530e097/output/arm-linux-gnueabihf/bitcoin-10d56530e097-arm-linux-gnueabihf-debug.tar.gz
d2c2486a35b9935d68d71ef3cdcc4f58522887910a165868e441085337ba0639  guix-build-10d56530e097/output/arm-linux-gnueabihf/bitcoin-10d56530e097-arm-linux-gnueabihf.tar.gz
721f036529908cd406e3e1e0f6a2451b34e77c4cadb68e0fb8c711fad4853cd5  guix-build-10d56530e097/output/arm64-apple-darwin/SHA256SUMS.part
a777361b7bcc9fd3353a91e185d48508079ef5ec88494970d12eeaf9e8106c22  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin-unsigned.tar.gz
8de7ba4927de09308e02b9c05b84d8cf75bf8e46e87a8330d72682e873e8fdfd  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin-unsigned.zip
6bd05be85a6e32c1a99949400bc390a84c7b7f79cf40facf4e1db7a99e354dba  guix-build-10d56530e097/output/arm64-apple-darwin/bitcoin-10d56530e097-arm64-apple-darwin.tar.gz
a18b6aeabfb3b201b5b68305968505e3d10d50e1fd1f8e142da97d8878664c8a  guix-build-10d56530e097/output/dist-archive/bitcoin-10d56530e097.tar.gz
cf0f43b1d9ac91d7993c7ee63316e938935ee6998d7c00409a7a1f8e71b59249  guix-build-10d56530e097/output/powerpc64-linux-gnu/SHA256SUMS.part
80beedf085d1a1bb15ced0a411f9d74668e7bbafce6f1701ebbcb1895634023b  guix-build-10d56530e097/output/powerpc64-linux-gnu/bitcoin-10d56530e097-powerpc64-linux-gnu-debug.tar.gz
d12eac8a15649fd343773738fb3893bba4a90ddce4a5ccd397ff24bd36dea7a8  guix-build-10d56530e097/output/powerpc64-linux-gnu/bitcoin-10d56530e097-powerpc64-linux-gnu.tar.gz
0ab804612d75915d84a89221167ce411483a5cbcba40b46663de0391fbe427a2  guix-build-10d56530e097/output/riscv64-linux-gnu/SHA256SUMS.part
7a980cfdf17b4f0ad51dd6fcc59a923e2d825352dc06dc51c8021ff43ceb3d32  guix-build-10d56530e097/output/riscv64-linux-gnu/bitcoin-10d56530e097-riscv64-linux-gnu-debug.tar.gz
06aad03534b5986d1a091f0f04289c38197041342b5a398205feb7b5fa94a880  guix-build-10d56530e097/output/riscv64-linux-gnu/bitcoin-10d56530e097-riscv64-linux-gnu.tar.gz
c82ca396f11e6383f5d4a9c616fd070d642702841c477001f2577a0830c96a82  guix-build-10d56530e097/output/x86_64-apple-darwin/SHA256SUMS.part
835cc72a7582e8d049efeca7d074aa4ce73699dc7c9f0545a4b69cf8f72a3b01  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin-unsigned.tar.gz
37af26f6761bd0a731c355b66d6f763f179142f6c6661c81e45bca8e5458fc50  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin-unsigned.zip
b239b17dd90875baf50cb4426115a5b26f3c64fc817124ec157183c58bccaef1  guix-build-10d56530e097/output/x86_64-apple-darwin/bitcoin-10d56530e097-x86_64-apple-darwin.tar.gz
b6a114afbce9f51332feeda77e51360fce8c9e090dbdd51f5d7953f3b53024e9  guix-build-10d56530e097/output/x86_64-linux-gnu/SHA256SUMS.part
99a2d0f622a9b9e99e5c334ec97f0dfb60ae2d1e159a84ae3d764aff7f05c973  guix-build-10d56530e097/output/x86_64-linux-gnu/bitcoin-10d56530e097-x86_64-linux-gnu-debug.tar.gz
eac4a6d47595f28dd92fa770ad361c649123fc01c2337f5160f82937ee3c1ced  guix-build-10d56530e097/output/x86_64-linux-gnu/bitcoin-10d56530e097-x86_64-linux-gnu.tar.gz
9ce4d66d6d89efcb90d4cff27e0430267930484244a420254b0842eb2255c63d  guix-build-10d56530e097/output/x86_64-w64-mingw32/SHA256SUMS.part
c3c0420b702965b2a4b7f9d5528f75ac067f3717df33c26d79d2c6a43e62271d  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-debug.zip
402938d010fed8140953425e77d6c0adf432bc0b6c3bc41b202fc3ab57dc3e78  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-setup-unsigned.exe
98c9a31988b46554a696d30576590b7999a8957020bf8942caf0e499094794f7  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64-unsigned.tar.gz
37360c7fd4fae718c581a76e820bf495ea4470d6938c02c7ff3561523bcca3ca  guix-build-10d56530e097/output/x86_64-w64-mingw32/bitcoin-10d56530e097-win64.zip

Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

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

ACK 10d5653

@DrahtBot DrahtBot requested review from theuni and hebasto March 13, 2024 16:58
@fanquake fanquake merged commit e1ce5b8 into bitcoin:master Mar 14, 2024
16 checks passed
@fanquake fanquake deleted the update_guix_post_25_branch_off branch March 14, 2024 10:18
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

Post-merge ACK 10d5653.

I'm still a bit confused as to why the new -mcrtdll option for MinGW target is still not recognized by the compiler.

@fanquake
Copy link
Member Author

I'm still a bit confused as to why the new -mcrtdll option for MinGW target is still not recognized by the compiler.

That option hasn't yet been released in any version of GCC (it will be in GCC 14).

UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request May 9, 2024
6cbedc3 guix: drop Windows broken-longjmp.patch (fanquake)
a1d4a42 guix: drop NSIS patch now that we use 3.09 (fanquake)
1f6c75e guix: use cross-* keyword arguments (fanquake)
ea4387e guix: update time-machine to 160f78a4d92205df986ed9efcce7d3aac188cb24 (fanquake)
f1a4afb guix: update python-oscrypto to 1.3.0 (fanquake)
a8a7b75 guix: backport glibc patch to fix powerpc build (fanquake)

Pull request description:

  Bumps our Guix time-machine to [160f78a4d92205df986ed9efcce7d3aac188cb24](https://git.savannah.gnu.org/cgit/guix.git/commit/?id=160f78a4d92205df986ed9efcce7d3aac188cb24), which includes:

  GCC 10.3.0 -> 10.4.0
  Binutils 2.37 -> 2.38
  Automake 1.16.3 -> 1.16.5
  Coreutils 8.32 -> 9.1
  Findutils 4.8.2 -> 4.9.0
  Libtool 2.4.6 -> 2.4.7
  Linux Libre Headers 5.15.37 -> 5.15.127
  Git 2.36.0 -> 2.41.0
  Mingw-w64 8.0.0 -> 11.0.1
  NSIS 3.05 -> 3.09
  Xorriso 1.5.2 -> 1.5.6.pl02
  Python 3.9 -> 3.10.7
  Python-asn1crypto 1.4.0 -> 1.5.1

  GCC 12.3.0 becomes available. See bitcoin#27897.
  LLVM 15.0.7 becomes available. Sadly not quite new enough for bitcoin#21778.

  Split from bitcoin#27897 for easier review, and to make it clear which changes are part of the time-machine bump vs changing to GCC 12.

  Guix Build:
  ```bash
  1e4aab93de36b47cbbfc5882d3d2a598e54a9c3604b3be1891ddac70cdc46547  guix-build-6cbedc3d9b67/output/aarch64-linux-gnu/SHA256SUMS.part
  278206bddf166ce507ab2ae4742ffbe6ec4256dbc6beee7e42ea040ec3d5b679  guix-build-6cbedc3d9b67/output/aarch64-linux-gnu/bitcoin-6cbedc3d9b67-aarch64-linux-gnu-debug.tar.gz
  261974753869297a480db24733f057aa58e33a0ce08754bea74984a00f8c376f  guix-build-6cbedc3d9b67/output/aarch64-linux-gnu/bitcoin-6cbedc3d9b67-aarch64-linux-gnu.tar.gz
  13bde7d903665f7699e2aa42a23ddc5ece9fab450437ae641d8ebfe6f6b084e1  guix-build-6cbedc3d9b67/output/arm-linux-gnueabihf/SHA256SUMS.part
  df951e4b23db34d1248f7ee9837594645acea8e2de1ed03b23ee002579a4c653  guix-build-6cbedc3d9b67/output/arm-linux-gnueabihf/bitcoin-6cbedc3d9b67-arm-linux-gnueabihf-debug.tar.gz
  5839bb71cca6aafa662f3c7e1c09393dce1c3fd13241726796bf3e681a0a34f0  guix-build-6cbedc3d9b67/output/arm-linux-gnueabihf/bitcoin-6cbedc3d9b67-arm-linux-gnueabihf.tar.gz
  637b1aa49db0cab1bc35064d068f1a5fdee5ab2ceba30b7f6d2c80bbf174c107  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/SHA256SUMS.part
  be87c1ad41f06bcaa8c940fc8d881eca41c531d250ce114325b0e042e603c257  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/bitcoin-6cbedc3d9b67-arm64-apple-darwin-unsigned.dmg
  632956e64d2baf9329ee086781b9268786f37b7c3c5f5232e2394ef2839d6d40  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/bitcoin-6cbedc3d9b67-arm64-apple-darwin-unsigned.tar.gz
  1b23548a94aee5e03a8aec1e63938d9c8505005b87fa832ed112af60861c42a6  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/bitcoin-6cbedc3d9b67-arm64-apple-darwin.tar.gz
  e4056df68bac0bdc0a54899af8f8178e78bfb7d170750f2296fd512d0c6c20db  guix-build-6cbedc3d9b67/output/dist-archive/bitcoin-6cbedc3d9b67.tar.gz
  9f149c82f30eed35e2c217dc57cab37745db27f0a3205e66b4535c247dffc500  guix-build-6cbedc3d9b67/output/powerpc64-linux-gnu/SHA256SUMS.part
  ef91dce0a735ce0633fd273d9e1d6599d74c18280a866c1d6b71c2c3434af9c3  guix-build-6cbedc3d9b67/output/powerpc64-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64-linux-gnu-debug.tar.gz
  dfb60f13b9a7435f608f6d09585de37f789b055c77a0ee729e5723b0ef0550fe  guix-build-6cbedc3d9b67/output/powerpc64-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64-linux-gnu.tar.gz
  0ae916b95617042330166e20a27399c14abbc20638ae3e5e5f9f812146d4a07e  guix-build-6cbedc3d9b67/output/powerpc64le-linux-gnu/SHA256SUMS.part
  180d9c29da1efd21fba6be8a670b6ed01d71a5e90991da3c543f6720273831a2  guix-build-6cbedc3d9b67/output/powerpc64le-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64le-linux-gnu-debug.tar.gz
  9753408e3b4c10b19dba30ecb12ee2ae065c08e7c88be25599e1fdffe81bddbe  guix-build-6cbedc3d9b67/output/powerpc64le-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64le-linux-gnu.tar.gz
  b1f09baec636a3bbaff1be629c95e75767c4ae3d96f0ebe63dcefb6fdb4953fb  guix-build-6cbedc3d9b67/output/riscv64-linux-gnu/SHA256SUMS.part
  09149283880c39c76f73ce83848f266f93777f6d9d389c2448ef0a9af9339b30  guix-build-6cbedc3d9b67/output/riscv64-linux-gnu/bitcoin-6cbedc3d9b67-riscv64-linux-gnu-debug.tar.gz
  788ce14925fec9861c78e16a57a1fd25d0f2ddf3f4e10f3c795bac534d339197  guix-build-6cbedc3d9b67/output/riscv64-linux-gnu/bitcoin-6cbedc3d9b67-riscv64-linux-gnu.tar.gz
  f357a0522c779d1953f37f4cab0160622cbf89ed3fe49cb5abea2509dba1d76f  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/SHA256SUMS.part
  be5c797a3e4dc969fd9116dede0cb27bda5180e653bb63d1ef3dbcc3de983bf0  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/bitcoin-6cbedc3d9b67-x86_64-apple-darwin-unsigned.dmg
  7364b2d0223b39debd386b521a5c5d1b26a446331f347b4d4e8fc58bf5b4439e  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/bitcoin-6cbedc3d9b67-x86_64-apple-darwin-unsigned.tar.gz
  7e873165d4ed785381b6e461a81a947814d14fdd41ae65bc82134c03b3ac0471  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/bitcoin-6cbedc3d9b67-x86_64-apple-darwin.tar.gz
  bf03ca15a885330ed0c91b3137dcc4ec1102570898360cc3f1073f03b792d729  guix-build-6cbedc3d9b67/output/x86_64-linux-gnu/SHA256SUMS.part
  0707b0e4d8529fc5f7567d1ff029b4b6fdf0bb46f1eb227d70c3aaa2018d65e5  guix-build-6cbedc3d9b67/output/x86_64-linux-gnu/bitcoin-6cbedc3d9b67-x86_64-linux-gnu-debug.tar.gz
  5f1e3713cf856f884d305ad12f43254be3871d9020cc514194fc0a6efd0867b1  guix-build-6cbedc3d9b67/output/x86_64-linux-gnu/bitcoin-6cbedc3d9b67-x86_64-linux-gnu.tar.gz
  c0d5e284903dbb55e4ad3d43db9b1e5d211c5259c3fae43bf4cddedea2e02c01  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/SHA256SUMS.part
  d16f61c78b784b664d558a9a537e15da432ef9c18de0754dd7fd19682ab0569f  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64-debug.zip
  617010c1ac295bc692e0a4074acc19ebbc9561a01c8e5365428cfe61dc50fe3c  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64-setup-unsigned.exe
  a48961c49edf9f8988b902d874f47918f6716053be6c3bc263932834cb896510  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64-unsigned.tar.gz
  0cd95e8f919ac694dfd88a14fda37c57f0534cb890acc73f70aff71937fa1a8e  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64.zip
  ```

ACKs for top commit:
  TheCharlatan:
    ACK 6cbedc3

Tree-SHA512: 48950535febab3865a8899b0ce590a7da6dbd0a89d2d2987a467da457e9ff0687d5afc65f952386fa562aa2a3fc6d8c85b1c221c73998d522076486a9fd845c4
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request May 9, 2024
6cbedc3 guix: drop Windows broken-longjmp.patch (fanquake)
a1d4a42 guix: drop NSIS patch now that we use 3.09 (fanquake)
1f6c75e guix: use cross-* keyword arguments (fanquake)
ea4387e guix: update time-machine to 160f78a4d92205df986ed9efcce7d3aac188cb24 (fanquake)
f1a4afb guix: update python-oscrypto to 1.3.0 (fanquake)
a8a7b75 guix: backport glibc patch to fix powerpc build (fanquake)

Pull request description:

  Bumps our Guix time-machine to [160f78a4d92205df986ed9efcce7d3aac188cb24](https://git.savannah.gnu.org/cgit/guix.git/commit/?id=160f78a4d92205df986ed9efcce7d3aac188cb24), which includes:

  GCC 10.3.0 -> 10.4.0
  Binutils 2.37 -> 2.38
  Automake 1.16.3 -> 1.16.5
  Coreutils 8.32 -> 9.1
  Findutils 4.8.2 -> 4.9.0
  Libtool 2.4.6 -> 2.4.7
  Linux Libre Headers 5.15.37 -> 5.15.127
  Git 2.36.0 -> 2.41.0
  Mingw-w64 8.0.0 -> 11.0.1
  NSIS 3.05 -> 3.09
  Xorriso 1.5.2 -> 1.5.6.pl02
  Python 3.9 -> 3.10.7
  Python-asn1crypto 1.4.0 -> 1.5.1

  GCC 12.3.0 becomes available. See bitcoin#27897.
  LLVM 15.0.7 becomes available. Sadly not quite new enough for bitcoin#21778.

  Split from bitcoin#27897 for easier review, and to make it clear which changes are part of the time-machine bump vs changing to GCC 12.

  Guix Build:
  ```bash
  1e4aab93de36b47cbbfc5882d3d2a598e54a9c3604b3be1891ddac70cdc46547  guix-build-6cbedc3d9b67/output/aarch64-linux-gnu/SHA256SUMS.part
  278206bddf166ce507ab2ae4742ffbe6ec4256dbc6beee7e42ea040ec3d5b679  guix-build-6cbedc3d9b67/output/aarch64-linux-gnu/bitcoin-6cbedc3d9b67-aarch64-linux-gnu-debug.tar.gz
  261974753869297a480db24733f057aa58e33a0ce08754bea74984a00f8c376f  guix-build-6cbedc3d9b67/output/aarch64-linux-gnu/bitcoin-6cbedc3d9b67-aarch64-linux-gnu.tar.gz
  13bde7d903665f7699e2aa42a23ddc5ece9fab450437ae641d8ebfe6f6b084e1  guix-build-6cbedc3d9b67/output/arm-linux-gnueabihf/SHA256SUMS.part
  df951e4b23db34d1248f7ee9837594645acea8e2de1ed03b23ee002579a4c653  guix-build-6cbedc3d9b67/output/arm-linux-gnueabihf/bitcoin-6cbedc3d9b67-arm-linux-gnueabihf-debug.tar.gz
  5839bb71cca6aafa662f3c7e1c09393dce1c3fd13241726796bf3e681a0a34f0  guix-build-6cbedc3d9b67/output/arm-linux-gnueabihf/bitcoin-6cbedc3d9b67-arm-linux-gnueabihf.tar.gz
  637b1aa49db0cab1bc35064d068f1a5fdee5ab2ceba30b7f6d2c80bbf174c107  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/SHA256SUMS.part
  be87c1ad41f06bcaa8c940fc8d881eca41c531d250ce114325b0e042e603c257  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/bitcoin-6cbedc3d9b67-arm64-apple-darwin-unsigned.dmg
  632956e64d2baf9329ee086781b9268786f37b7c3c5f5232e2394ef2839d6d40  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/bitcoin-6cbedc3d9b67-arm64-apple-darwin-unsigned.tar.gz
  1b23548a94aee5e03a8aec1e63938d9c8505005b87fa832ed112af60861c42a6  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/bitcoin-6cbedc3d9b67-arm64-apple-darwin.tar.gz
  e4056df68bac0bdc0a54899af8f8178e78bfb7d170750f2296fd512d0c6c20db  guix-build-6cbedc3d9b67/output/dist-archive/bitcoin-6cbedc3d9b67.tar.gz
  9f149c82f30eed35e2c217dc57cab37745db27f0a3205e66b4535c247dffc500  guix-build-6cbedc3d9b67/output/powerpc64-linux-gnu/SHA256SUMS.part
  ef91dce0a735ce0633fd273d9e1d6599d74c18280a866c1d6b71c2c3434af9c3  guix-build-6cbedc3d9b67/output/powerpc64-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64-linux-gnu-debug.tar.gz
  dfb60f13b9a7435f608f6d09585de37f789b055c77a0ee729e5723b0ef0550fe  guix-build-6cbedc3d9b67/output/powerpc64-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64-linux-gnu.tar.gz
  0ae916b95617042330166e20a27399c14abbc20638ae3e5e5f9f812146d4a07e  guix-build-6cbedc3d9b67/output/powerpc64le-linux-gnu/SHA256SUMS.part
  180d9c29da1efd21fba6be8a670b6ed01d71a5e90991da3c543f6720273831a2  guix-build-6cbedc3d9b67/output/powerpc64le-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64le-linux-gnu-debug.tar.gz
  9753408e3b4c10b19dba30ecb12ee2ae065c08e7c88be25599e1fdffe81bddbe  guix-build-6cbedc3d9b67/output/powerpc64le-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64le-linux-gnu.tar.gz
  b1f09baec636a3bbaff1be629c95e75767c4ae3d96f0ebe63dcefb6fdb4953fb  guix-build-6cbedc3d9b67/output/riscv64-linux-gnu/SHA256SUMS.part
  09149283880c39c76f73ce83848f266f93777f6d9d389c2448ef0a9af9339b30  guix-build-6cbedc3d9b67/output/riscv64-linux-gnu/bitcoin-6cbedc3d9b67-riscv64-linux-gnu-debug.tar.gz
  788ce14925fec9861c78e16a57a1fd25d0f2ddf3f4e10f3c795bac534d339197  guix-build-6cbedc3d9b67/output/riscv64-linux-gnu/bitcoin-6cbedc3d9b67-riscv64-linux-gnu.tar.gz
  f357a0522c779d1953f37f4cab0160622cbf89ed3fe49cb5abea2509dba1d76f  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/SHA256SUMS.part
  be5c797a3e4dc969fd9116dede0cb27bda5180e653bb63d1ef3dbcc3de983bf0  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/bitcoin-6cbedc3d9b67-x86_64-apple-darwin-unsigned.dmg
  7364b2d0223b39debd386b521a5c5d1b26a446331f347b4d4e8fc58bf5b4439e  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/bitcoin-6cbedc3d9b67-x86_64-apple-darwin-unsigned.tar.gz
  7e873165d4ed785381b6e461a81a947814d14fdd41ae65bc82134c03b3ac0471  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/bitcoin-6cbedc3d9b67-x86_64-apple-darwin.tar.gz
  bf03ca15a885330ed0c91b3137dcc4ec1102570898360cc3f1073f03b792d729  guix-build-6cbedc3d9b67/output/x86_64-linux-gnu/SHA256SUMS.part
  0707b0e4d8529fc5f7567d1ff029b4b6fdf0bb46f1eb227d70c3aaa2018d65e5  guix-build-6cbedc3d9b67/output/x86_64-linux-gnu/bitcoin-6cbedc3d9b67-x86_64-linux-gnu-debug.tar.gz
  5f1e3713cf856f884d305ad12f43254be3871d9020cc514194fc0a6efd0867b1  guix-build-6cbedc3d9b67/output/x86_64-linux-gnu/bitcoin-6cbedc3d9b67-x86_64-linux-gnu.tar.gz
  c0d5e284903dbb55e4ad3d43db9b1e5d211c5259c3fae43bf4cddedea2e02c01  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/SHA256SUMS.part
  d16f61c78b784b664d558a9a537e15da432ef9c18de0754dd7fd19682ab0569f  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64-debug.zip
  617010c1ac295bc692e0a4074acc19ebbc9561a01c8e5365428cfe61dc50fe3c  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64-setup-unsigned.exe
  a48961c49edf9f8988b902d874f47918f6716053be6c3bc263932834cb896510  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64-unsigned.tar.gz
  0cd95e8f919ac694dfd88a14fda37c57f0534cb890acc73f70aff71937fa1a8e  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64.zip
  ```

ACKs for top commit:
  TheCharlatan:
    ACK 6cbedc3

Tree-SHA512: 48950535febab3865a8899b0ce590a7da6dbd0a89d2d2987a467da457e9ff0687d5afc65f952386fa562aa2a3fc6d8c85b1c221c73998d522076486a9fd845c4
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request May 9, 2024
6cbedc3 guix: drop Windows broken-longjmp.patch (fanquake)
a1d4a42 guix: drop NSIS patch now that we use 3.09 (fanquake)
1f6c75e guix: use cross-* keyword arguments (fanquake)
ea4387e guix: update time-machine to 160f78a4d92205df986ed9efcce7d3aac188cb24 (fanquake)
f1a4afb guix: update python-oscrypto to 1.3.0 (fanquake)
a8a7b75 guix: backport glibc patch to fix powerpc build (fanquake)

Pull request description:

  Bumps our Guix time-machine to [160f78a4d92205df986ed9efcce7d3aac188cb24](https://git.savannah.gnu.org/cgit/guix.git/commit/?id=160f78a4d92205df986ed9efcce7d3aac188cb24), which includes:

  GCC 10.3.0 -> 10.4.0
  Binutils 2.37 -> 2.38
  Automake 1.16.3 -> 1.16.5
  Coreutils 8.32 -> 9.1
  Findutils 4.8.2 -> 4.9.0
  Libtool 2.4.6 -> 2.4.7
  Linux Libre Headers 5.15.37 -> 5.15.127
  Git 2.36.0 -> 2.41.0
  Mingw-w64 8.0.0 -> 11.0.1
  NSIS 3.05 -> 3.09
  Xorriso 1.5.2 -> 1.5.6.pl02
  Python 3.9 -> 3.10.7
  Python-asn1crypto 1.4.0 -> 1.5.1

  GCC 12.3.0 becomes available. See bitcoin#27897.
  LLVM 15.0.7 becomes available. Sadly not quite new enough for bitcoin#21778.

  Split from bitcoin#27897 for easier review, and to make it clear which changes are part of the time-machine bump vs changing to GCC 12.

  Guix Build:
  ```bash
  1e4aab93de36b47cbbfc5882d3d2a598e54a9c3604b3be1891ddac70cdc46547  guix-build-6cbedc3d9b67/output/aarch64-linux-gnu/SHA256SUMS.part
  278206bddf166ce507ab2ae4742ffbe6ec4256dbc6beee7e42ea040ec3d5b679  guix-build-6cbedc3d9b67/output/aarch64-linux-gnu/bitcoin-6cbedc3d9b67-aarch64-linux-gnu-debug.tar.gz
  261974753869297a480db24733f057aa58e33a0ce08754bea74984a00f8c376f  guix-build-6cbedc3d9b67/output/aarch64-linux-gnu/bitcoin-6cbedc3d9b67-aarch64-linux-gnu.tar.gz
  13bde7d903665f7699e2aa42a23ddc5ece9fab450437ae641d8ebfe6f6b084e1  guix-build-6cbedc3d9b67/output/arm-linux-gnueabihf/SHA256SUMS.part
  df951e4b23db34d1248f7ee9837594645acea8e2de1ed03b23ee002579a4c653  guix-build-6cbedc3d9b67/output/arm-linux-gnueabihf/bitcoin-6cbedc3d9b67-arm-linux-gnueabihf-debug.tar.gz
  5839bb71cca6aafa662f3c7e1c09393dce1c3fd13241726796bf3e681a0a34f0  guix-build-6cbedc3d9b67/output/arm-linux-gnueabihf/bitcoin-6cbedc3d9b67-arm-linux-gnueabihf.tar.gz
  637b1aa49db0cab1bc35064d068f1a5fdee5ab2ceba30b7f6d2c80bbf174c107  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/SHA256SUMS.part
  be87c1ad41f06bcaa8c940fc8d881eca41c531d250ce114325b0e042e603c257  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/bitcoin-6cbedc3d9b67-arm64-apple-darwin-unsigned.dmg
  632956e64d2baf9329ee086781b9268786f37b7c3c5f5232e2394ef2839d6d40  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/bitcoin-6cbedc3d9b67-arm64-apple-darwin-unsigned.tar.gz
  1b23548a94aee5e03a8aec1e63938d9c8505005b87fa832ed112af60861c42a6  guix-build-6cbedc3d9b67/output/arm64-apple-darwin/bitcoin-6cbedc3d9b67-arm64-apple-darwin.tar.gz
  e4056df68bac0bdc0a54899af8f8178e78bfb7d170750f2296fd512d0c6c20db  guix-build-6cbedc3d9b67/output/dist-archive/bitcoin-6cbedc3d9b67.tar.gz
  9f149c82f30eed35e2c217dc57cab37745db27f0a3205e66b4535c247dffc500  guix-build-6cbedc3d9b67/output/powerpc64-linux-gnu/SHA256SUMS.part
  ef91dce0a735ce0633fd273d9e1d6599d74c18280a866c1d6b71c2c3434af9c3  guix-build-6cbedc3d9b67/output/powerpc64-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64-linux-gnu-debug.tar.gz
  dfb60f13b9a7435f608f6d09585de37f789b055c77a0ee729e5723b0ef0550fe  guix-build-6cbedc3d9b67/output/powerpc64-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64-linux-gnu.tar.gz
  0ae916b95617042330166e20a27399c14abbc20638ae3e5e5f9f812146d4a07e  guix-build-6cbedc3d9b67/output/powerpc64le-linux-gnu/SHA256SUMS.part
  180d9c29da1efd21fba6be8a670b6ed01d71a5e90991da3c543f6720273831a2  guix-build-6cbedc3d9b67/output/powerpc64le-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64le-linux-gnu-debug.tar.gz
  9753408e3b4c10b19dba30ecb12ee2ae065c08e7c88be25599e1fdffe81bddbe  guix-build-6cbedc3d9b67/output/powerpc64le-linux-gnu/bitcoin-6cbedc3d9b67-powerpc64le-linux-gnu.tar.gz
  b1f09baec636a3bbaff1be629c95e75767c4ae3d96f0ebe63dcefb6fdb4953fb  guix-build-6cbedc3d9b67/output/riscv64-linux-gnu/SHA256SUMS.part
  09149283880c39c76f73ce83848f266f93777f6d9d389c2448ef0a9af9339b30  guix-build-6cbedc3d9b67/output/riscv64-linux-gnu/bitcoin-6cbedc3d9b67-riscv64-linux-gnu-debug.tar.gz
  788ce14925fec9861c78e16a57a1fd25d0f2ddf3f4e10f3c795bac534d339197  guix-build-6cbedc3d9b67/output/riscv64-linux-gnu/bitcoin-6cbedc3d9b67-riscv64-linux-gnu.tar.gz
  f357a0522c779d1953f37f4cab0160622cbf89ed3fe49cb5abea2509dba1d76f  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/SHA256SUMS.part
  be5c797a3e4dc969fd9116dede0cb27bda5180e653bb63d1ef3dbcc3de983bf0  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/bitcoin-6cbedc3d9b67-x86_64-apple-darwin-unsigned.dmg
  7364b2d0223b39debd386b521a5c5d1b26a446331f347b4d4e8fc58bf5b4439e  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/bitcoin-6cbedc3d9b67-x86_64-apple-darwin-unsigned.tar.gz
  7e873165d4ed785381b6e461a81a947814d14fdd41ae65bc82134c03b3ac0471  guix-build-6cbedc3d9b67/output/x86_64-apple-darwin/bitcoin-6cbedc3d9b67-x86_64-apple-darwin.tar.gz
  bf03ca15a885330ed0c91b3137dcc4ec1102570898360cc3f1073f03b792d729  guix-build-6cbedc3d9b67/output/x86_64-linux-gnu/SHA256SUMS.part
  0707b0e4d8529fc5f7567d1ff029b4b6fdf0bb46f1eb227d70c3aaa2018d65e5  guix-build-6cbedc3d9b67/output/x86_64-linux-gnu/bitcoin-6cbedc3d9b67-x86_64-linux-gnu-debug.tar.gz
  5f1e3713cf856f884d305ad12f43254be3871d9020cc514194fc0a6efd0867b1  guix-build-6cbedc3d9b67/output/x86_64-linux-gnu/bitcoin-6cbedc3d9b67-x86_64-linux-gnu.tar.gz
  c0d5e284903dbb55e4ad3d43db9b1e5d211c5259c3fae43bf4cddedea2e02c01  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/SHA256SUMS.part
  d16f61c78b784b664d558a9a537e15da432ef9c18de0754dd7fd19682ab0569f  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64-debug.zip
  617010c1ac295bc692e0a4074acc19ebbc9561a01c8e5365428cfe61dc50fe3c  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64-setup-unsigned.exe
  a48961c49edf9f8988b902d874f47918f6716053be6c3bc263932834cb896510  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64-unsigned.tar.gz
  0cd95e8f919ac694dfd88a14fda37c57f0534cb890acc73f70aff71937fa1a8e  guix-build-6cbedc3d9b67/output/x86_64-w64-mingw32/bitcoin-6cbedc3d9b67-win64.zip
  ```

ACKs for top commit:
  TheCharlatan:
    ACK 6cbedc3

Tree-SHA512: 48950535febab3865a8899b0ce590a7da6dbd0a89d2d2987a467da457e9ff0687d5afc65f952386fa562aa2a3fc6d8c85b1c221c73998d522076486a9fd845c4
achow101 added a commit to achow101/bitcoincore.org that referenced this pull request Oct 4, 2024
achow101 added a commit to achow101/bitcoincore.org that referenced this pull request Oct 4, 2024
achow101 added a commit to achow101/bitcoincore.org that referenced this pull request Oct 4, 2024
kwvg added a commit to kwvg/dash that referenced this pull request Nov 4, 2024
kwvg added a commit to kwvg/dash that referenced this pull request Nov 5, 2024
kwvg added a commit to kwvg/dash that referenced this pull request Nov 10, 2024
PastaPastaPasta added a commit to dashpay/dash that referenced this pull request Nov 12, 2024
, bitcoin#28786, bitcoin#29078, bitcoin#27897, bitcoin#29651, bitcoin#29695, bitcoin#29673, bitcoin#29828, bitcoin#29846, bitcoin#30231, bitcoin#30438, partial bitcoin#30511 (guix backports: part 5)

91b7ef8 merge bitcoin#30438: build Linux GCC with --enable-cet (Kittywhiskers Van Gogh)
cfc6cba partial bitcoin#30511: GCC 12 consolidation (Kittywhiskers Van Gogh)
06f5431 merge bitcoin#30231: bump time-machine to f0bb724211872cd6158fce6162e0b8c73efed126 (Kittywhiskers Van Gogh)
5b292ee merge bitcoin#29846: replace GCC unaligned VMOV patch with binutils patch (Kittywhiskers Van Gogh)
4d1f7dc merge bitcoin#29828: remove `gcc-toolchain static` from Windows build (Kittywhiskers Van Gogh)
f321d3d merge bitcoin#29673: use GCC 11 in macOS build env (Kittywhiskers Van Gogh)
d570e2d merge bitcoin#29695: build GCC with --enable-standard-branch-protection (Kittywhiskers Van Gogh)
c965943 merge bitcoin#29651: bump time-machine to dc4842797bfdc5f9f3f5f725bf189c2b68bd6b5a (Kittywhiskers Van Gogh)
59a125a merge bitcoin#27897: use GCC 12.3.0 to build releases (Kittywhiskers Van Gogh)
a701b06 merge bitcoin#29078: Bump guix time-machine to unlock riscv64 metal (Kittywhiskers Van Gogh)
d4b10a3 merge bitcoin#28786: switch to 6.1 kernel headers over 5.15 (Kittywhiskers Van Gogh)
c371870 merge bitcoin#28580: update time-machine (Kittywhiskers Van Gogh)
d36c9b6 merge bitcoin#28759: update signapple to latest master (Kittywhiskers Van Gogh)
38c71d8 merge bitcoin#28370: remove GCC 10 workaround from NSIS (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Dependent on #6382
  * Dependency for #6384

  ## Breaking Changes

  None expected

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)**
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 91b7ef8

Tree-SHA512: 0cfb436a430cf4b624a48a9928ecac9cd5c50e88e51ed04e7d1d0100968af8be1183364f035ac75153781a5e1616aa2f6fadabf0a1c03ec4b66dedea544b77ad
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Nov 29, 2024
Summary:
```
Retain native GCC 10 toolchain for macOS, to prevent compile failures in
native tools (this will be removed entirely when we tansition to LLD).
Update the vmov-alignment patch, for changes in GCC 12.
```

Backport of [[bitcoin/bitcoin#27897 | core#27897]].

Depends on D17232.

Test Plan: Run the guix builds.

Reviewers: #bitcoin_abc, PiRK

Reviewed By: #bitcoin_abc, PiRK

Differential Revision: https://reviews.bitcoinabc.org/D17233
roqqit pushed a commit to doged-io/doged that referenced this pull request Dec 2, 2024
Summary:
```
Retain native GCC 10 toolchain for macOS, to prevent compile failures in
native tools (this will be removed entirely when we tansition to LLD).
Update the vmov-alignment patch, for changes in GCC 12.
```

Backport of [[bitcoin/bitcoin#27897 | core#27897]].

Depends on D17232.

Test Plan: Run the guix builds.

Reviewers: #bitcoin_abc, PiRK

Reviewed By: #bitcoin_abc, PiRK

Differential Revision: https://reviews.bitcoinabc.org/D17233
knst added a commit to knst/dash that referenced this pull request Dec 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants