depends: Specify CMake generator explicitly

hebasto commented at 11:29 am on October 28, 2024: member

Building packages in depends implies using GNU Make. However, this assumption can be wrong in environments where the CMAKE_GENERATOR variable is set.

This change explicitly makes CMake use the “Unix Makefiles” generator.

Can be tested as follows:

0$ env CMAKE_GENERATOR=Ninja make -C depends

depends: Specify CMake generator explicitly

Building packages in depends implies using GNU Make. However, this
assumption can be wrong in environments where the `CMAKE_GENERATOR`
variable is set.
This change explicitly makes CMake use the "Unix Makefiles" generator.

e2ba823671

hebasto added the label Build system on Oct 28, 2024

DrahtBot commented at 11:29 am on October 28, 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/31171.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	fanquake

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

fanquake commented at 12:08 pm on October 28, 2024: member

However, this assumption can be wrong in environments where the CMAKE_GENERATOR variable is set.

Generally, this holds for many CMake variables. Wouldn’t a better approach be facilitating it working, rather than guaranteeing these environments never get the expected bahaviour.

hebasto commented at 2:56 pm on October 28, 2024: member

However, this assumption can be wrong in environments where the CMAKE_GENERATOR variable is set.

Generally, this holds for many CMake variables. Wouldn’t a better approach be facilitating it working, rather than guaranteeing these environments never get the expected bahaviour.

Such behaviour can be achieved by switching from $(MAKE) to cmake --build ... in the $(package)_build_cmds. However, it would be a much more invasive change as it requires proper handling of the top-level make options, such as -j. Not sure if it is justified.

maflcko added the label DrahtBot Guix build requested on Oct 28, 2024

hebasto commented at 6:12 pm on October 28, 2024: member

My Guix build:

 0aarch64
 12b8363e54965bc413159a4dbc371a70e4c8a77976c196c57747917928009ed03  guix-build-e2ba8236715e/output/aarch64-linux-gnu/SHA256SUMS.part
 24b0b3358ffe8c136759ff8594e5ea4502a7b9299f3c3b271c65bc3187b832960  guix-build-e2ba8236715e/output/aarch64-linux-gnu/bitcoin-e2ba8236715e-aarch64-linux-gnu-debug.tar.gz
 3303f29d256c2f31909b8a6ffdbcb2c6fd974a3e188bb6726de369c8746ad4b9f  guix-build-e2ba8236715e/output/aarch64-linux-gnu/bitcoin-e2ba8236715e-aarch64-linux-gnu.tar.gz
 4df57974010085f3602c82e6df88ee783c08e4d0e59762b0f902977432cc41cd6  guix-build-e2ba8236715e/output/arm-linux-gnueabihf/SHA256SUMS.part
 59691855500057ea118ccb3f4d4b120534c803ec956cc183c937701c12afe6495  guix-build-e2ba8236715e/output/arm-linux-gnueabihf/bitcoin-e2ba8236715e-arm-linux-gnueabihf-debug.tar.gz
 6cbdb04a59663b3a794268720fd1652481079d9e72e76c49d3988ec5e9f8d0837  guix-build-e2ba8236715e/output/arm-linux-gnueabihf/bitcoin-e2ba8236715e-arm-linux-gnueabihf.tar.gz
 7d0fbf301ee9c5822fce3f5c46e5ef2039d7f950c078a1426d73b722b2eac0c67  guix-build-e2ba8236715e/output/arm64-apple-darwin/SHA256SUMS.part
 88219170d9afb9d3330bd544a4d3bbb6eb4adc42cc1f456d40fca0776ca3ef130  guix-build-e2ba8236715e/output/arm64-apple-darwin/bitcoin-e2ba8236715e-arm64-apple-darwin-unsigned.tar.gz
 97939e48fbfe3129e214c15ec826b22772975cb53221895661d27ec3fd12520fd  guix-build-e2ba8236715e/output/arm64-apple-darwin/bitcoin-e2ba8236715e-arm64-apple-darwin-unsigned.zip
