depends: build libnatpmp with CMake

fanquake commented at 5:55 pm on March 22, 2024: member

This picks up one of the changes from #29232, which is a switch to building libnatpmp with CMake. It includes an update to the most recent version of libnatpmp (https://github.com/miniupnp/libnatpmp/commit/f2433bec24ca3d3f22a8a7840728a3ac177f94ba), which includes (https://github.com/miniupnp/libnatpmp/pull/43).

From an initial look I couldn’t find any significant difference between the Autotools and CMake produced libs.

DrahtBot commented at 5:55 pm on March 22, 2024: contributor

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	hebasto, m3dwards, 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:

#29707 (depends: build miniupnpc with CMake 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.

DrahtBot added the label Build system on Mar 22, 2024

hebasto commented at 5:59 pm on March 22, 2024: member

Concept ACK.

DrahtBot added the label Needs rebase on Mar 25, 2024

fanquake force-pushed on Mar 25, 2024

fanquake marked this as ready for review on Mar 25, 2024

DrahtBot removed the label Needs rebase on Mar 25, 2024

in depends/packages/libnatpmp.mk:6 in 1b0102e038 outdated

0@@ -1,26 +1,20 @@
1 package=libnatpmp
2-$(package)_version=07004b97cf691774efebe70404cf22201e4d330d
3+$(package)_version=f2433bec24ca3d3f22a8a7840728a3ac177f94ba
4 $(package)_download_path=https://github.com/miniupnp/libnatpmp/archive
5 $(package)_file_name=$($(package)_version).tar.gz
6-$(package)_sha256_hash=9321953ceb39d07c25463e266e50d0ae7b64676bb3a986d932b18881ed94f1fb
7-$(package)_patches=no_libtool.patch

TheCharlatan commented at 7:50 am on March 26, 2024:

Can delete the patch?

fanquake commented at 9:23 am on March 26, 2024:

Thanks, removed.

fanquake force-pushed on Mar 26, 2024

depends: libnatpmp f2433bec24ca3d3f22a8a7840728a3ac177f94ba

This includes once CMake related change I upstreamed:
https://github.com/miniupnp/libnatpmp/pull/43.

72ba7b5d26

depends: switch libnatpmp to CMake

Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>

3c1ae3ee33

fanquake force-pushed on Apr 5, 2024

TheCharlatan commented at 8:06 pm on April 5, 2024: contributor

Guix build (x86_64):

 0a134241bc9ff9823ce078ea10dbac544ff63536ee3f66fb557414ca191b1d62d  guix-build-3c1ae3ee33d4/output/aarch64-linux-gnu/SHA256SUMS.part
 1f5a46ab7a5faae9ce50b2d084cf65d14372b354b9f8369178f1348b70a3b675b  guix-build-3c1ae3ee33d4/output/aarch64-linux-gnu/bitcoin-3c1ae3ee33d4-aarch64-linux-gnu-debug.tar.gz
 2e2353ed4f0738026fe16cd90b503ef2f02f31e0b68ba42ea80924997225ae374  guix-build-3c1ae3ee33d4/output/aarch64-linux-gnu/bitcoin-3c1ae3ee33d4-aarch64-linux-gnu.tar.gz
 378060899627e9449977151dce2b8125ef3f17b1050e0396c9f907ef963f55ab1  guix-build-3c1ae3ee33d4/output/arm-linux-gnueabihf/SHA256SUMS.part
 44f71666871fe889ee484cfeefe577d33760453113542fe39eab2ac2bfd34030e  guix-build-3c1ae3ee33d4/output/arm-linux-gnueabihf/bitcoin-3c1ae3ee33d4-arm-linux-gnueabihf-debug.tar.gz
 5fbc516363e389f477596165f5dd54b652cd868a8da91c5647364b0fa76223807  guix-build-3c1ae3ee33d4/output/arm-linux-gnueabihf/bitcoin-3c1ae3ee33d4-arm-linux-gnueabihf.tar.gz
 65811efb8663f1e353525908f9b98594fa88d563af157c988b194fd125c958f4c  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/SHA256SUMS.part
 710e7f27dc83c471f1fa2ef5e683ae30b592c9077d6648fee45545f6c7a76b556  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/bitcoin-3c1ae3ee33d4-arm64-apple-darwin-unsigned.tar.gz
 84b9d4714bbec7304969043abd51b0b5391120ec3295c58516741e3d06e550362  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/bitcoin-3c1ae3ee33d4-arm64-apple-darwin-unsigned.zip
 9c026a9c6975db5ce11d0005cf0640877ae59d4933a5654e8af80c9e55017b065  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/bitcoin-3c1ae3ee33d4-arm64-apple-darwin.tar.gz
