depends: Avoid hardcoding `host_prefix` in toolchain file

hebasto commented at 6:25 pm on November 23, 2024: member

This PR allows the entire depends/<host_prefix> directory to be relocatable.

Only libevent package configuration files are non-relocatable for the version 2.1.12-stable we use now. However, this issue has been fixed upstream in https://github.com/libevent/libevent/commit/1f1593ff27bdf51c3e1c45b92cfb0ac931960298 and friends.

Fixes #31050.

depends, refactor: Avoid hardcoding `host_prefix` in toolchain file

This change allows the entire `depends/<host_prefix>` directory to be
relocatable.

d9c8aacce3

hebasto added the label Build system on Nov 23, 2024

DrahtBot commented at 6:25 pm on November 23, 2024: contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/31358.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	theuni, ryanofsky
Concept 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:

#30997 (build: Switch to Qt 6 by hebasto)

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.

TheCharlatan commented at 12:34 pm on November 24, 2024: contributor

Concept ACK

TheCharlatan commented at 9:32 pm on November 24, 2024: contributor

Guix build (aarch64):

 01166ebc7f2e39568ced2e7851d93e9521bc867a7b5e61b6416ef9623cc8b82c1  guix-build-d9c8aacce38a/output/aarch64-linux-gnu/SHA256SUMS.part
 1ec8f92b7a8f3046dcff7d66e20c4e2d719b96e9d9b36ecbcba20c701c39e96a2  guix-build-d9c8aacce38a/output/aarch64-linux-gnu/bitcoin-d9c8aacce38a-aarch64-linux-gnu-debug.tar.gz
 227ae1f55b45872b62e9946ff57d5a5cda7f0be4d79409cc7c8b8f0ff5bf6917c  guix-build-d9c8aacce38a/output/aarch64-linux-gnu/bitcoin-d9c8aacce38a-aarch64-linux-gnu.tar.gz
 3ce07cdb3f7db47f86b1ef3a3fcb3cf6f9f435ca14cb7df6f6016cf3be5425329  guix-build-d9c8aacce38a/output/arm-linux-gnueabihf/SHA256SUMS.part
 489f5dc38491157872ddb4bc193dbcda4ba38f7e1223c6350f7dabf6949b77ee4  guix-build-d9c8aacce38a/output/arm-linux-gnueabihf/bitcoin-d9c8aacce38a-arm-linux-gnueabihf-debug.tar.gz
 5d6878438abf77353a71e16d399b6e1bded3401301b47ebc614443b3ae05aca6c  guix-build-d9c8aacce38a/output/arm-linux-gnueabihf/bitcoin-d9c8aacce38a-arm-linux-gnueabihf.tar.gz
 603f0d1b2dc6b64282d5e89f5d6521b54b11fc3e32f337a211237c9a8856b6563  guix-build-d9c8aacce38a/output/arm64-apple-darwin/SHA256SUMS.part
 71c4d20ba0d70cf6ff6b59a702503ac622627f9a03011008dcd846fbc546351a0  guix-build-d9c8aacce38a/output/arm64-apple-darwin/bitcoin-d9c8aacce38a-arm64-apple-darwin-unsigned.tar.gz
 876f20bf97518fdd226d7760e7407530ab7787776a754535df2749921ad530167  guix-build-d9c8aacce38a/output/arm64-apple-darwin/bitcoin-d9c8aacce38a-arm64-apple-darwin-unsigned.zip
 9180ae795d056ddefb61396b2d6ffc77ea9c2e2f84f12c5430a0dd086efe32e9e  guix-build-d9c8aacce38a/output/arm64-apple-darwin/bitcoin-d9c8aacce38a-arm64-apple-darwin.tar.gz
