-
Notifications
You must be signed in to change notification settings - Fork 37.7k
guix: bump time-machine to dc4842797bfdc5f9f3f5f725bf189c2b68bd6b5a #29651
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
This includes a commit to fix building LLVM 17 on riscv64, see https://git.savannah.gnu.org/cgit/guix.git/commit/?id=4e26331a5ee87928a16888c36d51e270f0f10f90. Followup to discussion in bitcoin#28880 (comment). If you don't have riscv64 hardware, this can be tested with the following: ```bash guix time-machine --commit=d5ca4d4fd713a9f7e17e074a1e37dda99bbb09fc -- build --target=riscv64-linux-gnu llvm .... riscv64-linux-gnu-ld: CMakeFiles/dsymutil.dir/dsymutil.cpp.o: undefined reference to symbol '__atomic_fetch_and_1@@LIBATOMIC_1.0' riscv64-linux-gnu-ld: /gnu/store/i4ga0pnr1b74bir2bjyp8mcrrbsvk7d3-gcc-cross-riscv64-linux-gnu-11.3.0-lib/riscv64-linux-gnu/lib/libatomic.so.1: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status guix time-machine --commit=dc4842797bfdc5f9f3f5f725bf189c2b68bd6b5a -- build --target=riscv64-linux-gnu llvm .... grafting '/gnu/store/7y0j0y8jaz4mjx2nz0y42wdnxxjp6id6-llvm-17.0.6-opt-viewer' -> '/gnu/store/8xvahrrjscbprh6cjj0qp5bm9mm78wwa-llvm-17.0.6-opt-viewer'... grafting '/gnu/store/bjhw648bz7ijd2p9hgzzdbw1q8hpagk8-llvm-17.0.6' -> '/gnu/store/x50qi8i2ywgpx6azv4k55ms0w5xjxxg5-llvm-17.0.6'... successfully built /gnu/store/q9xvk8gzzvb4dxfzf6yi5164zd0d1vj2-llvm-17.0.6.drv ```
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. |
Guix Build (aarch64 & x86_64): 2cf27183bc9964708fe12465fa3bb216de6e109ecc9f7ead5d6eff29a178eca8 guix-build-cf5faf73c991/output/aarch64-linux-gnu/SHA256SUMS.part
ad97244ca2ebe9fe715bcfb9838d30436cb1e797d32cb6435615df5d35f564d9 guix-build-cf5faf73c991/output/aarch64-linux-gnu/bitcoin-cf5faf73c991-aarch64-linux-gnu-debug.tar.gz
ab34959b100669ebeca4c174660b26ca8eb6c93d332824593f9447669cb77f90 guix-build-cf5faf73c991/output/aarch64-linux-gnu/bitcoin-cf5faf73c991-aarch64-linux-gnu.tar.gz
b68c300140f426e4a875611f514088ef7a76b725b0754a1b025056769dde1c3a guix-build-cf5faf73c991/output/arm-linux-gnueabihf/SHA256SUMS.part
ce3e9cb264dbf382aa77cae84124ca4b4eecec65d46340ccbb58dbf3a285dafe guix-build-cf5faf73c991/output/arm-linux-gnueabihf/bitcoin-cf5faf73c991-arm-linux-gnueabihf-debug.tar.gz
2eef70db309720fa1a0a15ef85d9ed5806d27ca9609df74f637e3cc2c8a2118d guix-build-cf5faf73c991/output/arm-linux-gnueabihf/bitcoin-cf5faf73c991-arm-linux-gnueabihf.tar.gz
7cbccd1b62d02fec22e659c5fffde9dbb197fdf92586889005eaac2e9e2d525b guix-build-cf5faf73c991/output/arm64-apple-darwin/SHA256SUMS.part
2968c64024f465fbd95cb3b9d078f908c495c0f15d9960ff16bad2d5f8beab8c guix-build-cf5faf73c991/output/arm64-apple-darwin/bitcoin-cf5faf73c991-arm64-apple-darwin-unsigned.tar.gz
012a4032c306647cea28533571633e7910e1bdeb03befa4d59c923f97692d073 guix-build-cf5faf73c991/output/arm64-apple-darwin/bitcoin-cf5faf73c991-arm64-apple-darwin-unsigned.zip
73dcb060eeaef93d33f3048228f376212983cc16f5e2f75f3567fd17a0e75161 guix-build-cf5faf73c991/output/arm64-apple-darwin/bitcoin-cf5faf73c991-arm64-apple-darwin.tar.gz
a4922bfd6fa511426181a961c6f1ca6f1256947ad31402966851fcefdeb5b043 guix-build-cf5faf73c991/output/dist-archive/bitcoin-cf5faf73c991.tar.gz
6fd1703627802d3fa128f73397f2df7f76f4967a1c544a5d110ae4a467b08635 guix-build-cf5faf73c991/output/powerpc64-linux-gnu/SHA256SUMS.part
7e0589ed81dd7e01232084c33367a062aae3702e58e364dc33330794e5b4d01a guix-build-cf5faf73c991/output/powerpc64-linux-gnu/bitcoin-cf5faf73c991-powerpc64-linux-gnu-debug.tar.gz
750f26ff5c397011bd1aec783f729dc6910ba3c25f3ba2057d244cd30bb65335 guix-build-cf5faf73c991/output/powerpc64-linux-gnu/bitcoin-cf5faf73c991-powerpc64-linux-gnu.tar.gz
f3f0ffe445557e14cc5c1d13e720654ec32bc0e01d3bbfb152873ab1b3eb5cfa guix-build-cf5faf73c991/output/riscv64-linux-gnu/SHA256SUMS.part
6f2f56c959fc654e408e24b5ef67449d9ec1486597d6eec042fac59bfbddf593 guix-build-cf5faf73c991/output/riscv64-linux-gnu/bitcoin-cf5faf73c991-riscv64-linux-gnu-debug.tar.gz
4573a134140a724c7061b8cb87aa966a9e24885ef3e5165d2697f3531fd4c1d9 guix-build-cf5faf73c991/output/riscv64-linux-gnu/bitcoin-cf5faf73c991-riscv64-linux-gnu.tar.gz
58b65f8a3c0516f3ab3d9b73cfa1730251e0984d5e7b0d8e0fe68b3f5a708743 guix-build-cf5faf73c991/output/x86_64-apple-darwin/SHA256SUMS.part
767c2b00fe9bce82fe5154e857a2cdad716aeaa47ac9d5d7cb45a054d6311e75 guix-build-cf5faf73c991/output/x86_64-apple-darwin/bitcoin-cf5faf73c991-x86_64-apple-darwin-unsigned.tar.gz
dc29b848dc9c131e73d81a3c71efcf6e31d633198eff66278d7773817ab38639 guix-build-cf5faf73c991/output/x86_64-apple-darwin/bitcoin-cf5faf73c991-x86_64-apple-darwin-unsigned.zip
3adee092b04fb5ab9367af575d84facbf905cb7ff74630eeaedc0082903b4e56 guix-build-cf5faf73c991/output/x86_64-apple-darwin/bitcoin-cf5faf73c991-x86_64-apple-darwin.tar.gz
b9c2bef0c40bc2344ede104d44ee27a7ac7951c47fe3be266c422f14ed95d140 guix-build-cf5faf73c991/output/x86_64-linux-gnu/SHA256SUMS.part
bbfade9a6d46dc106d41acc6df9daffb428033f69637c9814b785b93c1de56f1 guix-build-cf5faf73c991/output/x86_64-linux-gnu/bitcoin-cf5faf73c991-x86_64-linux-gnu-debug.tar.gz
b073c92902c5b5a0427d314808645036c4846b24166c7fb1f8a81438c366ec0e guix-build-cf5faf73c991/output/x86_64-linux-gnu/bitcoin-cf5faf73c991-x86_64-linux-gnu.tar.gz
41e75f4ad3f72c8805210832f16d4f41b2f0bbb15513c24870e892c4e90063a1 guix-build-cf5faf73c991/output/x86_64-w64-mingw32/SHA256SUMS.part
3ffb42d5ee9c960339e4b5a45681b046580296037933b1e49375635b25ee19c4 guix-build-cf5faf73c991/output/x86_64-w64-mingw32/bitcoin-cf5faf73c991-win64-debug.zip
3b663105554636eff55f494f708d49243c15f58985fdc2092dcccf35e685c656 guix-build-cf5faf73c991/output/x86_64-w64-mingw32/bitcoin-cf5faf73c991-win64-setup-unsigned.exe
89d520a6684c50ce32e7334bdb2f7ab33aba76658827548f5a157bb8ed95c31f guix-build-cf5faf73c991/output/x86_64-w64-mingw32/bitcoin-cf5faf73c991-win64-unsigned.tar.gz
ec1f85d9497a4c8d40cd79a31ab56fb5546ea0d1d510c8bdbabbf033937dda35 guix-build-cf5faf73c991/output/x86_64-w64-mingw32/bitcoin-cf5faf73c991-win64.zip |
Concept ACK. |
My Guix build:
UPD: My |
|
rv64 error
|
I guess #21778 will be needed as well? |
|
Yea, we'll still need that for complete macOS riscv64 builds. |
lgtm |
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 cf5faf7
Guix build (aarch64 & x86_64):
2cf27183bc9964708fe12465fa3bb216de6e109ecc9f7ead5d6eff29a178eca8 guix-build-cf5faf73c991/output/aarch64-linux-gnu/SHA256SUMS.part
ad97244ca2ebe9fe715bcfb9838d30436cb1e797d32cb6435615df5d35f564d9 guix-build-cf5faf73c991/output/aarch64-linux-gnu/bitcoin-cf5faf73c991-aarch64-linux-gnu-debug.tar.gz
ab34959b100669ebeca4c174660b26ca8eb6c93d332824593f9447669cb77f90 guix-build-cf5faf73c991/output/aarch64-linux-gnu/bitcoin-cf5faf73c991-aarch64-linux-gnu.tar.gz
b68c300140f426e4a875611f514088ef7a76b725b0754a1b025056769dde1c3a guix-build-cf5faf73c991/output/arm-linux-gnueabihf/SHA256SUMS.part
ce3e9cb264dbf382aa77cae84124ca4b4eecec65d46340ccbb58dbf3a285dafe guix-build-cf5faf73c991/output/arm-linux-gnueabihf/bitcoin-cf5faf73c991-arm-linux-gnueabihf-debug.tar.gz
2eef70db309720fa1a0a15ef85d9ed5806d27ca9609df74f637e3cc2c8a2118d guix-build-cf5faf73c991/output/arm-linux-gnueabihf/bitcoin-cf5faf73c991-arm-linux-gnueabihf.tar.gz
7cbccd1b62d02fec22e659c5fffde9dbb197fdf92586889005eaac2e9e2d525b guix-build-cf5faf73c991/output/arm64-apple-darwin/SHA256SUMS.part
2968c64024f465fbd95cb3b9d078f908c495c0f15d9960ff16bad2d5f8beab8c guix-build-cf5faf73c991/output/arm64-apple-darwin/bitcoin-cf5faf73c991-arm64-apple-darwin-unsigned.tar.gz
012a4032c306647cea28533571633e7910e1bdeb03befa4d59c923f97692d073 guix-build-cf5faf73c991/output/arm64-apple-darwin/bitcoin-cf5faf73c991-arm64-apple-darwin-unsigned.zip
73dcb060eeaef93d33f3048228f376212983cc16f5e2f75f3567fd17a0e75161 guix-build-cf5faf73c991/output/arm64-apple-darwin/bitcoin-cf5faf73c991-arm64-apple-darwin.tar.gz
a4922bfd6fa511426181a961c6f1ca6f1256947ad31402966851fcefdeb5b043 guix-build-cf5faf73c991/output/dist-archive/bitcoin-cf5faf73c991.tar.gz
6fd1703627802d3fa128f73397f2df7f76f4967a1c544a5d110ae4a467b08635 guix-build-cf5faf73c991/output/powerpc64-linux-gnu/SHA256SUMS.part
7e0589ed81dd7e01232084c33367a062aae3702e58e364dc33330794e5b4d01a guix-build-cf5faf73c991/output/powerpc64-linux-gnu/bitcoin-cf5faf73c991-powerpc64-linux-gnu-debug.tar.gz
750f26ff5c397011bd1aec783f729dc6910ba3c25f3ba2057d244cd30bb65335 guix-build-cf5faf73c991/output/powerpc64-linux-gnu/bitcoin-cf5faf73c991-powerpc64-linux-gnu.tar.gz
f3f0ffe445557e14cc5c1d13e720654ec32bc0e01d3bbfb152873ab1b3eb5cfa guix-build-cf5faf73c991/output/riscv64-linux-gnu/SHA256SUMS.part
6f2f56c959fc654e408e24b5ef67449d9ec1486597d6eec042fac59bfbddf593 guix-build-cf5faf73c991/output/riscv64-linux-gnu/bitcoin-cf5faf73c991-riscv64-linux-gnu-debug.tar.gz
4573a134140a724c7061b8cb87aa966a9e24885ef3e5165d2697f3531fd4c1d9 guix-build-cf5faf73c991/output/riscv64-linux-gnu/bitcoin-cf5faf73c991-riscv64-linux-gnu.tar.gz
58b65f8a3c0516f3ab3d9b73cfa1730251e0984d5e7b0d8e0fe68b3f5a708743 guix-build-cf5faf73c991/output/x86_64-apple-darwin/SHA256SUMS.part
767c2b00fe9bce82fe5154e857a2cdad716aeaa47ac9d5d7cb45a054d6311e75 guix-build-cf5faf73c991/output/x86_64-apple-darwin/bitcoin-cf5faf73c991-x86_64-apple-darwin-unsigned.tar.gz
dc29b848dc9c131e73d81a3c71efcf6e31d633198eff66278d7773817ab38639 guix-build-cf5faf73c991/output/x86_64-apple-darwin/bitcoin-cf5faf73c991-x86_64-apple-darwin-unsigned.zip
3adee092b04fb5ab9367af575d84facbf905cb7ff74630eeaedc0082903b4e56 guix-build-cf5faf73c991/output/x86_64-apple-darwin/bitcoin-cf5faf73c991-x86_64-apple-darwin.tar.gz
b9c2bef0c40bc2344ede104d44ee27a7ac7951c47fe3be266c422f14ed95d140 guix-build-cf5faf73c991/output/x86_64-linux-gnu/SHA256SUMS.part
bbfade9a6d46dc106d41acc6df9daffb428033f69637c9814b785b93c1de56f1 guix-build-cf5faf73c991/output/x86_64-linux-gnu/bitcoin-cf5faf73c991-x86_64-linux-gnu-debug.tar.gz
b073c92902c5b5a0427d314808645036c4846b24166c7fb1f8a81438c366ec0e guix-build-cf5faf73c991/output/x86_64-linux-gnu/bitcoin-cf5faf73c991-x86_64-linux-gnu.tar.gz
41e75f4ad3f72c8805210832f16d4f41b2f0bbb15513c24870e892c4e90063a1 guix-build-cf5faf73c991/output/x86_64-w64-mingw32/SHA256SUMS.part
3ffb42d5ee9c960339e4b5a45681b046580296037933b1e49375635b25ee19c4 guix-build-cf5faf73c991/output/x86_64-w64-mingw32/bitcoin-cf5faf73c991-win64-debug.zip
3b663105554636eff55f494f708d49243c15f58985fdc2092dcccf35e685c656 guix-build-cf5faf73c991/output/x86_64-w64-mingw32/bitcoin-cf5faf73c991-win64-setup-unsigned.exe
89d520a6684c50ce32e7334bdb2f7ab33aba76658827548f5a157bb8ed95c31f guix-build-cf5faf73c991/output/x86_64-w64-mingw32/bitcoin-cf5faf73c991-win64-unsigned.tar.gz
ec1f85d9497a4c8d40cd79a31ab56fb5546ea0d1d510c8bdbabbf033937dda35 guix-build-cf5faf73c991/output/x86_64-w64-mingw32/bitcoin-cf5faf73c991-win64.zip
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 cf5faf7, tested on x86_64 hardware as described in the PR description.
|
, 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.
This includes a commit to fix building LLVM 17 on riscv64, see https://git.savannah.gnu.org/cgit/guix.git/commit/?id=4e26331a5ee87928a16888c36d51e270f0f10f90.
Followup to discussion in #28880 (comment).
If you don't have riscv64 hardware, this can be tested with the following:
Also includes at least:
Linux Headers 6.1.67 -> 6.1.80