CMAKE_SKIP_INSTALL_RPATH from CMakeLists.txt and add CMAKE_SKIP_RPATH to the Guix build script. This keeps build-environment-specific settings in the build scripts rather than hardcoded in the CMake configuration.
CMAKE_SKIP_INSTALL_RPATH from CMakeLists.txt and add CMAKE_SKIP_RPATH to the Guix build script. This keeps build-environment-specific settings in the build scripts rather than hardcoded in the CMake configuration.
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33470.
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | purpleKarrot, janb84 |
| Stale ACK | hebasto |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
Reviewers, 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.
Guix build hashes for commit eb98b612f80f:
698ad81e49ed8fe64d3586fe7a87837c82fef4b0ec8477f1737587593eff424a dist-archive/bitcoin-eb98b612f80f.tar.gz 2e1cbd7e66128739582a7822c6ac06fc57b33061d0cbbcd86094dbc4624c02e5 x86_64-linux-gnu/bitcoin-eb98b612f80f-x86_64-linux-gnu-debug.tar.gz be406dc0f71c160a2a4173ff81b29f67e2b191a3331eaf4d6d905e7fd07e646b x86_64-linux-gnu/bitcoin-eb98b612f80f-x86_64-linux-gnu.tar.gz
Build completed successfully on Linux x86_64.
242@@ -243,6 +243,7 @@ mkdir -p "$DISTSRC"
243 --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
244 -DWITH_CCACHE=OFF \
245 -Werror=dev \
246+ -DCMAKE_SKIP_INSTALL_RPATH=TRUE \
CMAKE_SKIP_RPATH? (also move to CONFIGFLAGS)
Now that you have changed this, please update the PR description to match the recent change:
“Add -DCMAKE_SKIP_INSTALL_RPATH=TRUE to Guix build script cmake configuration” => Add -DCMAKE_SKIP_RPATH=TRUE to Guix build script cmake configuration
Can this just be
CMAKE_SKIP_RPATH?
With this suggestion having been adopted, the following lines of code can be dropped as well: https://github.com/bitcoin/bitcoin/blob/dd5c517757f97b68f7eb07628222c958b47f742b/CMakeLists.txt#L632 and https://github.com/bitcoin/bitcoin/blob/d8fe258cd6105704bf4427eda048dd7085ca516d/src/CMakeLists.txt#L420
I understand that this overlaps with #33247, so it’s OK to leave this branch as is.
| File | commit ad4a49090da81a3683fc50694ed7b42a80fdf90b(master) | commit 62072c6c341fc5c201bf043321b9a6bcb098d125(pull/33470/merge) |
|---|---|---|
| *-aarch64-linux-gnu-debug.tar.gz | 05fa48653fe2429c... |
15394eace820b521... |
| *-aarch64-linux-gnu.tar.gz | c75df3543cd982fd... |
eb3b775f2735d4b5... |
| *-arm-linux-gnueabihf-debug.tar.gz | 5ca49eaa243a8c54... |
97363b3e6530f3c9... |
| *-arm-linux-gnueabihf.tar.gz | 1a8b9b979d7aba55... |
af3ae1b7582e9bee... |
| *-arm64-apple-darwin-codesigning.tar.gz | 1fac2e0ec9121feb... |
ac21294215fab9ba... |
| *-arm64-apple-darwin-unsigned.tar.gz | c28e65c86e3858f0... |
9e265b832d383e11... |
| *-arm64-apple-darwin-unsigned.zip | c0029774a999291a... |
a579603b77f16a56... |
| *-powerpc64-linux-gnu-debug.tar.gz | 6388eddc9d61b821... |
6f4d64350ecbbf43... |
| *-powerpc64-linux-gnu.tar.gz | cc3439856d396c26... |
23077d424cfc3b85... |
| *-riscv64-linux-gnu-debug.tar.gz | 83b8428d5e4973a5... |
3647215ac7cdf752... |
| *-riscv64-linux-gnu.tar.gz | 01f68cac21f07e94... |
28c39e8cbe9a9e19... |
| *-x86_64-apple-darwin-codesigning.tar.gz | 6152b1fbd13ff50e... |
2e88d606dc52c22b... |
| *-x86_64-apple-darwin-unsigned.tar.gz | e90b611bb5d953c6... |
614af6db2fcefe55... |
| *-x86_64-apple-darwin-unsigned.zip | 41afabb5709549de... |
3a579c6b4f8f7c46... |
| *-x86_64-linux-gnu-debug.tar.gz | ce83aa703b21c6f7... |
793c1aadc64b203f... |
| *-x86_64-linux-gnu.tar.gz | 8e4084202e42310b... |
6011009475142175... |
| *.tar.gz | a9e97130abb5e653... |
3afbbede33d9cc42... |
| SHA256SUMS.part | 7b94502150834879... |
2f19e35627b610b0... |
| guix_build.log | 67e7c69cb5411e98... |
4c8ae8f695b06b2f... |
| guix_build.log.diff | f363056ec5de1b15... |
ACK dd5c517757f97b68f7eb07628222c958b47f742b
PR removes CMAKE flag from CMakeLists to config flag section of build script. This change is a follow up on #33247 and seems like a good followup to move the Guix special flag to the Guix special build script.
Commit: dd5c517757f9
0 207120a771188474820e1a98f20780154f53037f12251d08f49582754819ab50 guix-build-dd5c517757f9/output/aarch64-linux-gnu/SHA256SUMS.part
1 7fd9043d0fcb6f58f3401968f83e47c54f94bd7fd5880951db1918f027ed850c guix-build-dd5c517757f9/output/aarch64-linux-gnu/bitcoin-dd5c517757f9-aarch64-linux-gnu-debug.tar.gz
2 5c78adc526ea076b71fe3caba439a23aad3e7d1d8c47f5e3e84a7dbd150e22f3 guix-build-dd5c517757f9/output/aarch64-linux-gnu/bitcoin-dd5c517757f9-aarch64-linux-gnu.tar.gz
3 2c15fb10234b1f1ccfe42e49fef1cacbc416a16fa3601cfdcdc84414a9d44903 guix-build-dd5c517757f9/output/arm-linux-gnueabihf/SHA256SUMS.part
4 19221d126696614b542c82dfbda2a9b249710f8b1ee5330639d155eaa8676ad3 guix-build-dd5c517757f9/output/arm-linux-gnueabihf/bitcoin-dd5c517757f9-arm-linux-gnueabihf-debug.tar.gz
5 bf594cc1bf3cdabfd1eb3a3058117c0c4b8a0be5931f9ce5610c620e7d28f5d5 guix-build-dd5c517757f9/output/arm-linux-gnueabihf/bitcoin-dd5c517757f9-arm-linux-gnueabihf.tar.gz
6 c85b7a480dc7fa0a58af9d06ddb42f6b0e2d279be4c1e22850e2605fa44c6a27 guix-build-dd5c517757f9/output/arm64-apple-darwin/SHA256SUMS.part
7 f3655b9772f0ab0a4e1d5013df5c21fe076ff393ff52c14168bfd6c26b16e285 guix-build-dd5c517757f9/output/arm64-apple-darwin/bitcoin-dd5c517757f9-arm64-apple-darwin-codesigning.tar.gz
8 a6fe8f05950d132943b3850303bbb60d4ad11f49aaa45f0b83180dfdfdf37a9e guix-build-dd5c517757f9/output/arm64-apple-darwin/bitcoin-dd5c517757f9-arm64-apple-darwin-unsigned.tar.gz
9 e2409bb5ce84e2deebb1228cb678da9fae8515e93f11811023aa3e94c1fe1b2b guix-build-dd5c517757f9/output/arm64-apple-darwin/bitcoin-dd5c517757f9-arm64-apple-darwin-unsigned.zip
10 ceb9c26098883e83751c3bd1c156a605a5ea94554843160a8e1fae2807a8e82e guix-build-dd5c517757f9/output/dist-archive/bitcoin-dd5c517757f9.tar.gz
11 0c8f13fdc9df638c07d24f59a473def0257a68b45c182c2d744a8b3f6998d727 guix-build-dd5c517757f9/output/powerpc64-linux-gnu/SHA256SUMS.part
12 b1f72e61214fd7ac990ef704754a7ca3e4461e415db3e61ecf76324cb9b47017 guix-build-dd5c517757f9/output/powerpc64-linux-gnu/bitcoin-dd5c517757f9-powerpc64-linux-gnu-debug.tar.gz
13 cf4425645c077916036fd08214016b8512bee120df18449246211cac3d1db4cd guix-build-dd5c517757f9/output/powerpc64-linux-gnu/bitcoin-dd5c517757f9-powerpc64-linux-gnu.tar.gz
14 f837cbd8eed2e6b8f50313b857538b6d1c7859f271eaff05b9a6ffddea233472 guix-build-dd5c517757f9/output/riscv64-linux-gnu/SHA256SUMS.part
15 2c36dbc601f63c277ef0931f747c018bc7acd31ec82308fd2bcc812272240148 guix-build-dd5c517757f9/output/riscv64-linux-gnu/bitcoin-dd5c517757f9-riscv64-linux-gnu-debug.tar.gz
16 9a812a6e50633f0f7fefd508d4a0a163530f2d73b910c08802f2a4b15ac72cae guix-build-dd5c517757f9/output/riscv64-linux-gnu/bitcoin-dd5c517757f9-riscv64-linux-gnu.tar.gz
17 1e4b4b4941b3c187edcb3cbafd0afac54c02aea3a01f84b8dbe333802f233f49 guix-build-dd5c517757f9/output/x86_64-apple-darwin/SHA256SUMS.part
18 d40cd9e7b0fed9887cb838624104b70a5f1f152421563d29344ba64a06cf0945 guix-build-dd5c517757f9/output/x86_64-apple-darwin/bitcoin-dd5c517757f9-x86_64-apple-darwin-codesigning.tar.gz
19 e23ea5a13ecd23dc6952d023b226adce9f053c709235fb1e689e224aaba23152 guix-build-dd5c517757f9/output/x86_64-apple-darwin/bitcoin-dd5c517757f9-x86_64-apple-darwin-unsigned.tar.gz
20 f92a95ab0d57d018eb05f25c43b7d9e60394c0ce05a88d1d9f5807adceda758d guix-build-dd5c517757f9/output/x86_64-apple-darwin/bitcoin-dd5c517757f9-x86_64-apple-darwin-unsigned.zip
21 91a5eb58fa59b8ea64c63be275c68a61598b009db66d300fdac0a74455d99244 guix-build-dd5c517757f9/output/x86_64-linux-gnu/SHA256SUMS.part
22 7e394cf2cd7fde4cb6c3058aaeb73c68ed9d07fbf6ee1d7ebfdc0015d80a455e guix-build-dd5c517757f9/output/x86_64-linux-gnu/bitcoin-dd5c517757f9-x86_64-linux-gnu-debug.tar.gz
23 169db4db051f35e4b7b65b319b2d6c9ac27ca4f6d5b0f3f56085b0c708db1e42 guix-build-dd5c517757f9/output/x86_64-linux-gnu/bitcoin-dd5c517757f9-x86_64-linux-gnu.tar.gz
24 152aabc2be7dc6224d4d8054924213e0c4080b4c1e28ec0b5801851a08a2342d guix-build-dd5c517757f9/output/x86_64-w64-mingw32/SHA256SUMS.part
25 e1a8a1131d81453a392e806b33c17c130f903b35101b695f8aba5ace6500c645 guix-build-dd5c517757f9/output/x86_64-w64-mingw32/bitcoin-dd5c517757f9-win64-codesigning.tar.gz
26 898c0f36b7269d266348c9c4d7d0d720ba0f248beb42d05d4e0985ead71329d3 guix-build-dd5c517757f9/output/x86_64-w64-mingw32/bitcoin-dd5c517757f9-win64-debug.zip
27 50e4c473ebfbe7def6f48eeb7de466881688fc8d94e20974eb3f6169a609df3d guix-build-dd5c517757f9/output/x86_64-w64-mingw32/bitcoin-dd5c517757f9-win64-setup-unsigned.exe
28 c7d98f82a45f53fb1df1b77e826bcc9d36ca7cadf92838142281b3205d079a40 guix-build-dd5c517757f9/output/x86_64-w64-mingw32/bitcoin-dd5c517757f9-win64-unsigned.zip
CMAKE_SKIP_INSTALL_RPATH is removed from the build system, and CMAKE_SKIP_RPATH (which does more than CMAKE_SKIP_INSTALL_RPATH) is added to the Guix build. Can you also remove the (what looks like) AI generated content from the PR description and commit message. i.e the bullet pointed list of changes, for a 2 line diff.
Can you please fix the PR description and commit message?
CMAKE_SKIP_INSTALL_RPATHis removed from the build system, andCMAKE_SKIP_RPATH(which does more thanCMAKE_SKIP_INSTALL_RPATH) is added to the Guix build. Can you also remove the (what looks like) AI generated content from the PR description and commit message. i.e the bullet pointed list of changes, for a 2 line diff.
I think I’ve addressed the inaccuracies; thanks for the feedback. Regarding the bullet pointed list of changes, I was trying to follow the format and style I’ve seen in other PR descriptions on this project, but I can see how it was excessive. Does it look better to you now?
Remove CMAKE_SKIP_INSTALL_RPATH from CMakeLists.txt and add CMAKE_SKIP_RPATH to the Guix build script. This keeps build-environment-specific settings in the build scripts rather than hardcoded in the CMake configuration.
ACK 4b41f99d57d822dfc258865d1dad03204fe0380f
It is a tiny step towards “variables that start with CMAKE_ should not be set in CMakeLists.txtfiles”.
re ACK 4b41f99d57d822dfc258865d1dad03204fe0380f
Changes since last ack:
Guix Build
00dd1c0d4567f1eabfa23b88b1d26ca584ac97381f9572abaff3e0ad37f3b7ecf guix-build-4b41f99d57d8/output/aarch64-linux-gnu/SHA256SUMS.part
175bf3226050a5aad14bcf59b55dbf8b59ad7c287389c8ef42161bbff6eea070e guix-build-4b41f99d57d8/output/aarch64-linux-gnu/bitcoin-4b41f99d57d8-aarch64-linux-gnu-debug.tar.gz
2d45f01491dd6254066689e9516a3c96aee30ea6f60648f06dfdb8c364194908e guix-build-4b41f99d57d8/output/aarch64-linux-gnu/bitcoin-4b41f99d57d8-aarch64-linux-gnu.tar.gz
314338708b2ba862f2d25a0c80d370d7a0dbba6f084f6ba0e45db5839c2436ff7 guix-build-4b41f99d57d8/output/arm-linux-gnueabihf/SHA256SUMS.part
45dd110fa9ee6efb5fd6e7768feffe67e747867a90732a54c170a9eff91baaa9c guix-build-4b41f99d57d8/output/arm-linux-gnueabihf/bitcoin-4b41f99d57d8-arm-linux-gnueabihf-debug.tar.gz
570a40f7f204e72e52d218a14cd8e50a863013f8bf04a9f164fa593a7b9aff629 guix-build-4b41f99d57d8/output/arm-linux-gnueabihf/bitcoin-4b41f99d57d8-arm-linux-gnueabihf.tar.gz
6d14b489e779b2110801fa544cbaf328abe85645b1f7126a98286ebbc954c06e1 guix-build-4b41f99d57d8/output/arm64-apple-darwin/SHA256SUMS.part
76a1e17485d21f271ac979f0f61145d8055dd197536d164c95ff4e7e6a952ccec guix-build-4b41f99d57d8/output/arm64-apple-darwin/bitcoin-4b41f99d57d8-arm64-apple-darwin-codesigning.tar.gz
8ffe2b2bf1f6873e2661c1214c9ae1d3d94f06405742dcbd7f03555b296ddf1df guix-build-4b41f99d57d8/output/arm64-apple-darwin/bitcoin-4b41f99d57d8-arm64-apple-darwin-unsigned.tar.gz
9b00e2424e567b58634547ba6b0201fbeb9712757fa6da085648e70419ae76b53 guix-build-4b41f99d57d8/output/arm64-apple-darwin/bitcoin-4b41f99d57d8-arm64-apple-darwin-unsigned.zip
1071f6e5072a8792535dad4ed8ea9474f8d2fefc6c36f5aa0aa2f64af8bc9bddfb guix-build-4b41f99d57d8/output/dist-archive/bitcoin-4b41f99d57d8.tar.gz
11d1cb95740c3fc570de3e75a36fb0064fc58e408730bdf12191ee3f735a27bd0a guix-build-4b41f99d57d8/output/powerpc64-linux-gnu/SHA256SUMS.part
129c16ec470a79585db5ebea8e1f7582c7c9932dfe75f4658ac00cf9823f6b5121 guix-build-4b41f99d57d8/output/powerpc64-linux-gnu/bitcoin-4b41f99d57d8-powerpc64-linux-gnu-debug.tar.gz
13a875523e5cf753004f40004f51e52b4ad43c606e5d45304e04ab725fbfe193fa guix-build-4b41f99d57d8/output/powerpc64-linux-gnu/bitcoin-4b41f99d57d8-powerpc64-linux-gnu.tar.gz
142c7f4617739d00fbe5d7530082016d1d509947e45b0a49c6149e41a9294ef998 guix-build-4b41f99d57d8/output/riscv64-linux-gnu/SHA256SUMS.part
1550a4933ef622dd8614ba91898cdb932d448d6f42ba7cd902df02f703fad08e56 guix-build-4b41f99d57d8/output/riscv64-linux-gnu/bitcoin-4b41f99d57d8-riscv64-linux-gnu-debug.tar.gz
167e7ba0123a7cbb5a3522ef90498b3223e64f414e91703c79a0e0d58f5b7b70e7 guix-build-4b41f99d57d8/output/riscv64-linux-gnu/bitcoin-4b41f99d57d8-riscv64-linux-gnu.tar.gz
17035fc46cfb5084be0cef33c8e2279add22bd3d19ef9a39ad17b3f152139d5e22 guix-build-4b41f99d57d8/output/x86_64-apple-darwin/SHA256SUMS.part
184d1cf75e83a69a193ebb2b150023a9abfab134abd0d94dce9fab75d0eeb72c10 guix-build-4b41f99d57d8/output/x86_64-apple-darwin/bitcoin-4b41f99d57d8-x86_64-apple-darwin-codesigning.tar.gz
194f4338be7c1243a5437ff8e0f60e0190b7f7f091ff820b81b2301a4e3cfe4c10 guix-build-4b41f99d57d8/output/x86_64-apple-darwin/bitcoin-4b41f99d57d8-x86_64-apple-darwin-unsigned.tar.gz
20ded25fd8d043ced1138beee0446219803472f61cd36b1d4d9a8ef09485c94de1 guix-build-4b41f99d57d8/output/x86_64-apple-darwin/bitcoin-4b41f99d57d8-x86_64-apple-darwin-unsigned.zip
21f9f782d45cd54c51cf2157db383b4359d229b3d1b7bea3d217d2db5bbc53f3ca guix-build-4b41f99d57d8/output/x86_64-linux-gnu/SHA256SUMS.part
221a3464396905f1f5c09de72ad9b05efec494a48d1ad1b6d5f4d1e5f9a5cc884b guix-build-4b41f99d57d8/output/x86_64-linux-gnu/bitcoin-4b41f99d57d8-x86_64-linux-gnu-debug.tar.gz
23830f0337869cb97eaf0475f26e757a24ad2af781df37f402a82fb8d3a3e6e174 guix-build-4b41f99d57d8/output/x86_64-linux-gnu/bitcoin-4b41f99d57d8-x86_64-linux-gnu.tar.gz
243c9d0f9c467077bd0378e3048cf2ebf7f4f89bbc803ea32d22384351a6a6951f guix-build-4b41f99d57d8/output/x86_64-w64-mingw32/SHA256SUMS.part
255edad90c4537d2bf656bec9c778313559170ab2c0df68793d2deee1e80aee421 guix-build-4b41f99d57d8/output/x86_64-w64-mingw32/bitcoin-4b41f99d57d8-win64-codesigning.tar.gz
261c518a3fd7a303293fcf4a697e2c716404d8ed6f0af9b87fe971404f2c6c7e6c guix-build-4b41f99d57d8/output/x86_64-w64-mingw32/bitcoin-4b41f99d57d8-win64-debug.zip
279f85f6688edbfe630e80c5a54c0137c308b214d9d6b19f17bcd7238d23127bb2 guix-build-4b41f99d57d8/output/x86_64-w64-mingw32/bitcoin-4b41f99d57d8-win64-setup-unsigned.exe
2863dec9f90b0ad87b2e57e2dd13681b38c9172c44d64c754cc5b8838d98cb16ef guix-build-4b41f99d57d8/output/x86_64-w64-mingw32/bitcoin-4b41f99d57d8-win64-unsigned.zip