10ccf37ed459b4377122f71f14789ac040504935809fec123dc9a98db0bebbf264  guix-build-d9c8aacce38a/output/dist-archive/bitcoin-d9c8aacce38a.tar.gz
11bc400f390bdf9fef230058476bfca0867784786648829d994ba2a0afeffc6d49  guix-build-d9c8aacce38a/output/powerpc64-linux-gnu/SHA256SUMS.part
123b6b3d1e617f4932f2d84a7d8e24102563e185e214a22e20479b6e8a5bd02a83  guix-build-d9c8aacce38a/output/powerpc64-linux-gnu/bitcoin-d9c8aacce38a-powerpc64-linux-gnu-debug.tar.gz
13417219945052a961b5ea2e8becb5a291fdb889f7efc5aaa508e305143640edf8  guix-build-d9c8aacce38a/output/powerpc64-linux-gnu/bitcoin-d9c8aacce38a-powerpc64-linux-gnu.tar.gz
148e74871208f519b97cf04befedba35f6e644c9a78dab7594b4ebaa8e3d6907a2  guix-build-d9c8aacce38a/output/riscv64-linux-gnu/SHA256SUMS.part
1554f899d32a0a102915560703f16b50e0a36f83fcae7a1a338e2647c26ed1fc30  guix-build-d9c8aacce38a/output/riscv64-linux-gnu/bitcoin-d9c8aacce38a-riscv64-linux-gnu-debug.tar.gz
16f102b4e938899c40ad7a3cf41ca7733b2bccf33029b22b4f5a997351f8850376  guix-build-d9c8aacce38a/output/riscv64-linux-gnu/bitcoin-d9c8aacce38a-riscv64-linux-gnu.tar.gz
177742e067606545f1f16052398eb8b465654fd81e100e3856c7c42ed18628d16b  guix-build-d9c8aacce38a/output/x86_64-apple-darwin/SHA256SUMS.part
183d4d6c6d290492c90e9d128c1f0d90612cb674dad462c6f6419281ec3e354b2f  guix-build-d9c8aacce38a/output/x86_64-apple-darwin/bitcoin-d9c8aacce38a-x86_64-apple-darwin-unsigned.tar.gz
1921d1ab5550d8984cb224c292408729205ab6bc4480cbf760ab3fe2bf07e0fe8b  guix-build-d9c8aacce38a/output/x86_64-apple-darwin/bitcoin-d9c8aacce38a-x86_64-apple-darwin-unsigned.zip
20c642a24b08709d63c2a617687fa500ac919554596edac7b9692113f57673597c  guix-build-d9c8aacce38a/output/x86_64-apple-darwin/bitcoin-d9c8aacce38a-x86_64-apple-darwin.tar.gz
212db58cd23b2392770b2fd605bdb068e842a666c50ae65aec15de1cf620a55284  guix-build-d9c8aacce38a/output/x86_64-linux-gnu/SHA256SUMS.part
2257552cde8c9ae23839474c7b0059bc61f2729978323c11d8c94de527a5d82be6  guix-build-d9c8aacce38a/output/x86_64-linux-gnu/bitcoin-d9c8aacce38a-x86_64-linux-gnu-debug.tar.gz
23951805fd537624bb0b6a4ceab722ee2e67826f7245968e96b4ac49b5d18c7474  guix-build-d9c8aacce38a/output/x86_64-linux-gnu/bitcoin-d9c8aacce38a-x86_64-linux-gnu.tar.gz
2442799e7b0583e8f239baf9d0cc5a0a89b29f51a9eb4d661c01f6fedbac47d992  guix-build-d9c8aacce38a/output/x86_64-w64-mingw32/SHA256SUMS.part
25cfaa5437ea032fac789c42bd5ee7fccc7b931090cabee54d75892d7a932fe41e  guix-build-d9c8aacce38a/output/x86_64-w64-mingw32/bitcoin-d9c8aacce38a-win64-debug.zip
26bd58f269c79583f44e0e17ce07bf34cd1468d4132dbec1d14ff277a0ac98a12d  guix-build-d9c8aacce38a/output/x86_64-w64-mingw32/bitcoin-d9c8aacce38a-win64-setup-unsigned.exe
272b14f26592582e9e68422f2fe5652b27fc8b7a122e3985a527095106c43704ce  guix-build-d9c8aacce38a/output/x86_64-w64-mingw32/bitcoin-d9c8aacce38a-win64-unsigned.tar.gz
28d9960fcb09326a5fe063e40084edef5883cb0a3d0b363a378de48a78a9e14c8f  guix-build-d9c8aacce38a/output/x86_64-w64-mingw32/bitcoin-d9c8aacce38a-win64.zip

hebasto commented at 8:10 am on November 25, 2024: member