10b48b13003ef2d8244a528e4b46832d41021543dd80af258b43b57e0ad91b8ea3  guix-build-e2ba8236715e/output/arm64-apple-darwin/bitcoin-e2ba8236715e-arm64-apple-darwin.tar.gz
113923d1515f9af7d1d169b7f852b6a67a40d7ca09741971809b42395d8b6ec6b1  guix-build-e2ba8236715e/output/dist-archive/bitcoin-e2ba8236715e.tar.gz
129f925d5bfa0c043f6f50626ab81029f63863aad933cd7103379f295684b98b1e  guix-build-e2ba8236715e/output/powerpc64-linux-gnu/SHA256SUMS.part
1390d210b80dc90d2398e8060243368edf0293ad9f7c92b572950b439e14c9cda3  guix-build-e2ba8236715e/output/powerpc64-linux-gnu/bitcoin-e2ba8236715e-powerpc64-linux-gnu-debug.tar.gz
14f7e6739fa19292b0425a31e2557d51df076751597d6bff5ed1e8bc090ce8b5a7  guix-build-e2ba8236715e/output/powerpc64-linux-gnu/bitcoin-e2ba8236715e-powerpc64-linux-gnu.tar.gz
154eda040ff248a5c50304a6c0506263e412647536509ec07c63fd472668f063f6  guix-build-e2ba8236715e/output/riscv64-linux-gnu/SHA256SUMS.part
1668bff289f07398c64659ff1d56ddbacd26dac42d45d76315faff884532bac8fc  guix-build-e2ba8236715e/output/riscv64-linux-gnu/bitcoin-e2ba8236715e-riscv64-linux-gnu-debug.tar.gz
176458bf755da5a5f8c441acdc6efbe5aa5dcf60099f4d2a697103f3dfa77aa6d9  guix-build-e2ba8236715e/output/riscv64-linux-gnu/bitcoin-e2ba8236715e-riscv64-linux-gnu.tar.gz
18f66c6da42db9f652480a35f8f3c937b66436cf9e9ddac6b9b6b09357b8514b9b  guix-build-e2ba8236715e/output/x86_64-apple-darwin/SHA256SUMS.part
19502d72374d079029e4bbaaf51971fece024917c7295049c984ba6c188ce792fc  guix-build-e2ba8236715e/output/x86_64-apple-darwin/bitcoin-e2ba8236715e-x86_64-apple-darwin-unsigned.tar.gz
20c7316462dc8b781968d62d2f3c00971bd6d0c59c353f869242a8d9a6e32c9111  guix-build-e2ba8236715e/output/x86_64-apple-darwin/bitcoin-e2ba8236715e-x86_64-apple-darwin-unsigned.zip
212fc72da7b812ff5fb43d5feaa2d8de849570007abd6537af0f7760b6b55d9bae  guix-build-e2ba8236715e/output/x86_64-apple-darwin/bitcoin-e2ba8236715e-x86_64-apple-darwin.tar.gz
221e40a8e18ac33ce38168e7262ea20ce2ef66d5177bee723c493574cc001c6612  guix-build-e2ba8236715e/output/x86_64-linux-gnu/SHA256SUMS.part
2309dd1caa55ceb5b10b1f64a0a7f8ba9c4ffe88a91d9583e62a014cc5644e891f  guix-build-e2ba8236715e/output/x86_64-linux-gnu/bitcoin-e2ba8236715e-x86_64-linux-gnu-debug.tar.gz
24d9c72260b27c8162ad52bce9b60b87a77224414aa4f24d541a4b31a8006cf028  guix-build-e2ba8236715e/output/x86_64-linux-gnu/bitcoin-e2ba8236715e-x86_64-linux-gnu.tar.gz
255e7d7b94c01f651c98ce397aa9b1f8a014c99fc8b6dd53a84bdc91adb7b91dae  guix-build-e2ba8236715e/output/x86_64-w64-mingw32/SHA256SUMS.part
269c6434ecc9236197040ac04fcc8bf2ca848886df50923cc8f0e32076f21ab089  guix-build-e2ba8236715e/output/x86_64-w64-mingw32/bitcoin-e2ba8236715e-win64-debug.zip
2795138dbabbc5776e5bcf8ae509a764dc944df3d74a5ddb1000a2d9260aa9bd19  guix-build-e2ba8236715e/output/x86_64-w64-mingw32/bitcoin-e2ba8236715e-win64-setup-unsigned.exe
281525d123bb7f35c1c21c6adcd7fa11ef705b1edf0ed179c2ec0a7348541bf40d  guix-build-e2ba8236715e/output/x86_64-w64-mingw32/bitcoin-e2ba8236715e-win64-unsigned.tar.gz
29ca80767a27dfb699feced4ad7d830296a4724ce4f3f94dd35babfa16f48293f8  guix-build-e2ba8236715e/output/x86_64-w64-mingw32/bitcoin-e2ba8236715e-win64.zip

