-
Notifications
You must be signed in to change notification settings - Fork 36.6k
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: Fix Guix build for Windows (attempt 2) #24348
Conversation
Can you explain what this is doing, and why it's a good fix (assuming builds work). |
fwiw "newlib" is a basic C library intended for embedded systems development, i would guess disabling it is acceptable for windows if it's interfering edit: at least it's a nice minimal fix that doesn't clutter workarounds all over the code, will test ! |
As it was discovered Windows build fails because the
The following code
defined in
I cannot prove that this is a good fix. Maybe @dongcarl could? |
@@ -239,7 +239,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --f | |||
time-machine() { | |||
# shellcheck disable=SC2086 | |||
guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \ | |||
--commit=1ef7a03a148cf5f83ab1820444f6bd50d8e732d1 \ | |||
--commit=ae03f401381e956c4c41b4cf495cbde964fa43d0 \ |
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.
Guix builds:
If we're changing the time-machine commit we need to do builds for all HOSTS, not just Windows.
Builds succeed and get the same output (haven't actually tested anything on windows):
|
Updated e4ff31c -> b3617a9 (pr24348.01 -> pr24348.02, diff):
Guix hashes in the OP to be updated soon... |
When in doubt... Always compare with debian and Fedora... Debian doesn't specify We should figure out why Guix maintainers originally felt they needed to specify |
Guix build hashes in the OP have just been updated. |
I would guess they didn't think about it at all. Normally it doesn't interfere, and there's some borderline cases (usually boot-loader/embedded/cross dev) where newlib is useful to have for an architecture. However, x86 newlib is x86 newlib. It's irrelevant for "special operating systems" like Windows. In any case I'm pretty happy with this solution. Code review and lightly tested ACK b3617a9 Edit: hashes match the OP
|
Yes I talked with the person who committed the change originally, they said that they added it because it was needed for mingw-w64 cross builds but we tested everything and it's no longer needed at all. We should probably upstream a patch that removes this logic, though we don't have to thanks to the flexible package rewriting procedures. With this context, this is likely The Right Fix. |
Maybe if they want to build a windows kernel 😄 |
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.
ACK b3617a9 - thanks Carl for following up upstream.
Guix builds:
d807189a8b5721892395968a86acd47f0cff2c7e76e75e6e927045ba339ba1dc guix-build-b3617a99c141/output/aarch64-linux-gnu/SHA256SUMS.part
a1c89935c5d5c57df428a360168944d1be83fc00324a903a0a68c284fa4d71cf guix-build-b3617a99c141/output/aarch64-linux-gnu/bitcoin-b3617a99c141-aarch64-linux-gnu-debug.tar.gz
2936adc6d4425f297c2eee310fa8a90b51209289474d10a5a320346c9b4fb90a guix-build-b3617a99c141/output/aarch64-linux-gnu/bitcoin-b3617a99c141-aarch64-linux-gnu.tar.gz
10420ef9e7001f7dbe009261925db81ee94764bb42514f28d0aa429de37c81d6 guix-build-b3617a99c141/output/arm-linux-gnueabihf/SHA256SUMS.part
00b762833139e0d7b470570e30dfe10c427f78a5bd498207b8750695b307fcfe guix-build-b3617a99c141/output/arm-linux-gnueabihf/bitcoin-b3617a99c141-arm-linux-gnueabihf-debug.tar.gz
2084c431e262a49cf18a2346e1465f73ccb8c320cfda3aa918439f371c1fec9c guix-build-b3617a99c141/output/arm-linux-gnueabihf/bitcoin-b3617a99c141-arm-linux-gnueabihf.tar.gz
752b769cbee5b04a4ae1fff0db5d8521b76df68e20c966bad141e9c65de3d196 guix-build-b3617a99c141/output/arm64-apple-darwin/SHA256SUMS.part
708a39f525ea225cce71d53120df411c808a5f5a29e9c3498646ab7e5d5ab14d guix-build-b3617a99c141/output/arm64-apple-darwin/bitcoin-b3617a99c141-arm64-apple-darwin.tar.gz
cc60ed18529d0656feb87189c69f2fbe048b2b37ac11952d9290dd0f8576ea97 guix-build-b3617a99c141/output/arm64-apple-darwin/bitcoin-b3617a99c141-osx-unsigned.dmg
5e10d7f0ab7352995ceb7959b5b371615e06904f9a857d59229dd5e1b7f5825e guix-build-b3617a99c141/output/arm64-apple-darwin/bitcoin-b3617a99c141-osx-unsigned.tar.gz
b44e8a11279d3fe29cc4d72f3ac1b3da1f11608636b4a9c8653272bf6be5ed92 guix-build-b3617a99c141/output/dist-archive/bitcoin-b3617a99c141.tar.gz
c467e2371a88fd2fbcd98c9413f47f1ddc81183ac9f0674182a7af208df18e31 guix-build-b3617a99c141/output/powerpc64-linux-gnu/SHA256SUMS.part
2de931fe54aaf6fdaac9aa2595d7f4901eeba80ab1185249c2bc2141318a9811 guix-build-b3617a99c141/output/powerpc64-linux-gnu/bitcoin-b3617a99c141-powerpc64-linux-gnu-debug.tar.gz
2d2cf5236d41d9dbe2480e19a94107c726dce3c52bfa8672e3f41ada7a8acd61 guix-build-b3617a99c141/output/powerpc64-linux-gnu/bitcoin-b3617a99c141-powerpc64-linux-gnu.tar.gz
2815de278610cc7aa3d365af3834ed77e49cf6695dc9e2ffdbc3ccd6cc8362fc guix-build-b3617a99c141/output/powerpc64le-linux-gnu/SHA256SUMS.part
fd13b01363a44c03dd52b1193b2690efdaa358c2bcdc31c43e83c96e06c2bc05 guix-build-b3617a99c141/output/powerpc64le-linux-gnu/bitcoin-b3617a99c141-powerpc64le-linux-gnu-debug.tar.gz
796bd23f314e6edb429d893e7ffafc7c4d6b51c0febe1faaa192085435aeb0bb guix-build-b3617a99c141/output/powerpc64le-linux-gnu/bitcoin-b3617a99c141-powerpc64le-linux-gnu.tar.gz
c1e449e6ac3e78682d613d8bcebf97bce5ed69a865cfdc939cf6d290a3a5c7ef guix-build-b3617a99c141/output/riscv64-linux-gnu/SHA256SUMS.part
c3e6380e81229779ad60fa1c1fa856d6af46c1cab9a87abe296694be0b42b405 guix-build-b3617a99c141/output/riscv64-linux-gnu/bitcoin-b3617a99c141-riscv64-linux-gnu-debug.tar.gz
1351e7755ace57cdbcb66f2673733f31d3b90063e414a0eeb1f0c71b19ca3b88 guix-build-b3617a99c141/output/riscv64-linux-gnu/bitcoin-b3617a99c141-riscv64-linux-gnu.tar.gz
1af14acc6e7210286d09618e9e43b93707540eac9ee48226a6a2d69ab10dfe24 guix-build-b3617a99c141/output/x86_64-apple-darwin/SHA256SUMS.part
e76b872e075604916ad60fa50989bba81080ecad9a12e8793a2628713bc816fd guix-build-b3617a99c141/output/x86_64-apple-darwin/bitcoin-b3617a99c141-osx-unsigned.dmg
2755d5766efc86f360909b01206e4594f5049e7aed17bc8ba3781a375acc28cf guix-build-b3617a99c141/output/x86_64-apple-darwin/bitcoin-b3617a99c141-osx-unsigned.tar.gz
335a08ee376c51692e9e24f4dd0a71fc24af2b15f3acd4ef2881ecb882fc708f guix-build-b3617a99c141/output/x86_64-apple-darwin/bitcoin-b3617a99c141-osx64.tar.gz
0ed78a1a1e22e8d20de9aeff052f57f0ada1eb536d541d28318223120610614b guix-build-b3617a99c141/output/x86_64-linux-gnu/SHA256SUMS.part
d07dfb39d9fd65ed2514eae7697a25f43ece18efdd1255a592feb0e6eb0510e4 guix-build-b3617a99c141/output/x86_64-linux-gnu/bitcoin-b3617a99c141-x86_64-linux-gnu-debug.tar.gz
c427792751e83edbc48a4ed05278b70d888b957b77d8e7d9e298da47d2351bab guix-build-b3617a99c141/output/x86_64-linux-gnu/bitcoin-b3617a99c141-x86_64-linux-gnu.tar.gz
f24d5d065cebd214a948600adc97cdc1535ad3411e07ec66d3af2007586518e9 guix-build-b3617a99c141/output/x86_64-w64-mingw32/SHA256SUMS.part
de196c52b6767a84c36d0d8c304ad46060dfd27accbc0812dd29600449385ab2 guix-build-b3617a99c141/output/x86_64-w64-mingw32/bitcoin-b3617a99c141-win-unsigned.tar.gz
f6795755776c06fcc42482f2aaeedc0d45f11396a7766423bc8ee408feb203b8 guix-build-b3617a99c141/output/x86_64-w64-mingw32/bitcoin-b3617a99c141-win64-debug.zip
76e75bb47277ae9f4a1b3116f98a91ed7291705c6c87456d9fa10a98448818d3 guix-build-b3617a99c141/output/x86_64-w64-mingw32/bitcoin-b3617a99c141-win64-setup-unsigned.exe
615cb51c1536ff809025a580e3542da5eba02041676a37a21dbe11e1ac5f97c2 guix-build-b3617a99c141/output/x86_64-w64-mingw32/bitcoin-b3617a99c141-win64.zip
b3617a9 build: Point Guix to recent commit on the master branch (Hennadii Stepanov) 7f2f35f build: Fix gcc-cross-x86_64-w64-mingw32-10.3.0 in Guix (Hennadii Stepanov) Pull request description: Fixes bitcoin#24055. Replaces bitcoin#24300. #### Guix builds: ``` $ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum d807189a8b5721892395968a86acd47f0cff2c7e76e75e6e927045ba339ba1dc guix-build-b3617a99c141/output/aarch64-linux-gnu/SHA256SUMS.part a1c89935c5d5c57df428a360168944d1be83fc00324a903a0a68c284fa4d71cf guix-build-b3617a99c141/output/aarch64-linux-gnu/bitcoin-b3617a99c141-aarch64-linux-gnu-debug.tar.gz 2936adc6d4425f297c2eee310fa8a90b51209289474d10a5a320346c9b4fb90a guix-build-b3617a99c141/output/aarch64-linux-gnu/bitcoin-b3617a99c141-aarch64-linux-gnu.tar.gz 10420ef9e7001f7dbe009261925db81ee94764bb42514f28d0aa429de37c81d6 guix-build-b3617a99c141/output/arm-linux-gnueabihf/SHA256SUMS.part 00b762833139e0d7b470570e30dfe10c427f78a5bd498207b8750695b307fcfe guix-build-b3617a99c141/output/arm-linux-gnueabihf/bitcoin-b3617a99c141-arm-linux-gnueabihf-debug.tar.gz 2084c431e262a49cf18a2346e1465f73ccb8c320cfda3aa918439f371c1fec9c guix-build-b3617a99c141/output/arm-linux-gnueabihf/bitcoin-b3617a99c141-arm-linux-gnueabihf.tar.gz 752b769cbee5b04a4ae1fff0db5d8521b76df68e20c966bad141e9c65de3d196 guix-build-b3617a99c141/output/arm64-apple-darwin/SHA256SUMS.part 708a39f525ea225cce71d53120df411c808a5f5a29e9c3498646ab7e5d5ab14d guix-build-b3617a99c141/output/arm64-apple-darwin/bitcoin-b3617a99c141-arm64-apple-darwin.tar.gz cc60ed18529d0656feb87189c69f2fbe048b2b37ac11952d9290dd0f8576ea97 guix-build-b3617a99c141/output/arm64-apple-darwin/bitcoin-b3617a99c141-osx-unsigned.dmg 5e10d7f0ab7352995ceb7959b5b371615e06904f9a857d59229dd5e1b7f5825e guix-build-b3617a99c141/output/arm64-apple-darwin/bitcoin-b3617a99c141-osx-unsigned.tar.gz b44e8a11279d3fe29cc4d72f3ac1b3da1f11608636b4a9c8653272bf6be5ed92 guix-build-b3617a99c141/output/dist-archive/bitcoin-b3617a99c141.tar.gz c467e2371a88fd2fbcd98c9413f47f1ddc81183ac9f0674182a7af208df18e31 guix-build-b3617a99c141/output/powerpc64-linux-gnu/SHA256SUMS.part 2de931fe54aaf6fdaac9aa2595d7f4901eeba80ab1185249c2bc2141318a9811 guix-build-b3617a99c141/output/powerpc64-linux-gnu/bitcoin-b3617a99c141-powerpc64-linux-gnu-debug.tar.gz 2d2cf5236d41d9dbe2480e19a94107c726dce3c52bfa8672e3f41ada7a8acd61 guix-build-b3617a99c141/output/powerpc64-linux-gnu/bitcoin-b3617a99c141-powerpc64-linux-gnu.tar.gz 2815de278610cc7aa3d365af3834ed77e49cf6695dc9e2ffdbc3ccd6cc8362fc guix-build-b3617a99c141/output/powerpc64le-linux-gnu/SHA256SUMS.part fd13b01363a44c03dd52b1193b2690efdaa358c2bcdc31c43e83c96e06c2bc05 guix-build-b3617a99c141/output/powerpc64le-linux-gnu/bitcoin-b3617a99c141-powerpc64le-linux-gnu-debug.tar.gz 796bd23f314e6edb429d893e7ffafc7c4d6b51c0febe1faaa192085435aeb0bb guix-build-b3617a99c141/output/powerpc64le-linux-gnu/bitcoin-b3617a99c141-powerpc64le-linux-gnu.tar.gz c1e449e6ac3e78682d613d8bcebf97bce5ed69a865cfdc939cf6d290a3a5c7ef guix-build-b3617a99c141/output/riscv64-linux-gnu/SHA256SUMS.part c3e6380e81229779ad60fa1c1fa856d6af46c1cab9a87abe296694be0b42b405 guix-build-b3617a99c141/output/riscv64-linux-gnu/bitcoin-b3617a99c141-riscv64-linux-gnu-debug.tar.gz 1351e7755ace57cdbcb66f2673733f31d3b90063e414a0eeb1f0c71b19ca3b88 guix-build-b3617a99c141/output/riscv64-linux-gnu/bitcoin-b3617a99c141-riscv64-linux-gnu.tar.gz 1af14acc6e7210286d09618e9e43b93707540eac9ee48226a6a2d69ab10dfe24 guix-build-b3617a99c141/output/x86_64-apple-darwin/SHA256SUMS.part e76b872e075604916ad60fa50989bba81080ecad9a12e8793a2628713bc816fd guix-build-b3617a99c141/output/x86_64-apple-darwin/bitcoin-b3617a99c141-osx-unsigned.dmg 2755d5766efc86f360909b01206e4594f5049e7aed17bc8ba3781a375acc28cf guix-build-b3617a99c141/output/x86_64-apple-darwin/bitcoin-b3617a99c141-osx-unsigned.tar.gz 335a08ee376c51692e9e24f4dd0a71fc24af2b15f3acd4ef2881ecb882fc708f guix-build-b3617a99c141/output/x86_64-apple-darwin/bitcoin-b3617a99c141-osx64.tar.gz 0ed78a1a1e22e8d20de9aeff052f57f0ada1eb536d541d28318223120610614b guix-build-b3617a99c141/output/x86_64-linux-gnu/SHA256SUMS.part d07dfb39d9fd65ed2514eae7697a25f43ece18efdd1255a592feb0e6eb0510e4 guix-build-b3617a99c141/output/x86_64-linux-gnu/bitcoin-b3617a99c141-x86_64-linux-gnu-debug.tar.gz c427792751e83edbc48a4ed05278b70d888b957b77d8e7d9e298da47d2351bab guix-build-b3617a99c141/output/x86_64-linux-gnu/bitcoin-b3617a99c141-x86_64-linux-gnu.tar.gz f24d5d065cebd214a948600adc97cdc1535ad3411e07ec66d3af2007586518e9 guix-build-b3617a99c141/output/x86_64-w64-mingw32/SHA256SUMS.part de196c52b6767a84c36d0d8c304ad46060dfd27accbc0812dd29600449385ab2 guix-build-b3617a99c141/output/x86_64-w64-mingw32/bitcoin-b3617a99c141-win-unsigned.tar.gz f6795755776c06fcc42482f2aaeedc0d45f11396a7766423bc8ee408feb203b8 guix-build-b3617a99c141/output/x86_64-w64-mingw32/bitcoin-b3617a99c141-win64-debug.zip 76e75bb47277ae9f4a1b3116f98a91ed7291705c6c87456d9fa10a98448818d3 guix-build-b3617a99c141/output/x86_64-w64-mingw32/bitcoin-b3617a99c141-win64-setup-unsigned.exe 615cb51c1536ff809025a580e3542da5eba02041676a37a21dbe11e1ac5f97c2 guix-build-b3617a99c141/output/x86_64-w64-mingw32/bitcoin-b3617a99c141-win64.zip ``` ACKs for top commit: laanwj: In any case I'm pretty happy with this solution. Code review and lightly tested ACK b3617a9 fanquake: ACK b3617a9 - thanks Carl for following up upstream. Tree-SHA512: 9621cadcf5ce75142eeec97e9b5dabe36e3b9f39b4c58c1088f2341d3a6a66b1d1351c80c508b82a1587380d3b3ec6274453ccf0542ffa336da3b31ba8ef16a5
Upstream patch: https://issues.guix.gnu.org/54212 |
Fixes #24055.
Replaces #24300.
Guix builds: