build: simplify *ifaddr handling

fanquake commented at 9:59 am on May 8, 2025: member

We really just want to skip this when building for Windows. So do that, and remove the two header checks (we also already use both of these headers, unguarded, in the !windows part of the codebase).

Squash the two *iffaddrs defines into one, as I haven’t seen an iffaddrs.h that implements one, but not the other.

DrahtBot commented at 10:00 am on May 8, 2025: 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/32446.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	hebasto, TheCharlatan

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

DrahtBot added the label Build system on May 8, 2025

hebasto commented at 12:26 pm on May 8, 2025: member

Concept ACK. I have considered a similar idea.

in cmake/bitcoin-build-config.h.in:59 in c983612fb4 outdated

61-
62-/* Define to 1 if you have the declaration of `getifaddrs', and to 0 if you
63-   don't. */
64-#cmakedefine01 HAVE_DECL_GETIFADDRS
65+/* Define to 1 if '*ifaddrs' are available. */
66+#cmakedefine01 HAVE_IFADDRS

hebasto commented at 1:02 pm on May 8, 2025:

“Define to 1 if ‘*ifaddrs’ are available” implies that “it remains undefined otherwise”. To achieve this, I suggest:

0/* Define to 1 if '*ifaddrs' are available. */
1#cmakedefine HAVE_IFADDRS 1

This also allows to replace the following #if HAVE_IFADDRS with #ifdef HAVE_IFADDRS.

fanquake force-pushed on May 8, 2025

in src/randomenv.cpp:42 in d8caa10c29 outdated

37@@ -38,7 +38,8 @@
38 #include <sys/utsname.h>
39 #include <unistd.h>
40 #endif
41-#if HAVE_DECL_GETIFADDRS && HAVE_DECL_FREEIFADDRS
42+#ifdef HAVE_IFADDRS
43+#include <sys/types.h>

hebasto commented at 3:48 pm on May 8, 2025:

nit: Is this really needed considering:https://github.com/bitcoin/bitcoin/blob/d8caa10c29321c9732dde3d4ccdcf0413041b33f/src/randomenv.cpp#L27 ?

fanquake commented at 3:50 pm on May 8, 2025:

I’ve dropped the addition.

hebasto approved

hebasto commented at 3:48 pm on May 8, 2025: member

Approach ACK d8caa10c29321c9732dde3d4ccdcf0413041b33f. I’ve reviewed the code. Still waiting for my Guix build.

hebasto commented at 3:49 pm on May 8, 2025: member

My Guix build:

 0aarch64
 15bde67b2713e02dbc6fcf5aa5b90e21df89f7fd04debb4ba13302a8e6bcabc53  guix-build-d8caa10c2932/output/aarch64-linux-gnu/SHA256SUMS.part
 209eeaa166590208ce1cdd5bd9298f4819a8b6014fdaf68f421f4797f5bc2d034  guix-build-d8caa10c2932/output/aarch64-linux-gnu/bitcoin-d8caa10c2932-aarch64-linux-gnu-debug.tar.gz
 32ecfed14ba3fd7ee565969023e78b810a432042f719c30dd7962b6e070d712ef  guix-build-d8caa10c2932/output/aarch64-linux-gnu/bitcoin-d8caa10c2932-aarch64-linux-gnu.tar.gz
 41924ef5f504dc356f0c9d999f7273b9c949a6de743c728e51b396cefa744b1f1  guix-build-d8caa10c2932/output/arm-linux-gnueabihf/SHA256SUMS.part
 508f3144d43d9fe98c0cbf22a8e7e31f98a42861accb2c609ee1e524331b24e1c  guix-build-d8caa10c2932/output/arm-linux-gnueabihf/bitcoin-d8caa10c2932-arm-linux-gnueabihf-debug.tar.gz
 618fdca1d63671eb240609f8ac6399f10f2e51fcdeef50c314c1f9655f93d4b60  guix-build-d8caa10c2932/output/arm-linux-gnueabihf/bitcoin-d8caa10c2932-arm-linux-gnueabihf.tar.gz
 7b97187145dcf6cac1dd667a98717980d007f54ca1e623a720ad7c6440266bfc4  guix-build-d8caa10c2932/output/arm64-apple-darwin/SHA256SUMS.part
 80c5c5ce5a15d1b74a1dc2d0caeb1bc50b9e569c6cc62fc0844091780ad97bdd9  guix-build-d8caa10c2932/output/arm64-apple-darwin/bitcoin-d8caa10c2932-arm64-apple-darwin-codesigning.tar.gz
 9a225088504d2296940ffa17a91700ee0006076111b2e4e39f26e8c9bd304a336  guix-build-d8caa10c2932/output/arm64-apple-darwin/bitcoin-d8caa10c2932-arm64-apple-darwin-unsigned.tar.gz