DrahtBot commented at 6:34 am on November 1, 2024: contributor

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

File	commit 97b790e844abd2f92c928239a7dc786d37fad18b(master)	commit 146aae4d1e3f93b46888becc144010b08befd9df(master and this pull)
SHA256SUMS.part	`9d7f4b569425213e...`	`71f57e13a009953b...`
*-aarch64-linux-gnu-debug.tar.gz	`2df4e643ab44b605...`	`628611c86020e6d9...`
*-aarch64-linux-gnu.tar.gz	`af3f3a477a1e86fd...`	`2d43987f69163158...`
*-arm-linux-gnueabihf-debug.tar.gz	`7ce84751969e9875...`	`972383dab1c65613...`
*-arm-linux-gnueabihf.tar.gz	`1533b6d63b50c3f6...`	`8fa679de528d3b93...`
*-arm64-apple-darwin-unsigned.tar.gz	`71f5fe040fb3686e...`	`7867e65258540fdb...`
*-arm64-apple-darwin-unsigned.zip	`e22e3260517e6627...`	`f7680ed652ec5fe5...`
*-arm64-apple-darwin.tar.gz	`95a83d4375e45ff5...`	`ee42947f7f64d67f...`
*-powerpc64-linux-gnu-debug.tar.gz	`19c758f41556f7a6...`	`0e291bc2b5734f57...`
*-powerpc64-linux-gnu.tar.gz	`c89e01fdaccc4275...`	`dc7c8bb51fa40093...`
*-riscv64-linux-gnu-debug.tar.gz	`4b08fab2ccb7db97...`	`6c6daf3170de295a...`
*-riscv64-linux-gnu.tar.gz	`354684b321d67f92...`	`066deb2eb0575a6b...`
*-x86_64-apple-darwin-unsigned.tar.gz	`cd6ba88ebbef62cd...`	`84fd2612297e7b93...`
*-x86_64-apple-darwin-unsigned.zip	`eafb999e7e0aaee4...`	`d470f2a582b017c0...`
*-x86_64-apple-darwin.tar.gz	`d7e57d9fc7ab224e...`	`4019e1e2387f5779...`
*-x86_64-linux-gnu-debug.tar.gz	`0ee8d15802e1c65e...`	`278be532296b2155...`
*-x86_64-linux-gnu.tar.gz	`b74b25d0570c5c19...`	`ff62698d4a45cbea...`
*.tar.gz	`46e94fd587daec71...`	`3c14b519397f170f...`
guix_build.log	`c426976e672db1e1...`	`dd86292276263263...`
guix_build.log.diff		`526692724f33b646...`

DrahtBot removed the label DrahtBot Guix build requested on Nov 1, 2024

fanquake commented at 4:38 pm on November 5, 2024: member

in environments where the CMAKE_GENERATOR variable is set.

Which environment/distro did you see this in?

hebasto commented at 4:43 pm on November 5, 2024: member

in environments where the CMAKE_GENERATOR variable is set.