My Guix build:

 0x86_64
 11166ebc7f2e39568ced2e7851d93e9521bc867a7b5e61b6416ef9623cc8b82c1  guix-build-d9c8aacce38a/output/aarch64-linux-gnu/SHA256SUMS.part
 2ec8f92b7a8f3046dcff7d66e20c4e2d719b96e9d9b36ecbcba20c701c39e96a2  guix-build-d9c8aacce38a/output/aarch64-linux-gnu/bitcoin-d9c8aacce38a-aarch64-linux-gnu-debug.tar.gz
 327ae1f55b45872b62e9946ff57d5a5cda7f0be4d79409cc7c8b8f0ff5bf6917c  guix-build-d9c8aacce38a/output/aarch64-linux-gnu/bitcoin-d9c8aacce38a-aarch64-linux-gnu.tar.gz
 4ce07cdb3f7db47f86b1ef3a3fcb3cf6f9f435ca14cb7df6f6016cf3be5425329  guix-build-d9c8aacce38a/output/arm-linux-gnueabihf/SHA256SUMS.part
 589f5dc38491157872ddb4bc193dbcda4ba38f7e1223c6350f7dabf6949b77ee4  guix-build-d9c8aacce38a/output/arm-linux-gnueabihf/bitcoin-d9c8aacce38a-arm-linux-gnueabihf-debug.tar.gz
 6d6878438abf77353a71e16d399b6e1bded3401301b47ebc614443b3ae05aca6c  guix-build-d9c8aacce38a/output/arm-linux-gnueabihf/bitcoin-d9c8aacce38a-arm-linux-gnueabihf.tar.gz
 703f0d1b2dc6b64282d5e89f5d6521b54b11fc3e32f337a211237c9a8856b6563  guix-build-d9c8aacce38a/output/arm64-apple-darwin/SHA256SUMS.part
 81c4d20ba0d70cf6ff6b59a702503ac622627f9a03011008dcd846fbc546351a0  guix-build-d9c8aacce38a/output/arm64-apple-darwin/bitcoin-d9c8aacce38a-arm64-apple-darwin-unsigned.tar.gz
 976f20bf97518fdd226d7760e7407530ab7787776a754535df2749921ad530167  guix-build-d9c8aacce38a/output/arm64-apple-darwin/bitcoin-d9c8aacce38a-arm64-apple-darwin-unsigned.zip
10180ae795d056ddefb61396b2d6ffc77ea9c2e2f84f12c5430a0dd086efe32e9e  guix-build-d9c8aacce38a/output/arm64-apple-darwin/bitcoin-d9c8aacce38a-arm64-apple-darwin.tar.gz
11ccf37ed459b4377122f71f14789ac040504935809fec123dc9a98db0bebbf264  guix-build-d9c8aacce38a/output/dist-archive/bitcoin-d9c8aacce38a.tar.gz
12bc400f390bdf9fef230058476bfca0867784786648829d994ba2a0afeffc6d49  guix-build-d9c8aacce38a/output/powerpc64-linux-gnu/SHA256SUMS.part
133b6b3d1e617f4932f2d84a7d8e24102563e185e214a22e20479b6e8a5bd02a83  guix-build-d9c8aacce38a/output/powerpc64-linux-gnu/bitcoin-d9c8aacce38a-powerpc64-linux-gnu-debug.tar.gz
14417219945052a961b5ea2e8becb5a291fdb889f7efc5aaa508e305143640edf8  guix-build-d9c8aacce38a/output/powerpc64-linux-gnu/bitcoin-d9c8aacce38a-powerpc64-linux-gnu.tar.gz
158e74871208f519b97cf04befedba35f6e644c9a78dab7594b4ebaa8e3d6907a2  guix-build-d9c8aacce38a/output/riscv64-linux-gnu/SHA256SUMS.part
1654f899d32a0a102915560703f16b50e0a36f83fcae7a1a338e2647c26ed1fc30  guix-build-d9c8aacce38a/output/riscv64-linux-gnu/bitcoin-d9c8aacce38a-riscv64-linux-gnu-debug.tar.gz
17f102b4e938899c40ad7a3cf41ca7733b2bccf33029b22b4f5a997351f8850376  guix-build-d9c8aacce38a/output/riscv64-linux-gnu/bitcoin-d9c8aacce38a-riscv64-linux-gnu.tar.gz
187742e067606545f1f16052398eb8b465654fd81e100e3856c7c42ed18628d16b  guix-build-d9c8aacce38a/output/x86_64-apple-darwin/SHA256SUMS.part
193d4d6c6d290492c90e9d128c1f0d90612cb674dad462c6f6419281ec3e354b2f  guix-build-d9c8aacce38a/output/x86_64-apple-darwin/bitcoin-d9c8aacce38a-x86_64-apple-darwin-unsigned.tar.gz
2021d1ab5550d8984cb224c292408729205ab6bc4480cbf760ab3fe2bf07e0fe8b  guix-build-d9c8aacce38a/output/x86_64-apple-darwin/bitcoin-d9c8aacce38a-x86_64-apple-darwin-unsigned.zip
21c642a24b08709d63c2a617687fa500ac919554596edac7b9692113f57673597c  guix-build-d9c8aacce38a/output/x86_64-apple-darwin/bitcoin-d9c8aacce38a-x86_64-apple-darwin.tar.gz
222db58cd23b2392770b2fd605bdb068e842a666c50ae65aec15de1cf620a55284  guix-build-d9c8aacce38a/output/x86_64-linux-gnu/SHA256SUMS.part
2357552cde8c9ae23839474c7b0059bc61f2729978323c11d8c94de527a5d82be6  guix-build-d9c8aacce38a/output/x86_64-linux-gnu/bitcoin-d9c8aacce38a-x86_64-linux-gnu-debug.tar.gz
24951805fd537624bb0b6a4ceab722ee2e67826f7245968e96b4ac49b5d18c7474  guix-build-d9c8aacce38a/output/x86_64-linux-gnu/bitcoin-d9c8aacce38a-x86_64-linux-gnu.tar.gz
2542799e7b0583e8f239baf9d0cc5a0a89b29f51a9eb4d661c01f6fedbac47d992  guix-build-d9c8aacce38a/output/x86_64-w64-mingw32/SHA256SUMS.part
26cfaa5437ea032fac789c42bd5ee7fccc7b931090cabee54d75892d7a932fe41e  guix-build-d9c8aacce38a/output/x86_64-w64-mingw32/bitcoin-d9c8aacce38a-win64-debug.zip
27bd58f269c79583f44e0e17ce07bf34cd1468d4132dbec1d14ff277a0ac98a12d  guix-build-d9c8aacce38a/output/x86_64-w64-mingw32/bitcoin-d9c8aacce38a-win64-setup-unsigned.exe
282b14f26592582e9e68422f2fe5652b27fc8b7a122e3985a527095106c43704ce  guix-build-d9c8aacce38a/output/x86_64-w64-mingw32/bitcoin-d9c8aacce38a-win64-unsigned.tar.gz
29d9960fcb09326a5fe063e40084edef5883cb0a3d0b363a378de48a78a9e14c8f  guix-build-d9c8aacce38a/output/x86_64-w64-mingw32/bitcoin-d9c8aacce38a-win64.zip