1078df48f1982f21c28a368a092e67e60505540bb7d65d6021b93414a136a1edad  guix-build-d8caa10c2932/output/arm64-apple-darwin/bitcoin-d8caa10c2932-arm64-apple-darwin-unsigned.zip
11aa184059258c3a5be6edde55bcb2b53023532ba9e53b3fe50ff3e8d4e2651672  guix-build-d8caa10c2932/output/dist-archive/bitcoin-d8caa10c2932.tar.gz
122f7c968d27968547fb588ec59ee52de94458ea255e22b0187954a60bada77079  guix-build-d8caa10c2932/output/powerpc64-linux-gnu/SHA256SUMS.part
1394551e83f834c3b021184e28ca43d632afd6c8451a431365fb18888f5fbe7262  guix-build-d8caa10c2932/output/powerpc64-linux-gnu/bitcoin-d8caa10c2932-powerpc64-linux-gnu-debug.tar.gz
14905fec6065a0989c7a6e570db5db7bcc8d6237a270031d718373c5a9eea32536  guix-build-d8caa10c2932/output/powerpc64-linux-gnu/bitcoin-d8caa10c2932-powerpc64-linux-gnu.tar.gz
15c94cf35994d793cd810d6b52175516129e0403aab0bc382764063a5940c862de  guix-build-d8caa10c2932/output/riscv64-linux-gnu/SHA256SUMS.part
16863b8db44e2e216084bf0f6e71e80fbfe85fd1af2489fcc24a0844407c5371de  guix-build-d8caa10c2932/output/riscv64-linux-gnu/bitcoin-d8caa10c2932-riscv64-linux-gnu-debug.tar.gz
171a2e6eb370b680f78e54c9fff36148978a17fc5c6cbef25210a86ef58b14d5b4  guix-build-d8caa10c2932/output/riscv64-linux-gnu/bitcoin-d8caa10c2932-riscv64-linux-gnu.tar.gz
187e984b15a4b298a8ecc727aa5902bbb554e27324ec55a16d420e576102262b59  guix-build-d8caa10c2932/output/x86_64-apple-darwin/SHA256SUMS.part
19f748874f8a1616dc1a74652f54de60ed634ba3b1e6d705db86c0770239131387  guix-build-d8caa10c2932/output/x86_64-apple-darwin/bitcoin-d8caa10c2932-x86_64-apple-darwin-codesigning.tar.gz
20f2ba34bfb892799e3d3985009dfea155cbf3bf4c218208b74d1e0e3d830fcdd3  guix-build-d8caa10c2932/output/x86_64-apple-darwin/bitcoin-d8caa10c2932-x86_64-apple-darwin-unsigned.tar.gz
2124f7b5cee23a21d6ffedf6b7a09679a93d6ed5bf231072d67e06a34f1267b45a  guix-build-d8caa10c2932/output/x86_64-apple-darwin/bitcoin-d8caa10c2932-x86_64-apple-darwin-unsigned.zip
221097254a396200ccf424e752269c9899a7657547cf8751ac84d3f504a8b0d173  guix-build-d8caa10c2932/output/x86_64-linux-gnu/SHA256SUMS.part
2383f5d7d37a1a1337cd141c49e2d40ea6c970cb7baf1de4be95af026f49284ed1  guix-build-d8caa10c2932/output/x86_64-linux-gnu/bitcoin-d8caa10c2932-x86_64-linux-gnu-debug.tar.gz
246663b30e30229ddd6f406af3cb9d554b4b8ed19675d8bc8bb781346653de50ec  guix-build-d8caa10c2932/output/x86_64-linux-gnu/bitcoin-d8caa10c2932-x86_64-linux-gnu.tar.gz
25aeb2cffca909a1d5137f1878643255b3627740ef40f35176050c54fbf79faeca  guix-build-d8caa10c2932/output/x86_64-w64-mingw32/SHA256SUMS.part
26a692f518f4493f4b61f78cac1e4d319fcbb930c5ba11b6c26563d4d2fbaacde7  guix-build-d8caa10c2932/output/x86_64-w64-mingw32/bitcoin-d8caa10c2932-win64-codesigning.tar.gz
2757338da73a095e175f554ec0cf66f5016cbae6a510d07205de9589d7d4ca6326  guix-build-d8caa10c2932/output/x86_64-w64-mingw32/bitcoin-d8caa10c2932-win64-debug.zip
28519bc8462d3f3f1d3f07856cd2d0014b5cb57f7ae4b20c2887df09678ff304a1  guix-build-d8caa10c2932/output/x86_64-w64-mingw32/bitcoin-d8caa10c2932-win64-setup-unsigned.exe
29e4bf3330751ff8fc0df502f9debc554a7fdff650190996bf2ce91c69bd7ca652  guix-build-d8caa10c2932/output/x86_64-w64-mingw32/bitcoin-d8caa10c2932-win64-unsigned.zip