103c8b6655d2fb37aa1abef62852a602025b089cac54870f5dadd4d3030efcc11e  guix-build-3c1ae3ee33d4/output/dist-archive/bitcoin-3c1ae3ee33d4.tar.gz
11ffdec3a09f67bf1813dac52021b35a93fe7574507d365db7fd89eeefe6a39086  guix-build-3c1ae3ee33d4/output/powerpc64-linux-gnu/SHA256SUMS.part
12af0a7e085c00b1ef6195ed578b03d50a4ac095dcc06076967efde0001e2df6f8  guix-build-3c1ae3ee33d4/output/powerpc64-linux-gnu/bitcoin-3c1ae3ee33d4-powerpc64-linux-gnu-debug.tar.gz
135f6d9a5d629c3c23fa2b9b3d5bf358b58e0bb967303d716edbd237511890820f  guix-build-3c1ae3ee33d4/output/powerpc64-linux-gnu/bitcoin-3c1ae3ee33d4-powerpc64-linux-gnu.tar.gz
14492661b9b094ef28af4c15fc778ad98bfdd6555084929ebe78bf7f9c2ef7da8d  guix-build-3c1ae3ee33d4/output/riscv64-linux-gnu/SHA256SUMS.part
15d11cfef1935eb8eca30eb5daf274192527d8efd8e0e1fb89b921b07f7e75cfc7  guix-build-3c1ae3ee33d4/output/riscv64-linux-gnu/bitcoin-3c1ae3ee33d4-riscv64-linux-gnu-debug.tar.gz
165b7b5dc5dba62981b6258dff4d2d7de4ef4fb942d46f791217bfcb68e63371ae  guix-build-3c1ae3ee33d4/output/riscv64-linux-gnu/bitcoin-3c1ae3ee33d4-riscv64-linux-gnu.tar.gz
17dfe114ec00ac686e72f7c4fdcc186dc59721edacb3f95b4c09359931ec1c156f  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/SHA256SUMS.part
1873e92f868e21325fab2a8209b421078e4bc78d004bb5484b7775d2f93e8e10ce  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/bitcoin-3c1ae3ee33d4-x86_64-apple-darwin-unsigned.tar.gz
1937e9420d74102a5b4e8da8e01b9cdc0321e92e348f2c3ce96968556867f3dd92  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/bitcoin-3c1ae3ee33d4-x86_64-apple-darwin-unsigned.zip
2083d8297e31a1d18bfe5e17aa06d47a613a6a53361a62b69e784bace682b28757  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/bitcoin-3c1ae3ee33d4-x86_64-apple-darwin.tar.gz
214eee423fb1e5a570a5cbbf0a911a785e7760f990bce4e79b10a0173e664b0943  guix-build-3c1ae3ee33d4/output/x86_64-linux-gnu/SHA256SUMS.part
224284bc6e2cd40aa91eb8c190907ee7baa39e999ff3e699f53d3a851be9b0eeea  guix-build-3c1ae3ee33d4/output/x86_64-linux-gnu/bitcoin-3c1ae3ee33d4-x86_64-linux-gnu-debug.tar.gz
23a88b4ad6be5f03bfe4283c9d5d4a3eec2b74307995c6a5286dd0ab930d2240b5  guix-build-3c1ae3ee33d4/output/x86_64-linux-gnu/bitcoin-3c1ae3ee33d4-x86_64-linux-gnu.tar.gz
244037f7f339beee475220e7261b698356a636889b6482019483632900e646c31c  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/SHA256SUMS.part
25f2d372664062179a380907f91af47d2d6585ace72498aa2f86d7a14540f737d3  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64-debug.zip
26ec6a5638012a1b278f84be31004c2820b0305abc41a494671ca5e483e4f1c649  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64-setup-unsigned.exe
2759eedae949fd796aa6e17bfeee7786ffb8d34fd56c1502a49f3ca6ba0be91d4a  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64-unsigned.tar.gz
282d02b86f88065fb1023938f8f1e1c012560903ee181d9212558e29ab80ed6530  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64.zip