Which environment/distro did you see this in?

I don’t mean a specific distro, but rather a user-modified environment—for example, setting CMAKE_GENERATOR in the ~/.profile file.

fanquake commented at 5:09 pm on November 7, 2024: member

Guix Build:

 02b8363e54965bc413159a4dbc371a70e4c8a77976c196c57747917928009ed03  guix-build-e2ba8236715e/output/aarch64-linux-gnu/SHA256SUMS.part
 14b0b3358ffe8c136759ff8594e5ea4502a7b9299f3c3b271c65bc3187b832960  guix-build-e2ba8236715e/output/aarch64-linux-gnu/bitcoin-e2ba8236715e-aarch64-linux-gnu-debug.tar.gz
 2303f29d256c2f31909b8a6ffdbcb2c6fd974a3e188bb6726de369c8746ad4b9f  guix-build-e2ba8236715e/output/aarch64-linux-gnu/bitcoin-e2ba8236715e-aarch64-linux-gnu.tar.gz
 3df57974010085f3602c82e6df88ee783c08e4d0e59762b0f902977432cc41cd6  guix-build-e2ba8236715e/output/arm-linux-gnueabihf/SHA256SUMS.part
 49691855500057ea118ccb3f4d4b120534c803ec956cc183c937701c12afe6495  guix-build-e2ba8236715e/output/arm-linux-gnueabihf/bitcoin-e2ba8236715e-arm-linux-gnueabihf-debug.tar.gz
 5cbdb04a59663b3a794268720fd1652481079d9e72e76c49d3988ec5e9f8d0837  guix-build-e2ba8236715e/output/arm-linux-gnueabihf/bitcoin-e2ba8236715e-arm-linux-gnueabihf.tar.gz
 6d0fbf301ee9c5822fce3f5c46e5ef2039d7f950c078a1426d73b722b2eac0c67  guix-build-e2ba8236715e/output/arm64-apple-darwin/SHA256SUMS.part
 78219170d9afb9d3330bd544a4d3bbb6eb4adc42cc1f456d40fca0776ca3ef130  guix-build-e2ba8236715e/output/arm64-apple-darwin/bitcoin-e2ba8236715e-arm64-apple-darwin-unsigned.tar.gz
 87939e48fbfe3129e214c15ec826b22772975cb53221895661d27ec3fd12520fd  guix-build-e2ba8236715e/output/arm64-apple-darwin/bitcoin-e2ba8236715e-arm64-apple-darwin-unsigned.zip
 9b48b13003ef2d8244a528e4b46832d41021543dd80af258b43b57e0ad91b8ea3  guix-build-e2ba8236715e/output/arm64-apple-darwin/bitcoin-e2ba8236715e-arm64-apple-darwin.tar.gz