build: simplify *ifaddr handling

We really just want to skip this when building for Windows. So do that,
and remove the two header checks (we also already use both of these
headers, unguarded, in the !windows part of the codebase).

Squash the two *iffaddrs defines into one, as I haven't seen an
iffaddrs.h that implements one, but not the other.

ab878a7e74

fanquake force-pushed on May 8, 2025

hebasto approved

hebasto commented at 3:54 pm on May 8, 2025: member

ACK ab878a7e741073574336c9c4b1d41c6cf80b0d6a. Only addressed my comment and rebased since my recent review.

fanquake commented at 4:48 pm on May 8, 2025: member

Guix Build:

 02d1c74e19e10c55a45e137f151f77f0e0628c96f0664949ba730c249e8065597  guix-build-ab878a7e7410/output/aarch64-linux-gnu/SHA256SUMS.part
 126cb4ed3dcaf1bfc2d2f9cdc34e8648df11e2aed33bdeb8618a6d8a3370ba0e3  guix-build-ab878a7e7410/output/aarch64-linux-gnu/bitcoin-ab878a7e7410-aarch64-linux-gnu-debug.tar.gz
 2756e79f7a151b67edc7b607f4b3b0baa72025dbf7cc158e27485f885fbd6adc1  guix-build-ab878a7e7410/output/aarch64-linux-gnu/bitcoin-ab878a7e7410-aarch64-linux-gnu.tar.gz
 34485cf2be98328ed1bc5781f5d6461200a39172bce220af2b6546eb9b1351d1b  guix-build-ab878a7e7410/output/arm-linux-gnueabihf/SHA256SUMS.part
 47d01c48e21f1e30f50afa746c74b80460ef1f8d8bae4baabbd6d4966130b140e  guix-build-ab878a7e7410/output/arm-linux-gnueabihf/bitcoin-ab878a7e7410-arm-linux-gnueabihf-debug.tar.gz
 52f27cc3dc3b22f8719e4d48c10121eaf5a39ab8be8f0bcb2769d3ca7826fafd4  guix-build-ab878a7e7410/output/arm-linux-gnueabihf/bitcoin-ab878a7e7410-arm-linux-gnueabihf.tar.gz
 6e3b00914b98d89f68123f224995a2fa1571a7cae6c83914934b356b967b39dde  guix-build-ab878a7e7410/output/arm64-apple-darwin/SHA256SUMS.part
 73b2614ca024472ed25064eaec19d28f80eb06662034d8d160ee12947c012f2e4  guix-build-ab878a7e7410/output/arm64-apple-darwin/bitcoin-ab878a7e7410-arm64-apple-darwin-codesigning.tar.gz
 8ec5798744dbbef2990dbae2b438af1750eb5ff37937679eadf91841b36156212  guix-build-ab878a7e7410/output/arm64-apple-darwin/bitcoin-ab878a7e7410-arm64-apple-darwin-unsigned.tar.gz
 95ce548357daeb6e9feb2e3122ee45d548435e8469dc3ad3f8337449b65151625  guix-build-ab878a7e7410/output/arm64-apple-darwin/bitcoin-ab878a7e7410-arm64-apple-darwin-unsigned.zip