DrahtBot added the label CI failed on Apr 18, 2024

hebasto commented at 7:29 pm on April 20, 2024: member

Approach ACK 3c1ae3ee33d4d9dbea046d5ab8ee924a12982759.

I’ve verified compiler flags for different scenarios, including cross-compiling for Windows and providing DEBUG=1. CMake ones lack -Wall -Wextra flags, but that’s not a blocker.

Also this PR limits the installed headers to ones that are actually used in our code, which is fine.

hebasto commented at 10:48 pm on April 20, 2024: member

My Guix builds:

 0x86_64
 1a134241bc9ff9823ce078ea10dbac544ff63536ee3f66fb557414ca191b1d62d  guix-build-3c1ae3ee33d4/output/aarch64-linux-gnu/SHA256SUMS.part
 2f5a46ab7a5faae9ce50b2d084cf65d14372b354b9f8369178f1348b70a3b675b  guix-build-3c1ae3ee33d4/output/aarch64-linux-gnu/bitcoin-3c1ae3ee33d4-aarch64-linux-gnu-debug.tar.gz
 3e2353ed4f0738026fe16cd90b503ef2f02f31e0b68ba42ea80924997225ae374  guix-build-3c1ae3ee33d4/output/aarch64-linux-gnu/bitcoin-3c1ae3ee33d4-aarch64-linux-gnu.tar.gz
 478060899627e9449977151dce2b8125ef3f17b1050e0396c9f907ef963f55ab1  guix-build-3c1ae3ee33d4/output/arm-linux-gnueabihf/SHA256SUMS.part
 54f71666871fe889ee484cfeefe577d33760453113542fe39eab2ac2bfd34030e  guix-build-3c1ae3ee33d4/output/arm-linux-gnueabihf/bitcoin-3c1ae3ee33d4-arm-linux-gnueabihf-debug.tar.gz
 6fbc516363e389f477596165f5dd54b652cd868a8da91c5647364b0fa76223807  guix-build-3c1ae3ee33d4/output/arm-linux-gnueabihf/bitcoin-3c1ae3ee33d4-arm-linux-gnueabihf.tar.gz
 75811efb8663f1e353525908f9b98594fa88d563af157c988b194fd125c958f4c  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/SHA256SUMS.part
 810e7f27dc83c471f1fa2ef5e683ae30b592c9077d6648fee45545f6c7a76b556  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/bitcoin-3c1ae3ee33d4-arm64-apple-darwin-unsigned.tar.gz
 94b9d4714bbec7304969043abd51b0b5391120ec3295c58516741e3d06e550362  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/bitcoin-3c1ae3ee33d4-arm64-apple-darwin-unsigned.zip