fanquake commented at 11:21 am on November 25, 2024: member

Is there any particular motivation (to do this now), given it doesn’t work/can’t be tested?

hebasto commented at 11:26 am on November 25, 2024: member

Is there any particular motivation (to do this now), given it doesn’t work/can’t be tested?

To achieve the same quality in toolchain.cmake as it was with config.site in Autotools.

hebasto commented at 1:49 pm on December 4, 2024: member

Is there any particular motivation (to do this now), given it doesn’t work/can’t be tested?

Apparently, this PR fixes #31050.

hebasto renamed this:
~~depends, refactor: Avoid hardcoding `host_prefix` in toolchain file~~
depends: Avoid hardcoding `host_prefix` in toolchain file
on Dec 4, 2024

Sjors commented at 4:01 pm on January 7, 2025: member

I tested on Intel macOS 13.7.2 that #31050 still happens on master @ 433412fd8478923dfdb20044f74c5d1e19fa8dd8. And I can confirm that this PR fixes it! 🎉

I also tested building and running the GUI.

It does issue a warning though (at least when you don’t build the GUI):

0CMake Warning:
1  Manually-specified variables were not used by the project:
2
3    CMAKE_TOOLCHAIN_FILE

hebasto commented at 4:57 pm on January 7, 2025: member

It does issue a warning though (at least when you don’t build the GUI):
0CMake Warning:
1  Manually-specified variables were not used by the project:
2
3    CMAKE_TOOLCHAIN_FILE

Are you sure that you build directory is clean before the first cmake invocation?

if so, what are exact steps that lead to this warning?

Sjors commented at 5:32 pm on January 7, 2025: member

Mmm, not seeing this anymore, so maybe I did something wrong the first time.

After the depends are built:

0rm -rf build
1cmake -B build -DBUILD_GUI=ON --toolchain /Volumes/SSD/Dev/bitcoin/depends/x86_64-apple-darwin22.6.0/toolchain.cmake

Logs with and without GUI:

https://gist.github.com/Sjors/f4a493c57eb3ab5b62754c1d4e54a9c6

theuni approved

theuni commented at 10:03 pm on February 4, 2025: member

Neat. utACK d9c8aacce38ab593ea9277976eb64ccadd7d062f

DrahtBot requested review from TheCharlatan on Feb 4, 2025

ryanofsky approved

ryanofsky commented at 3:33 am on February 5, 2025: contributor

Code review ACK d9c8aacce38ab593ea9277976eb64ccadd7d062f

fanquake merged this on Feb 5, 2025

fanquake closed this on Feb 5, 2025

hebasto deleted the branch on Feb 5, 2025

depends: Avoid hardcoding host_prefix in toolchain file #31358

Code Coverage & Benchmarks

Reviews

Conflicts

depends: Avoid hardcoding `host_prefix` in toolchain file #31358