1043d9c124506665a69c6f61bc6f1e1a0837f1cc04e855fe26b9432a311a3814ac  guix-build-ab878a7e7410/output/dist-archive/bitcoin-ab878a7e7410.tar.gz
1105979e862f23ad732d8f840939ee0fa94e3e76dc290f8dd268e73409b4de48a0  guix-build-ab878a7e7410/output/powerpc64-linux-gnu/SHA256SUMS.part
126e83d76f9bef5e73bf34a9d0f3c654a9e374c094c7c11008eecffecf3dd63830  guix-build-ab878a7e7410/output/powerpc64-linux-gnu/bitcoin-ab878a7e7410-powerpc64-linux-gnu-debug.tar.gz
13307e088d618833548926763c0e96c07e73c3d4bab831bc5bf2d2ed8eaa4ef6a7  guix-build-ab878a7e7410/output/powerpc64-linux-gnu/bitcoin-ab878a7e7410-powerpc64-linux-gnu.tar.gz
14b31ebb1181cf00f3979912a867db7230d2c0f4540f8d9f0da016de891c78c327  guix-build-ab878a7e7410/output/riscv64-linux-gnu/SHA256SUMS.part
1559a4246d7a9ebc0310f9fb336a267550bbafcfd2542b6d8ca4a5f68e02836ece  guix-build-ab878a7e7410/output/riscv64-linux-gnu/bitcoin-ab878a7e7410-riscv64-linux-gnu-debug.tar.gz
1619f39c2d494f779fa198d66009b4af462a2f12602d8221c724fb81196902bf1f  guix-build-ab878a7e7410/output/riscv64-linux-gnu/bitcoin-ab878a7e7410-riscv64-linux-gnu.tar.gz
174511896ce4c5cd82d9934d70ac3af86619c11f8f61a2898eeb47ba7c13687a69  guix-build-ab878a7e7410/output/x86_64-apple-darwin/SHA256SUMS.part
1895a40342d4a2ce1a8e4683d738612ce6cec860876fce663e2fa7fdd2db3486d7  guix-build-ab878a7e7410/output/x86_64-apple-darwin/bitcoin-ab878a7e7410-x86_64-apple-darwin-codesigning.tar.gz
19c37438fe5ad4540545621455a8a3abb0b1af1d41833db039418d02a552102a3d  guix-build-ab878a7e7410/output/x86_64-apple-darwin/bitcoin-ab878a7e7410-x86_64-apple-darwin-unsigned.tar.gz
2034d1b3b7d996b1aa5f83ee26b982475293f31ffe6cbbae7ae2a8300d10b83d9d  guix-build-ab878a7e7410/output/x86_64-apple-darwin/bitcoin-ab878a7e7410-x86_64-apple-darwin-unsigned.zip
217eb76b282787b381d7f9458ed1c21b17734ee1fb870f6036f9a30621b86a9bd4  guix-build-ab878a7e7410/output/x86_64-linux-gnu/SHA256SUMS.part
22789902727693decf71d5e9007e8984bf384b31fa1282d61682dde5c457a62005  guix-build-ab878a7e7410/output/x86_64-linux-gnu/bitcoin-ab878a7e7410-x86_64-linux-gnu-debug.tar.gz
237d9c75597e3ffe04ec477af91d2f5f69ec22814072da06ffc6259ea3d8a49c81  guix-build-ab878a7e7410/output/x86_64-linux-gnu/bitcoin-ab878a7e7410-x86_64-linux-gnu.tar.gz
24f8cac39b5e4a671cd2953020ee9d82ed85504c72e0973d3241dd608ceb54d047  guix-build-ab878a7e7410/output/x86_64-w64-mingw32/SHA256SUMS.part
25c95854c25a7e7367d9059e24aa7d27953443cd2ba5aed799f4071b787d0a56d2  guix-build-ab878a7e7410/output/x86_64-w64-mingw32/bitcoin-ab878a7e7410-win64-codesigning.tar.gz
26c303916174d915eee4cb810ab3e9d861ff7f65fd63980d67cc1ae1cce6b43348  guix-build-ab878a7e7410/output/x86_64-w64-mingw32/bitcoin-ab878a7e7410-win64-debug.zip
279503047900e3b6abaa2db9289d74ae8edbc15bf713e9a5f810e2ba1720268ec0  guix-build-ab878a7e7410/output/x86_64-w64-mingw32/bitcoin-ab878a7e7410-win64-setup-unsigned.exe
282239345aa7214a3d99cb80a0806a860ea49dad3cfdb47399c739619bf235bc8f  guix-build-ab878a7e7410/output/x86_64-w64-mingw32/bitcoin-ab878a7e7410-win64-unsigned.zip