10c026a9c6975db5ce11d0005cf0640877ae59d4933a5654e8af80c9e55017b065  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/bitcoin-3c1ae3ee33d4-arm64-apple-darwin.tar.gz
113c8b6655d2fb37aa1abef62852a602025b089cac54870f5dadd4d3030efcc11e  guix-build-3c1ae3ee33d4/output/dist-archive/bitcoin-3c1ae3ee33d4.tar.gz
12ffdec3a09f67bf1813dac52021b35a93fe7574507d365db7fd89eeefe6a39086  guix-build-3c1ae3ee33d4/output/powerpc64-linux-gnu/SHA256SUMS.part
13af0a7e085c00b1ef6195ed578b03d50a4ac095dcc06076967efde0001e2df6f8  guix-build-3c1ae3ee33d4/output/powerpc64-linux-gnu/bitcoin-3c1ae3ee33d4-powerpc64-linux-gnu-debug.tar.gz
145f6d9a5d629c3c23fa2b9b3d5bf358b58e0bb967303d716edbd237511890820f  guix-build-3c1ae3ee33d4/output/powerpc64-linux-gnu/bitcoin-3c1ae3ee33d4-powerpc64-linux-gnu.tar.gz
15492661b9b094ef28af4c15fc778ad98bfdd6555084929ebe78bf7f9c2ef7da8d  guix-build-3c1ae3ee33d4/output/riscv64-linux-gnu/SHA256SUMS.part
16d11cfef1935eb8eca30eb5daf274192527d8efd8e0e1fb89b921b07f7e75cfc7  guix-build-3c1ae3ee33d4/output/riscv64-linux-gnu/bitcoin-3c1ae3ee33d4-riscv64-linux-gnu-debug.tar.gz
175b7b5dc5dba62981b6258dff4d2d7de4ef4fb942d46f791217bfcb68e63371ae  guix-build-3c1ae3ee33d4/output/riscv64-linux-gnu/bitcoin-3c1ae3ee33d4-riscv64-linux-gnu.tar.gz
18dfe114ec00ac686e72f7c4fdcc186dc59721edacb3f95b4c09359931ec1c156f  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/SHA256SUMS.part
1973e92f868e21325fab2a8209b421078e4bc78d004bb5484b7775d2f93e8e10ce  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/bitcoin-3c1ae3ee33d4-x86_64-apple-darwin-unsigned.tar.gz
2037e9420d74102a5b4e8da8e01b9cdc0321e92e348f2c3ce96968556867f3dd92  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/bitcoin-3c1ae3ee33d4-x86_64-apple-darwin-unsigned.zip
2183d8297e31a1d18bfe5e17aa06d47a613a6a53361a62b69e784bace682b28757  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/bitcoin-3c1ae3ee33d4-x86_64-apple-darwin.tar.gz
224eee423fb1e5a570a5cbbf0a911a785e7760f990bce4e79b10a0173e664b0943  guix-build-3c1ae3ee33d4/output/x86_64-linux-gnu/SHA256SUMS.part
234284bc6e2cd40aa91eb8c190907ee7baa39e999ff3e699f53d3a851be9b0eeea  guix-build-3c1ae3ee33d4/output/x86_64-linux-gnu/bitcoin-3c1ae3ee33d4-x86_64-linux-gnu-debug.tar.gz
24a88b4ad6be5f03bfe4283c9d5d4a3eec2b74307995c6a5286dd0ab930d2240b5  guix-build-3c1ae3ee33d4/output/x86_64-linux-gnu/bitcoin-3c1ae3ee33d4-x86_64-linux-gnu.tar.gz
254037f7f339beee475220e7261b698356a636889b6482019483632900e646c31c  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/SHA256SUMS.part
26f2d372664062179a380907f91af47d2d6585ace72498aa2f86d7a14540f737d3  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64-debug.zip
27ec6a5638012a1b278f84be31004c2820b0305abc41a494671ca5e483e4f1c649  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64-setup-unsigned.exe
2859eedae949fd796aa6e17bfeee7786ffb8d34fd56c1502a49f3ca6ba0be91d4a  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64-unsigned.tar.gz
292d02b86f88065fb1023938f8f1e1c012560903ee181d9212558e29ab80ed6530  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64.zip

hebasto approved

hebasto commented at 10:50 pm on April 20, 2024: member

ACK 3c1ae3ee33d4d9dbea046d5ab8ee924a12982759.

DrahtBot removed the label CI failed on Apr 23, 2024

in depends/packages/libnatpmp.mk:13 in 3c1ae3ee33

20+  $($(package)_cmake) -S .. -B .
21 endef
22 
23 define $(package)_build_cmds
24-  $(MAKE) libnatpmp.a $($(package)_build_opts)
25+  $(MAKE) natpmp

m3dwards commented at 4:44 pm on April 24, 2024:

Perhaps this is what we want but I thought it worth mentioning that there is a difference on my Mac between this and having cmake call make with: cmake --build . --target natpmp.

$(MAKE) from autotools for me calls GNU MAKE 3.81 and cmake delegates to gmake being GNU MAKE 4.4.1.

Should we call cmake instead and allow it to decide the best make to delegate to?

fanquake commented at 4:50 pm on April 24, 2024:

