-
Notifications
You must be signed in to change notification settings - Fork 38.7k
guix: Use UCRT runtime for Windows release binaries #33593
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
base: master
Are you sure you want to change the base?
Conversation
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code Coverage & BenchmarksFor details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33593. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please copy-paste ConflictsReviewers, this pull request conflicts with the following ones:
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. |
|
I could submit an upstream Guix patch for this. It will help with build times since the package with ucrt will be in the main substitute servers. |
|
Concept ACK |
|
What is the plan for adding CI, as that blocks everything here? |
f380e62 to
4d31ddc
Compare
|
Rebased. Some of the feedback has been addressed. My Guix build: |
fanquake
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the plan for adding CI, as that blocks everything here?
UPDATE. See #33764. |
4d31ddc to
dbb8359
Compare
|
Reworked per feedback from @trevarj. |
|
My Guix build: |
trevarj
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dbb8359 to
527acc5
Compare
|
Rebased to resolve a conflict with the merged #33181. |
|
Guix Build (aarch64): 451630ecff800ab320a9d5ad8062758df9d700310690110e764c916ae4c8121e guix-build-527acc5ee497/output/dist-archive/bitcoin-527acc5ee497.tar.gz
bf19a3b8e9e9cf609102c38cd6c00dca4d2645f66ae3af591f29fdeceef7b6cf guix-build-527acc5ee497/output/x86_64-w64-mingw32/SHA256SUMS.part
b69dc956f6fd6bb9b4e20e5f4d29eb4ef74e450d250346bf0450cc051b5cfa95 guix-build-527acc5ee497/output/x86_64-w64-mingw32/bitcoin-527acc5ee497-win64-codesigning.tar.gz
9e44c7635597430ee32fb26dff8fcd3261fe747ca66b78ed3bc1fb6c6a0efad8 guix-build-527acc5ee497/output/x86_64-w64-mingw32/bitcoin-527acc5ee497-win64-debug.zip
8527ebfe0d7849b3182c9c2f71b6be616e3c8fd38a6f10878c2fadf165ed8764 guix-build-527acc5ee497/output/x86_64-w64-mingw32/bitcoin-527acc5ee497-win64-setup-unsigned.exe
ee9437a08668555adaa1cfa30d6a87b5cbdd6d20c4b7b456dd7dc99f78a0f03d guix-build-527acc5ee497/output/x86_64-w64-mingw32/bitcoin-527acc5ee497-win64-unsigned.zip |
|
My Guix build: UPDATE: Hashes on |
527acc5 to
f94c321
Compare
Thanks! Done. |
|
Shouldn't this be removing the other CI (#33764):
|
Removed. |
…EADME.md` ec8eb01 doc: Add `x86_64-w64-mingw32ucrt` triplet to `depends/README.md` (Hennadii Stepanov) 48496ca ci: Remove redundant `DEP_OPTS` from “Windows-cross UCRT” job (Hennadii Stepanov) Pull request description: This PR is part of the ongoing effort to migrate to the modern UCRT runtime for cross-compiled Windows binaries, including release builds. For more details about this migration, see: - #30210 - #33593 - #33764 Can be tested on the following systems: - Debian Trixie x86_64 (requires the [`g++-mingw-w64-ucrt64`](https://packages.debian.org/trixie/g++-mingw-w64-ucrt64) package, as documented). - Fedora 42 or 43 (requires the [`ucrt64-gcc-c++`](https://packages.fedoraproject.org/pkgs/mingw-gcc/ucrt64-gcc-c++/) package). Also see related upstream issues: - https://bugs.launchpad.net/ubuntu/+source/gcc-mingw-w64/+bug/2132114 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1121403 ACKs for top commit: m3dwards: ACK ec8eb01 hodlinator: ACK ec8eb01 Tree-SHA512: 26e6e0354fedd8cc79d186b519124c306a7de328ced7247804c6e6d546e9c71cd5b92af878ab0f9a3c1e506a339944acaeb0ac99cd56bed896fd77b952788ae0
e33ef9b to
d245119
Compare
|
Rebased on top of the merged #33857. |
|
Given it's dropping the other CI, I think this PR should be completing #30210, dropping workarounds, updating any docs, and completing the migration. |
More commits have been added to complete the migration. |
da877af to
fece462
Compare
|
Rebased to resolve a conflict with the merged #34080. |
|
My Guix build: |
|
ACK fece462 |
Co-authored-by: Trevor Arjeski <tmarjeski@gmail.com>
fece462 to
0529f34
Compare
|
Rebased to resolve a conflict with the merged #33775. |
|
ACK 0529f34 |
|
My guix build on both |
|
Should this be moved to 32.x, so that there is a bit more time for the Ubuntu/Debian upstream to fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1121403 and https://bugs.launchpad.net/ubuntu/+source/mingw-w64/+bug/2106420 ? Otherwise, the only ways to cross-compile with system packages would be guix and Fedora? |
... and Debian x86_64. |
This PR:
Closes #30210.