TheCharlatan commented at 1:02 pm on May 9, 2025: contributor

lgtm, waiting for guix build.

TheCharlatan approved

TheCharlatan commented at 7:37 pm on May 9, 2025: contributor

ACK ab878a7e741073574336c9c4b1d41c6cf80b0d6a

Guix build (aarch64):

 02d1c74e19e10c55a45e137f151f77f0e0628c96f0664949ba730c249e8065597  guix-build-ab878a7e7410/output/aarch64-linux-gnu/SHA256SUMS.part
 126cb4ed3dcaf1bfc2d2f9cdc34e8648df11e2aed33bdeb8618a6d8a3370ba0e3  guix-build-ab878a7e7410/output/aarch64-linux-gnu/bitcoin-ab878a7e7410-aarch64-linux-gnu-debug.tar.gz
 2756e79f7a151b67edc7b607f4b3b0baa72025dbf7cc158e27485f885fbd6adc1  guix-build-ab878a7e7410/output/aarch64-linux-gnu/bitcoin-ab878a7e7410-aarch64-linux-gnu.tar.gz
 34485cf2be98328ed1bc5781f5d6461200a39172bce220af2b6546eb9b1351d1b  guix-build-ab878a7e7410/output/arm-linux-gnueabihf/SHA256SUMS.part
 47d01c48e21f1e30f50afa746c74b80460ef1f8d8bae4baabbd6d4966130b140e  guix-build-ab878a7e7410/output/arm-linux-gnueabihf/bitcoin-ab878a7e7410-arm-linux-gnueabihf-debug.tar.gz
 52f27cc3dc3b22f8719e4d48c10121eaf5a39ab8be8f0bcb2769d3ca7826fafd4  guix-build-ab878a7e7410/output/arm-linux-gnueabihf/bitcoin-ab878a7e7410-arm-linux-gnueabihf.tar.gz
 6e3b00914b98d89f68123f224995a2fa1571a7cae6c83914934b356b967b39dde  guix-build-ab878a7e7410/output/arm64-apple-darwin/SHA256SUMS.part
 73b2614ca024472ed25064eaec19d28f80eb06662034d8d160ee12947c012f2e4  guix-build-ab878a7e7410/output/arm64-apple-darwin/bitcoin-ab878a7e7410-arm64-apple-darwin-codesigning.tar.gz
 8ec5798744dbbef2990dbae2b438af1750eb5ff37937679eadf91841b36156212  guix-build-ab878a7e7410/output/arm64-apple-darwin/bitcoin-ab878a7e7410-arm64-apple-darwin-unsigned.tar.gz
 95ce548357daeb6e9feb2e3122ee45d548435e8469dc3ad3f8337449b65151625  guix-build-ab878a7e7410/output/arm64-apple-darwin/bitcoin-ab878a7e7410-arm64-apple-darwin-unsigned.zip