Possibly, but if we are going to do that, we could do it globally/all at once, or even set something at a higher level in depends. Not sure if we have to change this during these migrations.

m3dwards commented at 9:50 am on April 25, 2024: contributor

My Guix builds:

 0a134241bc9ff9823ce078ea10dbac544ff63536ee3f66fb557414ca191b1d62d  guix-build-3c1ae3ee33d4/output/aarch64-linux-gnu/SHA256SUMS.part
 1f5a46ab7a5faae9ce50b2d084cf65d14372b354b9f8369178f1348b70a3b675b  guix-build-3c1ae3ee33d4/output/aarch64-linux-gnu/bitcoin-3c1ae3ee33d4-aarch64-linux-gnu-debug.tar.gz
 2e2353ed4f0738026fe16cd90b503ef2f02f31e0b68ba42ea80924997225ae374  guix-build-3c1ae3ee33d4/output/aarch64-linux-gnu/bitcoin-3c1ae3ee33d4-aarch64-linux-gnu.tar.gz
 378060899627e9449977151dce2b8125ef3f17b1050e0396c9f907ef963f55ab1  guix-build-3c1ae3ee33d4/output/arm-linux-gnueabihf/SHA256SUMS.part
 44f71666871fe889ee484cfeefe577d33760453113542fe39eab2ac2bfd34030e  guix-build-3c1ae3ee33d4/output/arm-linux-gnueabihf/bitcoin-3c1ae3ee33d4-arm-linux-gnueabihf-debug.tar.gz
 5fbc516363e389f477596165f5dd54b652cd868a8da91c5647364b0fa76223807  guix-build-3c1ae3ee33d4/output/arm-linux-gnueabihf/bitcoin-3c1ae3ee33d4-arm-linux-gnueabihf.tar.gz
 65811efb8663f1e353525908f9b98594fa88d563af157c988b194fd125c958f4c  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/SHA256SUMS.part
 710e7f27dc83c471f1fa2ef5e683ae30b592c9077d6648fee45545f6c7a76b556  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/bitcoin-3c1ae3ee33d4-arm64-apple-darwin-unsigned.tar.gz
 84b9d4714bbec7304969043abd51b0b5391120ec3295c58516741e3d06e550362  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/bitcoin-3c1ae3ee33d4-arm64-apple-darwin-unsigned.zip
 9c026a9c6975db5ce11d0005cf0640877ae59d4933a5654e8af80c9e55017b065  guix-build-3c1ae3ee33d4/output/arm64-apple-darwin/bitcoin-3c1ae3ee33d4-arm64-apple-darwin.tar.gz
