Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jun 5, 2024

Includes:
LLVM 18.1.x (#30201)
GCC 13.x (#29881)

git-minimal 2.41.0 -> 2.45.1
Kernel Headers 6.1.80 -> 6.1.92
moreutils 0.68 -> 0.69

Commits like https://git.savannah.gnu.org/cgit/guix.git/commit/?id=7b0f145802f0c2c785014293d748721678fef824, which should improve the bootstrap situation (#30042). This can somewhat be visualised by comparing the (simplified) dependencies of guix itself, between the two time-machines.

Master:
master_2

PR:
pr

Note that in the case of this PR, we are better off, no-longer having to build a number of tex packages, ruby, cairo, graphics libs, openssl 1.x etc.

Includes:
LLVM 18.1.x (bitcoin#30201)
GCC 13.x (bitcoin#29881)

git-minimal 2.41.0 -> 2.45.1
Kernel Headers 6.1.80 -> 6.1.92
moreutils 0.68 -> 0.69

Commits like
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=7b0f145802f0c2c785014293d748721678fef824,
which should improve the bootstrap situation (bitcoin#30042).
@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 5, 2024

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

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:

  • #30201 (depends: remove FORCE_USE_SYSTEM_CLANG by fanquake)
  • #29881 (guix: use GCC 13 to builds releases by fanquake)
  • #25573 ([POC] guix: produce a fully -static-pie bitcoind 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.

@fanquake
Copy link
Member Author

fanquake commented Jun 5, 2024

Guix Build (aarch64, x86_64):

766de337912412943b38f6f0dd100bafaa858bf2ad43bbc56de9de86b59f99c9  guix-build-2599655c1fb8/output/aarch64-linux-gnu/SHA256SUMS.part
a426d7189067919d418e164b5770c580bc6e94c3aa5320b2980c65762055ec92  guix-build-2599655c1fb8/output/aarch64-linux-gnu/bitcoin-2599655c1fb8-aarch64-linux-gnu-debug.tar.gz
c70f267474be9121d70e217c966c6c359ff12efb369a98e787dabc63221e2a47  guix-build-2599655c1fb8/output/aarch64-linux-gnu/bitcoin-2599655c1fb8-aarch64-linux-gnu.tar.gz
75038af2f30e6eeb70ff3a9e9bcd0d2e99afcd968fd1c8b172c7487cbfb237f2  guix-build-2599655c1fb8/output/arm-linux-gnueabihf/SHA256SUMS.part
b44d1ad21c9e72c5f52dc8c1a02649a7a7ff2544dda48903ed9df23adb8c9e6b  guix-build-2599655c1fb8/output/arm-linux-gnueabihf/bitcoin-2599655c1fb8-arm-linux-gnueabihf-debug.tar.gz
3a8df99e4b107fe20ef75521be28ce581b89bc3305d02bd0cd9b84a28f11a3cf  guix-build-2599655c1fb8/output/arm-linux-gnueabihf/bitcoin-2599655c1fb8-arm-linux-gnueabihf.tar.gz
f48967d2eb141e246fb1825b6ad282a69ac17d7d312ad0e43bdadf59975b505c  guix-build-2599655c1fb8/output/arm64-apple-darwin/SHA256SUMS.part
560c09383535f8bc6f828f5d800ef05bbcb9d1bd3781b6e36851909b361fc586  guix-build-2599655c1fb8/output/arm64-apple-darwin/bitcoin-2599655c1fb8-arm64-apple-darwin-unsigned.tar.gz
af1141315a93ebec43407984dfb695b75e2cdf1054706b891bd52be9714d8503  guix-build-2599655c1fb8/output/arm64-apple-darwin/bitcoin-2599655c1fb8-arm64-apple-darwin-unsigned.zip
5f23a1aa411ecd8b2cd9acc2355d0de3073e1fde46c6089bcf53741ba391bebe  guix-build-2599655c1fb8/output/arm64-apple-darwin/bitcoin-2599655c1fb8-arm64-apple-darwin.tar.gz
2ca43c54a580016aa7fdc8f9b541bd8e04573125e6e233d96600c2124d1412dd  guix-build-2599655c1fb8/output/dist-archive/bitcoin-2599655c1fb8.tar.gz
dce31a5cbe5ca010dbc60c9526310e50dfa0bf9c5ed71fb8e0bcaff3a5c003bf  guix-build-2599655c1fb8/output/powerpc64-linux-gnu/SHA256SUMS.part
1b938e7f03c02e376a805cbeb4e7db9917d92cf7905c7473d694ac2fa9098300  guix-build-2599655c1fb8/output/powerpc64-linux-gnu/bitcoin-2599655c1fb8-powerpc64-linux-gnu-debug.tar.gz
3abd65251c50a95ea630dcc42e434555a6c62e5f7743d9ad6ca7fd236b8315d4  guix-build-2599655c1fb8/output/powerpc64-linux-gnu/bitcoin-2599655c1fb8-powerpc64-linux-gnu.tar.gz
d75358b1117a763e664a035a21208e0ab68a80343688b7841ef1f740bdf3852f  guix-build-2599655c1fb8/output/riscv64-linux-gnu/SHA256SUMS.part
e90b041341ee94488eff5a75a91bea2567872b4f803b31d52b98387952deb00d  guix-build-2599655c1fb8/output/riscv64-linux-gnu/bitcoin-2599655c1fb8-riscv64-linux-gnu-debug.tar.gz
8462f829746b2b286cbce471654189cf42a951412b9b57599e4cc312fbf4a9d5  guix-build-2599655c1fb8/output/riscv64-linux-gnu/bitcoin-2599655c1fb8-riscv64-linux-gnu.tar.gz
cf5744bffac31b87015e3ed2d9143e869752c5c94b57ba8c416566c0c3286225  guix-build-2599655c1fb8/output/x86_64-apple-darwin/SHA256SUMS.part
2f7f6cbd36b0cc5182b0b71ff39862ab05176f620c65621513acc23551368300  guix-build-2599655c1fb8/output/x86_64-apple-darwin/bitcoin-2599655c1fb8-x86_64-apple-darwin-unsigned.tar.gz
e7fb934fd0fa0fe5c3a5c4079053aaec6916cf760c29f95c35a24ae1feceeb7c  guix-build-2599655c1fb8/output/x86_64-apple-darwin/bitcoin-2599655c1fb8-x86_64-apple-darwin-unsigned.zip
322ff907eaf0088dcd95e5cc5eb40a3c7ef044b68c92b686f011ec7097a8f9db  guix-build-2599655c1fb8/output/x86_64-apple-darwin/bitcoin-2599655c1fb8-x86_64-apple-darwin.tar.gz
31cab0f3b900afd0796c02c083aa2bc3a3bef2ac30ec90b54610dc91c431b0c9  guix-build-2599655c1fb8/output/x86_64-linux-gnu/SHA256SUMS.part
0ef7d81b9384b0b72ed8206ae6354083799b615b55c416a454a43768f2b45580  guix-build-2599655c1fb8/output/x86_64-linux-gnu/bitcoin-2599655c1fb8-x86_64-linux-gnu-debug.tar.gz
5d76f99da2804176705f1d5ae58f4158d6f740755b5b90a2784a7c18c7f604fd  guix-build-2599655c1fb8/output/x86_64-linux-gnu/bitcoin-2599655c1fb8-x86_64-linux-gnu.tar.gz
08b7ca7179fdc395a82779a7b55c94132006c38dc0b60d501e08124d4f38c345  guix-build-2599655c1fb8/output/x86_64-w64-mingw32/SHA256SUMS.part
5ebbfa59f9c949d8fbb7cff00d7ba75d7e5913dc7dd1e10f7ffa31ad21cbdcc1  guix-build-2599655c1fb8/output/x86_64-w64-mingw32/bitcoin-2599655c1fb8-win64-debug.zip
378f3d94f2d8a554830c0b7128e521eab6166a47f1bd53f645a7e88823b7f21c  guix-build-2599655c1fb8/output/x86_64-w64-mingw32/bitcoin-2599655c1fb8-win64-setup-unsigned.exe
e3248b20072baf799614514525fae446372c60e4331719f875ed346d53540d07  guix-build-2599655c1fb8/output/x86_64-w64-mingw32/bitcoin-2599655c1fb8-win64-unsigned.tar.gz
257a4113de71d9386e195aa3ae6a3ceb3b8db40fb036184958cfae18f7a7b60d  guix-build-2599655c1fb8/output/x86_64-w64-mingw32/bitcoin-2599655c1fb8-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 2599655

Guix builds (aarch64):

766de337912412943b38f6f0dd100bafaa858bf2ad43bbc56de9de86b59f99c9  guix-build-2599655c1fb8/output/aarch64-linux-gnu/SHA256SUMS.part
a426d7189067919d418e164b5770c580bc6e94c3aa5320b2980c65762055ec92  guix-build-2599655c1fb8/output/aarch64-linux-gnu/bitcoin-2599655c1fb8-aarch64-linux-gnu-debug.tar.gz
c70f267474be9121d70e217c966c6c359ff12efb369a98e787dabc63221e2a47  guix-build-2599655c1fb8/output/aarch64-linux-gnu/bitcoin-2599655c1fb8-aarch64-linux-gnu.tar.gz
75038af2f30e6eeb70ff3a9e9bcd0d2e99afcd968fd1c8b172c7487cbfb237f2  guix-build-2599655c1fb8/output/arm-linux-gnueabihf/SHA256SUMS.part
b44d1ad21c9e72c5f52dc8c1a02649a7a7ff2544dda48903ed9df23adb8c9e6b  guix-build-2599655c1fb8/output/arm-linux-gnueabihf/bitcoin-2599655c1fb8-arm-linux-gnueabihf-debug.tar.gz
3a8df99e4b107fe20ef75521be28ce581b89bc3305d02bd0cd9b84a28f11a3cf  guix-build-2599655c1fb8/output/arm-linux-gnueabihf/bitcoin-2599655c1fb8-arm-linux-gnueabihf.tar.gz
f48967d2eb141e246fb1825b6ad282a69ac17d7d312ad0e43bdadf59975b505c  guix-build-2599655c1fb8/output/arm64-apple-darwin/SHA256SUMS.part
560c09383535f8bc6f828f5d800ef05bbcb9d1bd3781b6e36851909b361fc586  guix-build-2599655c1fb8/output/arm64-apple-darwin/bitcoin-2599655c1fb8-arm64-apple-darwin-unsigned.tar.gz
af1141315a93ebec43407984dfb695b75e2cdf1054706b891bd52be9714d8503  guix-build-2599655c1fb8/output/arm64-apple-darwin/bitcoin-2599655c1fb8-arm64-apple-darwin-unsigned.zip
5f23a1aa411ecd8b2cd9acc2355d0de3073e1fde46c6089bcf53741ba391bebe  guix-build-2599655c1fb8/output/arm64-apple-darwin/bitcoin-2599655c1fb8-arm64-apple-darwin.tar.gz
2ca43c54a580016aa7fdc8f9b541bd8e04573125e6e233d96600c2124d1412dd  guix-build-2599655c1fb8/output/dist-archive/bitcoin-2599655c1fb8.tar.gz
dce31a5cbe5ca010dbc60c9526310e50dfa0bf9c5ed71fb8e0bcaff3a5c003bf  guix-build-2599655c1fb8/output/powerpc64-linux-gnu/SHA256SUMS.part
1b938e7f03c02e376a805cbeb4e7db9917d92cf7905c7473d694ac2fa9098300  guix-build-2599655c1fb8/output/powerpc64-linux-gnu/bitcoin-2599655c1fb8-powerpc64-linux-gnu-debug.tar.gz
3abd65251c50a95ea630dcc42e434555a6c62e5f7743d9ad6ca7fd236b8315d4  guix-build-2599655c1fb8/output/powerpc64-linux-gnu/bitcoin-2599655c1fb8-powerpc64-linux-gnu.tar.gz
d75358b1117a763e664a035a21208e0ab68a80343688b7841ef1f740bdf3852f  guix-build-2599655c1fb8/output/riscv64-linux-gnu/SHA256SUMS.part
e90b041341ee94488eff5a75a91bea2567872b4f803b31d52b98387952deb00d  guix-build-2599655c1fb8/output/riscv64-linux-gnu/bitcoin-2599655c1fb8-riscv64-linux-gnu-debug.tar.gz
8462f829746b2b286cbce471654189cf42a951412b9b57599e4cc312fbf4a9d5  guix-build-2599655c1fb8/output/riscv64-linux-gnu/bitcoin-2599655c1fb8-riscv64-linux-gnu.tar.gz
cf5744bffac31b87015e3ed2d9143e869752c5c94b57ba8c416566c0c3286225  guix-build-2599655c1fb8/output/x86_64-apple-darwin/SHA256SUMS.part
2f7f6cbd36b0cc5182b0b71ff39862ab05176f620c65621513acc23551368300  guix-build-2599655c1fb8/output/x86_64-apple-darwin/bitcoin-2599655c1fb8-x86_64-apple-darwin-unsigned.tar.gz
e7fb934fd0fa0fe5c3a5c4079053aaec6916cf760c29f95c35a24ae1feceeb7c  guix-build-2599655c1fb8/output/x86_64-apple-darwin/bitcoin-2599655c1fb8-x86_64-apple-darwin-unsigned.zip
322ff907eaf0088dcd95e5cc5eb40a3c7ef044b68c92b686f011ec7097a8f9db  guix-build-2599655c1fb8/output/x86_64-apple-darwin/bitcoin-2599655c1fb8-x86_64-apple-darwin.tar.gz
31cab0f3b900afd0796c02c083aa2bc3a3bef2ac30ec90b54610dc91c431b0c9  guix-build-2599655c1fb8/output/x86_64-linux-gnu/SHA256SUMS.part
0ef7d81b9384b0b72ed8206ae6354083799b615b55c416a454a43768f2b45580  guix-build-2599655c1fb8/output/x86_64-linux-gnu/bitcoin-2599655c1fb8-x86_64-linux-gnu-debug.tar.gz
5d76f99da2804176705f1d5ae58f4158d6f740755b5b90a2784a7c18c7f604fd  guix-build-2599655c1fb8/output/x86_64-linux-gnu/bitcoin-2599655c1fb8-x86_64-linux-gnu.tar.gz
08b7ca7179fdc395a82779a7b55c94132006c38dc0b60d501e08124d4f38c345  guix-build-2599655c1fb8/output/x86_64-w64-mingw32/SHA256SUMS.part
5ebbfa59f9c949d8fbb7cff00d7ba75d7e5913dc7dd1e10f7ffa31ad21cbdcc1  guix-build-2599655c1fb8/output/x86_64-w64-mingw32/bitcoin-2599655c1fb8-win64-debug.zip
378f3d94f2d8a554830c0b7128e521eab6166a47f1bd53f645a7e88823b7f21c  guix-build-2599655c1fb8/output/x86_64-w64-mingw32/bitcoin-2599655c1fb8-win64-setup-unsigned.exe
e3248b20072baf799614514525fae446372c60e4331719f875ed346d53540d07  guix-build-2599655c1fb8/output/x86_64-w64-mingw32/bitcoin-2599655c1fb8-win64-unsigned.tar.gz
257a4113de71d9386e195aa3ae6a3ceb3b8db40fb036184958cfae18f7a7b60d  guix-build-2599655c1fb8/output/x86_64-w64-mingw32/bitcoin-2599655c1fb8-win64.zip

@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 6, 2024

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File commit ff7d205
(master)
commit fac350a
(master and this pull)
SHA256SUMS.part c5db4f6f761a228c... a1228c84d3fc3a73...
*-aarch64-linux-gnu-debug.tar.gz da883389cb4ef644... 901baf8278466ed0...
*-aarch64-linux-gnu.tar.gz 8984b0c7de291a64... 506e26cce217b862...
*-arm-linux-gnueabihf-debug.tar.gz ded38bced93c1f0c... ee311c001cfad9aa...
*-arm-linux-gnueabihf.tar.gz 2e3537d9662f0d34... 2e3aba0a82ccec80...
*-arm64-apple-darwin-unsigned.tar.gz 6804e1adf1173d89... 60f44d020b2edd43...
*-arm64-apple-darwin-unsigned.zip 3f1139a7321720c5... 4d13720c11a72bb7...
*-arm64-apple-darwin.tar.gz 152abb181a54e524... 79effd335161ee90...
*-powerpc64-linux-gnu-debug.tar.gz 3d4feac1e15288c4... e854d600432ee405...
*-powerpc64-linux-gnu.tar.gz 46d24d72f1775cd1... 95a46d1e9b6066d2...
*-riscv64-linux-gnu-debug.tar.gz a2e536dd3cb8487f... 7b378dc795f663f2...
*-riscv64-linux-gnu.tar.gz f8229c9a331a6e7b... afe9f6d3a0048aa5...
*-x86_64-apple-darwin-unsigned.tar.gz a1f622e82fcf5fd7... 6a209cec61752b89...
*-x86_64-apple-darwin-unsigned.zip 6f80483cf2c011fe... ff3a34b4755eaf13...
*-x86_64-apple-darwin.tar.gz da28688e1079ca55... c60553d7b89612fc...
*-x86_64-linux-gnu-debug.tar.gz 852cebf3faa6bc63... 9c0d4a7b3957f8c8...
*-x86_64-linux-gnu.tar.gz ad07918219e6037f... 644d02df02590e3e...
*.tar.gz 026430a53ae3452b... 4e1aa4d4388ab9c9...
guix_build.log 7433f23f70a66e19... 207e34334ee16238...
guix_build.log.diff 6fa5c709d8e24531...

@fanquake fanquake merged commit 2ad6e8e into bitcoin:master Jun 8, 2024
@fanquake fanquake deleted the bump_time_machine branch June 8, 2024 08:31
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 added a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Dec 2, 2024
Summary:
```
Remove FORCE_USE_SYSTEM_CLANG in favour of always using the system Clang and lld for macOS cross-compilation; rather than downloading precompiled blobs.
```

Backport of [[bitcoin/bitcoin#30201 | core#30201]] and [[bitcoin/bitcoin#30231 | core#30231]].

Depends on D17265.

Note the CI update will be done in another diff. It only affects the cross osx build on CI which is currently paused.

Test Plan: Run the guix osx build.

Reviewers: #bitcoin_abc, PiRK

Reviewed By: #bitcoin_abc, PiRK

Differential Revision: https://reviews.bitcoinabc.org/D17266
roqqit pushed a commit to doged-io/doged that referenced this pull request Dec 19, 2024
Summary:
```
Remove FORCE_USE_SYSTEM_CLANG in favour of always using the system Clang and lld for macOS cross-compilation; rather than downloading precompiled blobs.
```

Backport of [[bitcoin/bitcoin#30201 | core#30201]] and [[bitcoin/bitcoin#30231 | core#30231]].

Depends on D17265.

Note the CI update will be done in another diff. It only affects the cross osx build on CI which is currently paused.

Test Plan: Run the guix osx build.

Reviewers: #bitcoin_abc, PiRK

Reviewed By: #bitcoin_abc, PiRK

Differential Revision: https://reviews.bitcoinabc.org/D17266
knst added a commit to knst/dash that referenced this pull request Dec 26, 2024
@bitcoin bitcoin locked and limited conversation to collaborators Jun 8, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants