-
Notifications
You must be signed in to change notification settings - Fork 37.7k
build: Bump guix time-machine to unlock riscv64 metal #29078
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
Conversation
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code CoverageFor detailed information about the code coverage, see the test coverage report. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. 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. |
Is there an easy way to print all affected/changed/bumped dependencies in the Bitcoin Core build graph? |
Looks like it just built the first host and hopped over to the next. 🥹
|
A quick check is to compare the manifests of master vs the change, i.e: diff guix-build-3695ecbf680a/var/profiles/x86_64-linux-gnu/manifest guix-build-fa87a2072b91/var/profiles/x86_64-linux-gnu/manifest
60c60
< "0.67"
---
> "0.68"
62c62
< "/gnu/store/4ck57lp0wdcslrc106c649yfm3fclmsl-moreutils-0.67")
---
> "/gnu/store/09jzmmg2h8cxf75imk0r1c3j0cx20zkn-moreutils-0.68")
171c171
< "/gnu/store/zjsygsszp9v5i5gz8kqxxfrl50xwzl44-git-minimal-2.41.0"
---
> "/gnu/store/w6bbaal18axhsyy3r418isll33qzz2jb-git-minimal-2.41.0"
186c186
< "/gnu/store/ch86qkh3qz2701wy7p1r4s7r7i2jyqjl-python-lief-0.13.2")
---
> "/gnu/store/lkq1x15862rgch435k6cici1yi8anwas-python-lief-0.13.2")
190c190
< "/gnu/store/6a7rbkaisfwfz54k8b90ns54kra314cp-x86_64-linux-gnu-toolchain-10.5.0"
---
> "/gnu/store/my917igzlinspc0fp6zl827nzmyl4wgb-x86_64-linux-gnu-toolchain-10.5.0"
199c199
< "/gnu/store/6308la3gb2r344sp8prvk058qvzq14lq-glibc-cross-x86_64-linux-gnu-2.27"
---
> "/gnu/store/glkb9x9h6s0zxia3ywd1y55jg80w1ai5-glibc-cross-x86_64-linux-gnu-2.27"
202c202
< "6.1.61"
---
> "6.1.67"
204c204
< "/gnu/store/av2i6y23kmrnhgfqwhgmh24f12l2qvvv-linux-libre-headers-cross-x86_64-linux-gnu-6.1.61")))
---
> "/gnu/store/v80d0b41laxz2i6mhik0nz8ikya0b6hi-linux-libre-headers-cross-x86_64-linux-gnu-6.1.67")))
210c210
< "/gnu/store/g5g7j5xlw132s1rbabx7h1yvgn321985-gcc-cross-x86_64-linux-gnu-10.5.0")
---
> "/gnu/store/bjrf468hxqnzymddr6xxs3vairk46ypr-gcc-cross-x86_64-linux-gnu-10.5.0")
214c214
< "/gnu/store/jn08byk4gwcd1k8xilcm2x7z660l3lfd-glibc-cross-x86_64-linux-gnu-2.27-static"
---
> "/gnu/store/fncrsxpss8l8aj4qvmymkkksm6bb4ar4-glibc-cross-x86_64-linux-gnu-2.27-static"
218,219c218,219
< "6.1.61"
< "/gnu/store/av2i6y23kmrnhgfqwhgmh24f12l2qvvv-linux-libre-headers-cross-x86_64-linux-gnu-6.1.61")))
---
> "6.1.67"
> "/gnu/store/v80d0b41laxz2i6mhik0nz8ikya0b6hi-linux-libre-headers-cross-x86_64-linux-gnu-6.1.67")))
225c225
< "/gnu/store/xsl44lhvxircf1ffqh3iyrrzgprf57cx-gcc-cross-x86_64-linux-gnu-10.5.0-lib")))
---
> "/gnu/store/yjqqr10hl10aqjmkdsr3dzvqsw0h6nkw-gcc-cross-x86_64-linux-gnu-10.5.0-lib"))) Depending on how much you want to see, you could also do something with |
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 fa87a20
Guix build (aarch64):
d137d8dc94b3d734965b7e50fac273f704e122f969430e1b43bfe21c9af31bbe guix-build-fa87a2072b91/output/aarch64-linux-gnu/SHA256SUMS.part
42d66d0daf6067a74c3ba4e55c012712ae5cca02c9123ed3ef7fd9a8f09c16d4 guix-build-fa87a2072b91/output/aarch64-linux-gnu/bitcoin-fa87a2072b91-aarch64-linux-gnu-debug.tar.gz
3ccda6af99c1dd4b54533d073dca82d5f252759cede55a335220065dfe24ee7c guix-build-fa87a2072b91/output/aarch64-linux-gnu/bitcoin-fa87a2072b91-aarch64-linux-gnu.tar.gz
ea3a9d6ef4ee4a83ad2aa95b667a38473c971e74c8ec599a353a16678642c211 guix-build-fa87a2072b91/output/arm-linux-gnueabihf/SHA256SUMS.part
a4d41469855a143a16b591b78ce04842ed597fdb50f26b5c4ee97aca137275ee guix-build-fa87a2072b91/output/arm-linux-gnueabihf/bitcoin-fa87a2072b91-arm-linux-gnueabihf-debug.tar.gz
97f91c7c3776d218e0e4b9c3b0d7fcb9e47aef9414c12874f390ecd42538baf7 guix-build-fa87a2072b91/output/arm-linux-gnueabihf/bitcoin-fa87a2072b91-arm-linux-gnueabihf.tar.gz
0b06e5eb3c0c67f075406cd568e6afb45914fff4c5135b597639d869acb4b93c guix-build-fa87a2072b91/output/arm64-apple-darwin/SHA256SUMS.part
4ee72078a82351ea81cb9ad7cbccc0c30a0420f16da5efd9121ffa7f69744ea3 guix-build-fa87a2072b91/output/arm64-apple-darwin/bitcoin-fa87a2072b91-arm64-apple-darwin-unsigned.tar.gz
c3204e997966993bed355072ef4ea6e8b4708d80f67d53ce1d01a0398e4a6fee guix-build-fa87a2072b91/output/arm64-apple-darwin/bitcoin-fa87a2072b91-arm64-apple-darwin-unsigned.zip
764c7de0291c3caa15584bc730ad7166cc87d44526a460da35f43831cf342743 guix-build-fa87a2072b91/output/arm64-apple-darwin/bitcoin-fa87a2072b91-arm64-apple-darwin.tar.gz
b5325393a05c4452c6695103a33bcfa221df48c65df0cccbf8d5eadba58b181f guix-build-fa87a2072b91/output/dist-archive/bitcoin-fa87a2072b91.tar.gz
d8ba9241a6058116eabe017a2fa9c7aa62430de33aa875022a79dadc3dc8478b guix-build-fa87a2072b91/output/powerpc64-linux-gnu/SHA256SUMS.part
bcd1aeac764f5fe9485f6a84d1e417bb066bcc7c3973bcb83802a999964b8de2 guix-build-fa87a2072b91/output/powerpc64-linux-gnu/bitcoin-fa87a2072b91-powerpc64-linux-gnu-debug.tar.gz
ad345dddbea6285cc31ac4a295ae115cf41b2cc2e2315914aef32206cad10b4e guix-build-fa87a2072b91/output/powerpc64-linux-gnu/bitcoin-fa87a2072b91-powerpc64-linux-gnu.tar.gz
5ee29851afae46e124cbf1bc11027e876d789509a73da7e553e89bdbb2ecd4d0 guix-build-fa87a2072b91/output/powerpc64le-linux-gnu/SHA256SUMS.part
30d944c57922d75e5d530c98daa5d472d8ae9e4d281270d23f5e8389d9ac6353 guix-build-fa87a2072b91/output/powerpc64le-linux-gnu/bitcoin-fa87a2072b91-powerpc64le-linux-gnu-debug.tar.gz
276f0db360cecad6dc9f58c738f82f3499bd7f360c99711165efcaf2ef26c30a guix-build-fa87a2072b91/output/powerpc64le-linux-gnu/bitcoin-fa87a2072b91-powerpc64le-linux-gnu.tar.gz
62c84dbca74e6f3f0a8434437e885eef96c8faf1df7cd966f380323ea87d0bd3 guix-build-fa87a2072b91/output/riscv64-linux-gnu/SHA256SUMS.part
86cb0971a5151fc922c2b627e8860d550fd453cc909b017b2f293dd388b16717 guix-build-fa87a2072b91/output/riscv64-linux-gnu/bitcoin-fa87a2072b91-riscv64-linux-gnu-debug.tar.gz
8e227432a0d3542855293592c0a448f3af3bd6215da00d63586f082e4ea26dba guix-build-fa87a2072b91/output/riscv64-linux-gnu/bitcoin-fa87a2072b91-riscv64-linux-gnu.tar.gz
b276c06a5b3e04dc39726147fda30919af97ca6c843809aeeeb3e0d760e24917 guix-build-fa87a2072b91/output/x86_64-apple-darwin/SHA256SUMS.part
e41219c0cd0fedeb8646ba866a779112594e5c608542bb5530cd0e94184bcba9 guix-build-fa87a2072b91/output/x86_64-apple-darwin/bitcoin-fa87a2072b91-x86_64-apple-darwin-unsigned.tar.gz
af186305d4b09094f19976701071861d7fcaf0b187bb957825ecb7e2bcffb30f guix-build-fa87a2072b91/output/x86_64-apple-darwin/bitcoin-fa87a2072b91-x86_64-apple-darwin-unsigned.zip
fabf02c5fc54013acb2dacfff63b252a402e78991e4f8784de5ccbb9ed5e4fc0 guix-build-fa87a2072b91/output/x86_64-apple-darwin/bitcoin-fa87a2072b91-x86_64-apple-darwin.tar.gz
a722a013353047f4046dc5ddf0856dfd1785a976e625b33d574bd9a84b1358ba guix-build-fa87a2072b91/output/x86_64-linux-gnu/SHA256SUMS.part
516f926f87caa2f1b5069d96c46756a7bcbdb81a05b1886c3a32fd7b679179a3 guix-build-fa87a2072b91/output/x86_64-linux-gnu/bitcoin-fa87a2072b91-x86_64-linux-gnu-debug.tar.gz
f2dd02a2511dcb5747a101c3aeecd58142d3f109c1ac9e89da90ef0703496055 guix-build-fa87a2072b91/output/x86_64-linux-gnu/bitcoin-fa87a2072b91-x86_64-linux-gnu.tar.gz
150cc09da44026c02a3b52b6fb92d7a5f684653c924d6166003787d609afbea4 guix-build-fa87a2072b91/output/x86_64-w64-mingw32/SHA256SUMS.part
9b369e281123a99568f52f2e82c995a84bbddf3632514c6141c0ee583ff91926 guix-build-fa87a2072b91/output/x86_64-w64-mingw32/bitcoin-fa87a2072b91-win64-debug.zip
03fb87437fae6146c561512ea9c15c938bed2aa90445c7823c1813bd36683203 guix-build-fa87a2072b91/output/x86_64-w64-mingw32/bitcoin-fa87a2072b91-win64-setup-unsigned.exe
fe24419fd384b3c9d5729041e9ea685d9d7c672db92587016a8b44631ed5254c guix-build-fa87a2072b91/output/x86_64-w64-mingw32/bitcoin-fa87a2072b91-win64-unsigned.tar.gz
e651b8f174253cb8dc49aefff3f3d5c3d99a63c0b8f38b9874e2e0b5a8e58810 guix-build-fa87a2072b91/output/x86_64-w64-mingw32/bitcoin-fa87a2072b91-win64.zip
Looks like this fails with: macOS cross compile
|
Other than that:
|
Given that the problem here is compiling cctools on RISC-V, I think this will ultimately be solved by switching to LLVM/LLD (#21778). |
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.
Post-merge ACK, reproduced @fanquake's hashes and ran into the same macOS build issue.
, 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
, bitcoin#28580, 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)" This reverts commit be97bfe, reversing changes made to f155ecf.
Closes #29020