103c8b6655d2fb37aa1abef62852a602025b089cac54870f5dadd4d3030efcc11e  guix-build-3c1ae3ee33d4/output/dist-archive/bitcoin-3c1ae3ee33d4.tar.gz
11ffdec3a09f67bf1813dac52021b35a93fe7574507d365db7fd89eeefe6a39086  guix-build-3c1ae3ee33d4/output/powerpc64-linux-gnu/SHA256SUMS.part
12af0a7e085c00b1ef6195ed578b03d50a4ac095dcc06076967efde0001e2df6f8  guix-build-3c1ae3ee33d4/output/powerpc64-linux-gnu/bitcoin-3c1ae3ee33d4-powerpc64-linux-gnu-debug.tar.gz
135f6d9a5d629c3c23fa2b9b3d5bf358b58e0bb967303d716edbd237511890820f  guix-build-3c1ae3ee33d4/output/powerpc64-linux-gnu/bitcoin-3c1ae3ee33d4-powerpc64-linux-gnu.tar.gz
14492661b9b094ef28af4c15fc778ad98bfdd6555084929ebe78bf7f9c2ef7da8d  guix-build-3c1ae3ee33d4/output/riscv64-linux-gnu/SHA256SUMS.part
15d11cfef1935eb8eca30eb5daf274192527d8efd8e0e1fb89b921b07f7e75cfc7  guix-build-3c1ae3ee33d4/output/riscv64-linux-gnu/bitcoin-3c1ae3ee33d4-riscv64-linux-gnu-debug.tar.gz
165b7b5dc5dba62981b6258dff4d2d7de4ef4fb942d46f791217bfcb68e63371ae  guix-build-3c1ae3ee33d4/output/riscv64-linux-gnu/bitcoin-3c1ae3ee33d4-riscv64-linux-gnu.tar.gz
17dfe114ec00ac686e72f7c4fdcc186dc59721edacb3f95b4c09359931ec1c156f  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/SHA256SUMS.part
1873e92f868e21325fab2a8209b421078e4bc78d004bb5484b7775d2f93e8e10ce  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/bitcoin-3c1ae3ee33d4-x86_64-apple-darwin-unsigned.tar.gz
1937e9420d74102a5b4e8da8e01b9cdc0321e92e348f2c3ce96968556867f3dd92  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/bitcoin-3c1ae3ee33d4-x86_64-apple-darwin-unsigned.zip
2083d8297e31a1d18bfe5e17aa06d47a613a6a53361a62b69e784bace682b28757  guix-build-3c1ae3ee33d4/output/x86_64-apple-darwin/bitcoin-3c1ae3ee33d4-x86_64-apple-darwin.tar.gz
214eee423fb1e5a570a5cbbf0a911a785e7760f990bce4e79b10a0173e664b0943  guix-build-3c1ae3ee33d4/output/x86_64-linux-gnu/SHA256SUMS.part
224284bc6e2cd40aa91eb8c190907ee7baa39e999ff3e699f53d3a851be9b0eeea  guix-build-3c1ae3ee33d4/output/x86_64-linux-gnu/bitcoin-3c1ae3ee33d4-x86_64-linux-gnu-debug.tar.gz
23a88b4ad6be5f03bfe4283c9d5d4a3eec2b74307995c6a5286dd0ab930d2240b5  guix-build-3c1ae3ee33d4/output/x86_64-linux-gnu/bitcoin-3c1ae3ee33d4-x86_64-linux-gnu.tar.gz
244037f7f339beee475220e7261b698356a636889b6482019483632900e646c31c  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/SHA256SUMS.part
25f2d372664062179a380907f91af47d2d6585ace72498aa2f86d7a14540f737d3  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64-debug.zip
26ec6a5638012a1b278f84be31004c2820b0305abc41a494671ca5e483e4f1c649  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64-setup-unsigned.exe
2759eedae949fd796aa6e17bfeee7786ffb8d34fd56c1502a49f3ca6ba0be91d4a  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64-unsigned.tar.gz
282d02b86f88065fb1023938f8f1e1c012560903ee181d9212558e29ab80ed6530  guix-build-3c1ae3ee33d4/output/x86_64-w64-mingw32/bitcoin-3c1ae3ee33d4-win64.zip

m3dwards commented at 11:45 am on April 25, 2024: contributor

I don’t believe any of these are a problem but some differences on flags passed to clang on my Mac were as follows:

When using this PR the following extra flags were seen vs master:

-MD -MT CMakeFiles/natpmp.dir/natpmp.c.o -MF CMakeFiles/natpmp.dir/natpmp.c.o.d -I/Users/max/source/bitcoin/depends/work/build/aarch64-apple-darwin23.0.0/libnatpmp/f2433bec24ca3d3f22a8a7840728a3ac177f94ba-2550f8d6ff0

On master these flags were seen which were not present when using cmake and this PR:

-DMACOSX -D_DARWIN_C_SOURCE -Wall -Wextra -I/System/Library/Frameworks/JavaVM.framework/Headers

m3dwards commented at 12:49 pm on April 25, 2024: contributor

ACK https://github.com/bitcoin/bitcoin/pull/29708/commits/3c1ae3ee33d4d9dbea046d5ab8ee924a12982759

TheCharlatan approved

TheCharlatan commented at 12:49 pm on April 25, 2024: contributor

ACK 3c1ae3ee33d4d9dbea046d5ab8ee924a12982759

Also checked the natpmp changes since the last update.

fanquake merged this on Apr 25, 2024

fanquake closed this on Apr 25, 2024

fanquake deleted the branch on Apr 25, 2024

depends: build libnatpmp with CMake #29708

Code Coverage

Reviews

Conflicts