103923d1515f9af7d1d169b7f852b6a67a40d7ca09741971809b42395d8b6ec6b1  guix-build-e2ba8236715e/output/dist-archive/bitcoin-e2ba8236715e.tar.gz
119f925d5bfa0c043f6f50626ab81029f63863aad933cd7103379f295684b98b1e  guix-build-e2ba8236715e/output/powerpc64-linux-gnu/SHA256SUMS.part
1290d210b80dc90d2398e8060243368edf0293ad9f7c92b572950b439e14c9cda3  guix-build-e2ba8236715e/output/powerpc64-linux-gnu/bitcoin-e2ba8236715e-powerpc64-linux-gnu-debug.tar.gz
13f7e6739fa19292b0425a31e2557d51df076751597d6bff5ed1e8bc090ce8b5a7  guix-build-e2ba8236715e/output/powerpc64-linux-gnu/bitcoin-e2ba8236715e-powerpc64-linux-gnu.tar.gz
144eda040ff248a5c50304a6c0506263e412647536509ec07c63fd472668f063f6  guix-build-e2ba8236715e/output/riscv64-linux-gnu/SHA256SUMS.part
1568bff289f07398c64659ff1d56ddbacd26dac42d45d76315faff884532bac8fc  guix-build-e2ba8236715e/output/riscv64-linux-gnu/bitcoin-e2ba8236715e-riscv64-linux-gnu-debug.tar.gz
166458bf755da5a5f8c441acdc6efbe5aa5dcf60099f4d2a697103f3dfa77aa6d9  guix-build-e2ba8236715e/output/riscv64-linux-gnu/bitcoin-e2ba8236715e-riscv64-linux-gnu.tar.gz
17f66c6da42db9f652480a35f8f3c937b66436cf9e9ddac6b9b6b09357b8514b9b  guix-build-e2ba8236715e/output/x86_64-apple-darwin/SHA256SUMS.part
18502d72374d079029e4bbaaf51971fece024917c7295049c984ba6c188ce792fc  guix-build-e2ba8236715e/output/x86_64-apple-darwin/bitcoin-e2ba8236715e-x86_64-apple-darwin-unsigned.tar.gz
19c7316462dc8b781968d62d2f3c00971bd6d0c59c353f869242a8d9a6e32c9111  guix-build-e2ba8236715e/output/x86_64-apple-darwin/bitcoin-e2ba8236715e-x86_64-apple-darwin-unsigned.zip
202fc72da7b812ff5fb43d5feaa2d8de849570007abd6537af0f7760b6b55d9bae  guix-build-e2ba8236715e/output/x86_64-apple-darwin/bitcoin-e2ba8236715e-x86_64-apple-darwin.tar.gz
211e40a8e18ac33ce38168e7262ea20ce2ef66d5177bee723c493574cc001c6612  guix-build-e2ba8236715e/output/x86_64-linux-gnu/SHA256SUMS.part
2209dd1caa55ceb5b10b1f64a0a7f8ba9c4ffe88a91d9583e62a014cc5644e891f  guix-build-e2ba8236715e/output/x86_64-linux-gnu/bitcoin-e2ba8236715e-x86_64-linux-gnu-debug.tar.gz
23d9c72260b27c8162ad52bce9b60b87a77224414aa4f24d541a4b31a8006cf028  guix-build-e2ba8236715e/output/x86_64-linux-gnu/bitcoin-e2ba8236715e-x86_64-linux-gnu.tar.gz
245e7d7b94c01f651c98ce397aa9b1f8a014c99fc8b6dd53a84bdc91adb7b91dae  guix-build-e2ba8236715e/output/x86_64-w64-mingw32/SHA256SUMS.part
259c6434ecc9236197040ac04fcc8bf2ca848886df50923cc8f0e32076f21ab089  guix-build-e2ba8236715e/output/x86_64-w64-mingw32/bitcoin-e2ba8236715e-win64-debug.zip
2695138dbabbc5776e5bcf8ae509a764dc944df3d74a5ddb1000a2d9260aa9bd19  guix-build-e2ba8236715e/output/x86_64-w64-mingw32/bitcoin-e2ba8236715e-win64-setup-unsigned.exe
271525d123bb7f35c1c21c6adcd7fa11ef705b1edf0ed179c2ec0a7348541bf40d  guix-build-e2ba8236715e/output/x86_64-w64-mingw32/bitcoin-e2ba8236715e-win64-unsigned.tar.gz
28ca80767a27dfb699feced4ad7d830296a4724ce4f3f94dd35babfa16f48293f8  guix-build-e2ba8236715e/output/x86_64-w64-mingw32/bitcoin-e2ba8236715e-win64.zip

fanquake approved

fanquake commented at 5:11 pm on November 7, 2024: member

ACK e2ba8236715ee4530d08312b075d8b41cb592257 - Going forward I think we should look at making this work without having to hard code anything.

fanquake merged this on Nov 7, 2024

fanquake closed this on Nov 7, 2024

TheCharlatan referenced this in commit a73b2bd0f0 on Nov 14, 2024

hebasto deleted the branch on Nov 16, 2024

depends: Specify CMake generator explicitly #31171

Code Coverage & Benchmarks

Reviews

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