1043d9c124506665a69c6f61bc6f1e1a0837f1cc04e855fe26b9432a311a3814ac  guix-build-ab878a7e7410/output/dist-archive/bitcoin-ab878a7e7410.tar.gz
1105979e862f23ad732d8f840939ee0fa94e3e76dc290f8dd268e73409b4de48a0  guix-build-ab878a7e7410/output/powerpc64-linux-gnu/SHA256SUMS.part
126e83d76f9bef5e73bf34a9d0f3c654a9e374c094c7c11008eecffecf3dd63830  guix-build-ab878a7e7410/output/powerpc64-linux-gnu/bitcoin-ab878a7e7410-powerpc64-linux-gnu-debug.tar.gz
13307e088d618833548926763c0e96c07e73c3d4bab831bc5bf2d2ed8eaa4ef6a7  guix-build-ab878a7e7410/output/powerpc64-linux-gnu/bitcoin-ab878a7e7410-powerpc64-linux-gnu.tar.gz
14b31ebb1181cf00f3979912a867db7230d2c0f4540f8d9f0da016de891c78c327  guix-build-ab878a7e7410/output/riscv64-linux-gnu/SHA256SUMS.part
1559a4246d7a9ebc0310f9fb336a267550bbafcfd2542b6d8ca4a5f68e02836ece  guix-build-ab878a7e7410/output/riscv64-linux-gnu/bitcoin-ab878a7e7410-riscv64-linux-gnu-debug.tar.gz
1619f39c2d494f779fa198d66009b4af462a2f12602d8221c724fb81196902bf1f  guix-build-ab878a7e7410/output/riscv64-linux-gnu/bitcoin-ab878a7e7410-riscv64-linux-gnu.tar.gz
174511896ce4c5cd82d9934d70ac3af86619c11f8f61a2898eeb47ba7c13687a69  guix-build-ab878a7e7410/output/x86_64-apple-darwin/SHA256SUMS.part
1895a40342d4a2ce1a8e4683d738612ce6cec860876fce663e2fa7fdd2db3486d7  guix-build-ab878a7e7410/output/x86_64-apple-darwin/bitcoin-ab878a7e7410-x86_64-apple-darwin-codesigning.tar.gz
19c37438fe5ad4540545621455a8a3abb0b1af1d41833db039418d02a552102a3d  guix-build-ab878a7e7410/output/x86_64-apple-darwin/bitcoin-ab878a7e7410-x86_64-apple-darwin-unsigned.tar.gz
2034d1b3b7d996b1aa5f83ee26b982475293f31ffe6cbbae7ae2a8300d10b83d9d  guix-build-ab878a7e7410/output/x86_64-apple-darwin/bitcoin-ab878a7e7410-x86_64-apple-darwin-unsigned.zip
217eb76b282787b381d7f9458ed1c21b17734ee1fb870f6036f9a30621b86a9bd4  guix-build-ab878a7e7410/output/x86_64-linux-gnu/SHA256SUMS.part
22789902727693decf71d5e9007e8984bf384b31fa1282d61682dde5c457a62005  guix-build-ab878a7e7410/output/x86_64-linux-gnu/bitcoin-ab878a7e7410-x86_64-linux-gnu-debug.tar.gz
237d9c75597e3ffe04ec477af91d2f5f69ec22814072da06ffc6259ea3d8a49c81  guix-build-ab878a7e7410/output/x86_64-linux-gnu/bitcoin-ab878a7e7410-x86_64-linux-gnu.tar.gz
24f8cac39b5e4a671cd2953020ee9d82ed85504c72e0973d3241dd608ceb54d047  guix-build-ab878a7e7410/output/x86_64-w64-mingw32/SHA256SUMS.part
25c95854c25a7e7367d9059e24aa7d27953443cd2ba5aed799f4071b787d0a56d2  guix-build-ab878a7e7410/output/x86_64-w64-mingw32/bitcoin-ab878a7e7410-win64-codesigning.tar.gz
26c303916174d915eee4cb810ab3e9d861ff7f65fd63980d67cc1ae1cce6b43348  guix-build-ab878a7e7410/output/x86_64-w64-mingw32/bitcoin-ab878a7e7410-win64-debug.zip
279503047900e3b6abaa2db9289d74ae8edbc15bf713e9a5f810e2ba1720268ec0  guix-build-ab878a7e7410/output/x86_64-w64-mingw32/bitcoin-ab878a7e7410-win64-setup-unsigned.exe
282239345aa7214a3d99cb80a0806a860ea49dad3cfdb47399c739619bf235bc8f  guix-build-ab878a7e7410/output/x86_64-w64-mingw32/bitcoin-ab878a7e7410-win64-unsigned.zip

fanquake merged this on May 10, 2025

fanquake closed this on May 10, 2025

fanquake deleted the branch on May 10, 2025

build: simplify *ifaddr handling #32446

Code Coverage & Benchmarks

Reviews