Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

depends: build libevent with CMake #29835

Merged
merged 1 commit into from
Jul 4, 2024

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Apr 9, 2024

Switches libevent in depends to be built with CMake.

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 9, 2024

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 TheCharlatan, willcl-ark

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:

  • #29790 ([DO NOT MERGE] cmake: Migrate CI scripts to CMake-based build system -- WIP 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.

@theuni
Copy link
Member

theuni commented Apr 9, 2024

I'm confused about this error. sigaddset should come from <signal.h>, which is included from "evsignal-internal.h".

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 9, 2024

🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the
documentation.

Possibly this is due to a silent merge conflict (the changes in this pull request being
incompatible with the current code in the target branch). If so, make sure to rebase on the latest
commit of the target branch.

Leave a comment here, if you need help tracking down a confusing failure.

Debug: https://github.com/bitcoin/bitcoin/runs/23609779607

@luke-jr
Copy link
Member

luke-jr commented Apr 21, 2024

This doesn't seem like a good enough reason to use untested/unreleased code... :/

@theuni
Copy link
Member

theuni commented Apr 22, 2024

I believe (@fanquake can confirm) that the idea was to test the full merge, and if we liked the CMake build parts we'd patch them in and drop the rest.

@fanquake
Copy link
Member Author

and if we liked the CMake build parts we'd patch them in and drop the rest.

Yep. From the OP:

Depending on the outcome, we could possibly pull a (minified) patch set into depends.

@fanquake
Copy link
Member Author

fanquake commented May 2, 2024

Rebased. Dropped the final patch commit, as that change happened upstream. Also bumped to current master.

@fanquake fanquake force-pushed the libevent_master_cmake branch 2 times, most recently from 6d8d3aa to d333131 Compare May 14, 2024 10:19
@fanquake fanquake changed the title [WIP] libevent @ master + use CMake depends: build libevent with CMake Jun 19, 2024
@hebasto
Copy link
Member

hebasto commented Jun 19, 2024

Is something required to undraft this PR?

@fanquake
Copy link
Member Author

We aren't getting much from master, so this is now just a switch to CMake. Once this lands, with CMake, a (minimal) depends + Core build will be possible entirely without autotools.

@fanquake
Copy link
Member Author

Is something required to undraft this PR?

Fixing the broken Windows build. Which is now done.

@fanquake fanquake marked this pull request as ready for review June 19, 2024 13:21
@fanquake
Copy link
Member Author

Guix Build (aarch64):

db8e2595bb6b4d7088860f1df0c952be13a4ae3db3396a0c3a42de98165529bc  guix-build-a5180bffbe78/output/aarch64-linux-gnu/SHA256SUMS.part
e90d5520e9bec9efe81387012d6b9ddd189ed7f4737726d825cd8077c4c0b50b  guix-build-a5180bffbe78/output/aarch64-linux-gnu/bitcoin-a5180bffbe78-aarch64-linux-gnu-debug.tar.gz
a0b5ee10285feddbc964a694c134dcd0bb9193065985423063a353c2e518442b  guix-build-a5180bffbe78/output/aarch64-linux-gnu/bitcoin-a5180bffbe78-aarch64-linux-gnu.tar.gz
d49594130fd85f0c9016bab6aebbdf904a5c2d7e86f63da217c5b25b951baf0a  guix-build-a5180bffbe78/output/arm-linux-gnueabihf/SHA256SUMS.part
1af95de6c98dbb2ad9918be89814faa12929f14c5ce9ecd6b53e094611878436  guix-build-a5180bffbe78/output/arm-linux-gnueabihf/bitcoin-a5180bffbe78-arm-linux-gnueabihf-debug.tar.gz
3071eb8bfd6be7ce14ddf9f564aac756530c271b10027d16b1b34beb6f1929f1  guix-build-a5180bffbe78/output/arm-linux-gnueabihf/bitcoin-a5180bffbe78-arm-linux-gnueabihf.tar.gz
44ea08071ffe9cd5d3b222f8ecd864a39e3d1ad4d8f86c46b286f070c4197d43  guix-build-a5180bffbe78/output/arm64-apple-darwin/SHA256SUMS.part
cdc360e2a3d79acca40611dd8b684decbecb7a1f3031e7d41daafd7467430ddc  guix-build-a5180bffbe78/output/arm64-apple-darwin/bitcoin-a5180bffbe78-arm64-apple-darwin-unsigned.tar.gz
23d2af4192ad1b09a15db9b9df297f14679222a21ff6e87fefc7bf2c30a5003f  guix-build-a5180bffbe78/output/arm64-apple-darwin/bitcoin-a5180bffbe78-arm64-apple-darwin-unsigned.zip
c13a6bd4e7e84894b6f192dd93dba6921b20230417aab482ce0d48de2974e66e  guix-build-a5180bffbe78/output/arm64-apple-darwin/bitcoin-a5180bffbe78-arm64-apple-darwin.tar.gz
6790b7c1ae5225a41d01711e8e9c6c4540b4630602e1c03e93398f7259d2a918  guix-build-a5180bffbe78/output/dist-archive/bitcoin-a5180bffbe78.tar.gz
c43ab5fba3b9821eb47a677898b1fb9570738f0dff44a1b8810213c3a1701f87  guix-build-a5180bffbe78/output/powerpc64-linux-gnu/SHA256SUMS.part
43a4a7f7b6de83b48f2ee50cc9d9d69773e3a25d82df6ea0d2a29f6f9a9d6a29  guix-build-a5180bffbe78/output/powerpc64-linux-gnu/bitcoin-a5180bffbe78-powerpc64-linux-gnu-debug.tar.gz
bd2fa8392e19dac22b73cbcef8075fe7ad5ff6de254f4b98cd9b36b27fd213b8  guix-build-a5180bffbe78/output/powerpc64-linux-gnu/bitcoin-a5180bffbe78-powerpc64-linux-gnu.tar.gz
731d0c5d31bc6effd8d9b947cdf403f3da52c1a7782bc1b64050548efad210b9  guix-build-a5180bffbe78/output/riscv64-linux-gnu/SHA256SUMS.part
e8c70d9b0738094a902e6af812f2ceca4b8150e8f015b80e73e12d67b9302b44  guix-build-a5180bffbe78/output/riscv64-linux-gnu/bitcoin-a5180bffbe78-riscv64-linux-gnu-debug.tar.gz
2fc1b988921bb3af816042e53d6f9d2ab24a71d63f4b287f270d900da147a87a  guix-build-a5180bffbe78/output/riscv64-linux-gnu/bitcoin-a5180bffbe78-riscv64-linux-gnu.tar.gz
932ce059509afa607ca44113147748a3b7d6c527d7ea618e4f8702bbae619132  guix-build-a5180bffbe78/output/x86_64-apple-darwin/SHA256SUMS.part
d7169b5ed1edb3d2958955e8dc3022a05a62fc96fd4cfff6bb5d7cc2ea5d3410  guix-build-a5180bffbe78/output/x86_64-apple-darwin/bitcoin-a5180bffbe78-x86_64-apple-darwin-unsigned.tar.gz
a44164c8f35ad3cbf9db98ecdebed7da63635d0c64898473fe289656ae852178  guix-build-a5180bffbe78/output/x86_64-apple-darwin/bitcoin-a5180bffbe78-x86_64-apple-darwin-unsigned.zip
34f8b2d2f30154bc5495ee312cc6ca7f891e489e4019c1daa75b04ba99f1be9c  guix-build-a5180bffbe78/output/x86_64-apple-darwin/bitcoin-a5180bffbe78-x86_64-apple-darwin.tar.gz
9f050eb2e524be24c2dc0364e1c6e686c1b2695efbba83cdd205aff75fff3494  guix-build-a5180bffbe78/output/x86_64-linux-gnu/SHA256SUMS.part
29e543875d1c78dea2cbb25ef61a2dd92ab67e80b8d36ab0d8ff70bb0d9041a5  guix-build-a5180bffbe78/output/x86_64-linux-gnu/bitcoin-a5180bffbe78-x86_64-linux-gnu-debug.tar.gz
da2c1fc38fa75b03a17f212b5cb320f6e319bc46ec247baccc8caf59d6cee5ce  guix-build-a5180bffbe78/output/x86_64-linux-gnu/bitcoin-a5180bffbe78-x86_64-linux-gnu.tar.gz
5ca7b25cd4f1ef71567a818be7ad4937bf47d635678fc372af6df34e2fbafba8  guix-build-a5180bffbe78/output/x86_64-w64-mingw32/SHA256SUMS.part
6282c55ed5f8d059a866ba8fb05970e01d5531786e251f2da7cfb4f5f851d932  guix-build-a5180bffbe78/output/x86_64-w64-mingw32/bitcoin-a5180bffbe78-win64-debug.zip
dc53040e8e1342418e55361c051686d0637cdaa6cb6e6cd1f40b99d9f9045975  guix-build-a5180bffbe78/output/x86_64-w64-mingw32/bitcoin-a5180bffbe78-win64-setup-unsigned.exe
00d4f7c42dd21fc3900bdd1e996bf74b2a2b8ddd405674b062ca9e5ea067cf7d  guix-build-a5180bffbe78/output/x86_64-w64-mingw32/bitcoin-a5180bffbe78-win64-unsigned.tar.gz
58bd22e8ff44570ae0f838560544c17f5aa2e3792bd01bbdba5683ca517bc7ed  guix-build-a5180bffbe78/output/x86_64-w64-mingw32/bitcoin-a5180bffbe78-win64.zip

@DrahtBot
Copy link
Contributor

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

File commit 2d21060
(master)
commit b797979
(master and this pull)
SHA256SUMS.part 70ab9f0930364884... 8790486e1c9e789e...
*-aarch64-linux-gnu-debug.tar.gz 2f414e246c732eca... 677fd9edbb4f9c35...
*-aarch64-linux-gnu.tar.gz 2321539f40f75532... 38fb5a0a63510a9d...
*-arm-linux-gnueabihf-debug.tar.gz aedcd9655e114f7a... 52d9a5c71f37ce6c...
*-arm-linux-gnueabihf.tar.gz f6611a3b5afe3df6... 22dd4a0d8431acef...
*-arm64-apple-darwin-unsigned.tar.gz 1a47e1b8cd0853d5... e67babc9d082c1ec...
*-arm64-apple-darwin-unsigned.zip 98e9734f599ae1c1... 3d2fa847f0394927...
*-arm64-apple-darwin.tar.gz 254ea3984de3d066... 74e9405259f5e008...
*-powerpc64-linux-gnu-debug.tar.gz 4ceb3d0fe5778c2f... d0f005d445302aad...
*-powerpc64-linux-gnu.tar.gz 451549b0cb7c55da... fd524bfa244f3890...
*-riscv64-linux-gnu-debug.tar.gz b882e581a4f6d3e1... 6e105793d466f0ad...
*-riscv64-linux-gnu.tar.gz ece91ba2cb305051... 5a29592fd2a2dc12...
*-x86_64-apple-darwin-unsigned.tar.gz d398e82e489078cd... 52f02a37d0c26409...
*-x86_64-apple-darwin-unsigned.zip ab9f9028d3c705bd... f465975ab5a907ca...
*-x86_64-apple-darwin.tar.gz a5c6dd364f416061... 8267add054fc11f6...
*-x86_64-linux-gnu-debug.tar.gz 4549c492bc4e17ec... 4201ae8b330ea3af...
*-x86_64-linux-gnu.tar.gz 04cd2be674f47d1d... 8f098f1dcbecf00b...
*.tar.gz 9aa33d6a5cbd2dc7... 587e84694a0be90e...
guix_build.log 6fcba1078f5e144d... f974ea0e8d694fbf...
guix_build.log.diff df8d8ac191b8e2b9...

@TheCharlatan
Copy link
Contributor

Guix builds (aarch64):

d702d02df48bc540da55c47ca7110d122a27ba179ab728fb8bdb6e27589f754c  guix-build-f59e9057e2aa/output/aarch64-linux-gnu/SHA256SUMS.part
d806e1994bc873a975714ce75bca87fd3fcec4055e24d1ed0afe99ebc3503288  guix-build-f59e9057e2aa/output/aarch64-linux-gnu/bitcoin-f59e9057e2aa-aarch64-linux-gnu-debug.tar.gz
a9844e6a4d3e86df69b98281c942ac01136b4b115fc6a2504740368c5d441fbd  guix-build-f59e9057e2aa/output/aarch64-linux-gnu/bitcoin-f59e9057e2aa-aarch64-linux-gnu.tar.gz
4e3ea3b82c4c46c1539ba6cfe6627e331e50feda973d0627598671c03fd727f4  guix-build-f59e9057e2aa/output/arm-linux-gnueabihf/SHA256SUMS.part
99712894848ef7a0b90b3a8582d617809e986abda202e9d4941ee970ca0d9a3d  guix-build-f59e9057e2aa/output/arm-linux-gnueabihf/bitcoin-f59e9057e2aa-arm-linux-gnueabihf-debug.tar.gz
aec34ff47cf315949f2ddbf4eb0ed69dd2ec278b20ab7909a16ce48abd41e7ee  guix-build-f59e9057e2aa/output/arm-linux-gnueabihf/bitcoin-f59e9057e2aa-arm-linux-gnueabihf.tar.gz
072b0091fb89e726931fe214b7b2f03e188f64c67df86ae1342354713697eea8  guix-build-f59e9057e2aa/output/arm64-apple-darwin/SHA256SUMS.part
8cdcab079ab725e3d823592c0f1b11a900515bc70c949605f5750e9666cccd02  guix-build-f59e9057e2aa/output/arm64-apple-darwin/bitcoin-f59e9057e2aa-arm64-apple-darwin-unsigned.tar.gz
85d962a1a068ce77bb689af1a7ddcbdb347928f7e80dc7fb461d6d49d278e72a  guix-build-f59e9057e2aa/output/arm64-apple-darwin/bitcoin-f59e9057e2aa-arm64-apple-darwin-unsigned.zip
7693aa014666780dad65c51e25bca5f2c67682475b40c570e30515f75ec73fdb  guix-build-f59e9057e2aa/output/arm64-apple-darwin/bitcoin-f59e9057e2aa-arm64-apple-darwin.tar.gz
081d771bff0deefa9a298df40b8e564a77d527cf6be3268402ee3746b19156a2  guix-build-f59e9057e2aa/output/dist-archive/bitcoin-f59e9057e2aa.tar.gz
6bcae84c9b5e1a74e9ad490af8a020b0baf567b7e1ac798af1f37755de699169  guix-build-f59e9057e2aa/output/powerpc64-linux-gnu/SHA256SUMS.part
aac0fd663a9418a016ded828a3961371f17b8cec19306ef278061c02b15308fc  guix-build-f59e9057e2aa/output/powerpc64-linux-gnu/bitcoin-f59e9057e2aa-powerpc64-linux-gnu-debug.tar.gz
56b9c6e5b114701dc3f862414343a0c41c840795706f9289e17fd4967bd72a7b  guix-build-f59e9057e2aa/output/powerpc64-linux-gnu/bitcoin-f59e9057e2aa-powerpc64-linux-gnu.tar.gz
6b0eb35a6af793049302ab284999c143d23b9f60080070c221ae93fd46ee4715  guix-build-f59e9057e2aa/output/riscv64-linux-gnu/SHA256SUMS.part
b6a6948fea45d1fb571029264f3d406b0c1846d3e47bd2929e12096372f33385  guix-build-f59e9057e2aa/output/riscv64-linux-gnu/bitcoin-f59e9057e2aa-riscv64-linux-gnu-debug.tar.gz
125670ea7e908757ce988faf6f9c815d9e74ccbc9bf67f2f1eee834ddc97f602  guix-build-f59e9057e2aa/output/riscv64-linux-gnu/bitcoin-f59e9057e2aa-riscv64-linux-gnu.tar.gz
59e2f661e5fcc44eaed1476618f765225609a1f2d5776c4b9f88bd7fdfb36fb6  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/SHA256SUMS.part
e7486f0a29beb0c14f3949b7b2dc6387842d94d3c7379db8e8bd1c7cde221a07  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/bitcoin-f59e9057e2aa-x86_64-apple-darwin-unsigned.tar.gz
a5bc7e46e4663a4de58e4ddc22b072a0987cfa4a5996b67f059b06b573bb0e48  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/bitcoin-f59e9057e2aa-x86_64-apple-darwin-unsigned.zip
71a1359a0d51029c3757e908c5580544e5b00d47bdff3ebcfbed6f3f38f68fe5  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/bitcoin-f59e9057e2aa-x86_64-apple-darwin.tar.gz
56b9393b3002e8ee9aee46e09b0e8a2de8aeb99a1c7d5d3271e1b7ef19d01282  guix-build-f59e9057e2aa/output/x86_64-linux-gnu/SHA256SUMS.part
67cb5897c74067400a788f3d7f5ee72c76c2500c8f690be1c30a673fbb4dc083  guix-build-f59e9057e2aa/output/x86_64-linux-gnu/bitcoin-f59e9057e2aa-x86_64-linux-gnu-debug.tar.gz
ac384de91a8c93a661a639817e86aeb431e881e86582ff1c22fe1da2e1c353bf  guix-build-f59e9057e2aa/output/x86_64-linux-gnu/bitcoin-f59e9057e2aa-x86_64-linux-gnu.tar.gz
3fd25c0a6270115f4680aa97009497f14d7912736e58715875ab0b750a84430b  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/SHA256SUMS.part
e70a51f884fc57420b5d4bcbf72d1b2ea84368015cc6634374d6059f5fc31eab  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64-debug.zip
988e4e0389834169b1b372d65a6daec712ba6fcb48c1ecd7b5694103c92bbd9e  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64-setup-unsigned.exe
9952ba40daaf6e123fffe3bd45e563c57d2a50fc7cbadd9771b9dc8befc514b0  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64-unsigned.tar.gz
64a7c44fbd4941ba991368fcf4c69151e8f0f6fdd4bb563312e3ea47b4fd2f37  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64.zip

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My Guix build:

x86_64
d702d02df48bc540da55c47ca7110d122a27ba179ab728fb8bdb6e27589f754c  guix-build-f59e9057e2aa/output/aarch64-linux-gnu/SHA256SUMS.part
d806e1994bc873a975714ce75bca87fd3fcec4055e24d1ed0afe99ebc3503288  guix-build-f59e9057e2aa/output/aarch64-linux-gnu/bitcoin-f59e9057e2aa-aarch64-linux-gnu-debug.tar.gz
a9844e6a4d3e86df69b98281c942ac01136b4b115fc6a2504740368c5d441fbd  guix-build-f59e9057e2aa/output/aarch64-linux-gnu/bitcoin-f59e9057e2aa-aarch64-linux-gnu.tar.gz
4e3ea3b82c4c46c1539ba6cfe6627e331e50feda973d0627598671c03fd727f4  guix-build-f59e9057e2aa/output/arm-linux-gnueabihf/SHA256SUMS.part
99712894848ef7a0b90b3a8582d617809e986abda202e9d4941ee970ca0d9a3d  guix-build-f59e9057e2aa/output/arm-linux-gnueabihf/bitcoin-f59e9057e2aa-arm-linux-gnueabihf-debug.tar.gz
aec34ff47cf315949f2ddbf4eb0ed69dd2ec278b20ab7909a16ce48abd41e7ee  guix-build-f59e9057e2aa/output/arm-linux-gnueabihf/bitcoin-f59e9057e2aa-arm-linux-gnueabihf.tar.gz
072b0091fb89e726931fe214b7b2f03e188f64c67df86ae1342354713697eea8  guix-build-f59e9057e2aa/output/arm64-apple-darwin/SHA256SUMS.part
8cdcab079ab725e3d823592c0f1b11a900515bc70c949605f5750e9666cccd02  guix-build-f59e9057e2aa/output/arm64-apple-darwin/bitcoin-f59e9057e2aa-arm64-apple-darwin-unsigned.tar.gz
85d962a1a068ce77bb689af1a7ddcbdb347928f7e80dc7fb461d6d49d278e72a  guix-build-f59e9057e2aa/output/arm64-apple-darwin/bitcoin-f59e9057e2aa-arm64-apple-darwin-unsigned.zip
7693aa014666780dad65c51e25bca5f2c67682475b40c570e30515f75ec73fdb  guix-build-f59e9057e2aa/output/arm64-apple-darwin/bitcoin-f59e9057e2aa-arm64-apple-darwin.tar.gz
081d771bff0deefa9a298df40b8e564a77d527cf6be3268402ee3746b19156a2  guix-build-f59e9057e2aa/output/dist-archive/bitcoin-f59e9057e2aa.tar.gz
6bcae84c9b5e1a74e9ad490af8a020b0baf567b7e1ac798af1f37755de699169  guix-build-f59e9057e2aa/output/powerpc64-linux-gnu/SHA256SUMS.part
aac0fd663a9418a016ded828a3961371f17b8cec19306ef278061c02b15308fc  guix-build-f59e9057e2aa/output/powerpc64-linux-gnu/bitcoin-f59e9057e2aa-powerpc64-linux-gnu-debug.tar.gz
56b9c6e5b114701dc3f862414343a0c41c840795706f9289e17fd4967bd72a7b  guix-build-f59e9057e2aa/output/powerpc64-linux-gnu/bitcoin-f59e9057e2aa-powerpc64-linux-gnu.tar.gz
6b0eb35a6af793049302ab284999c143d23b9f60080070c221ae93fd46ee4715  guix-build-f59e9057e2aa/output/riscv64-linux-gnu/SHA256SUMS.part
b6a6948fea45d1fb571029264f3d406b0c1846d3e47bd2929e12096372f33385  guix-build-f59e9057e2aa/output/riscv64-linux-gnu/bitcoin-f59e9057e2aa-riscv64-linux-gnu-debug.tar.gz
125670ea7e908757ce988faf6f9c815d9e74ccbc9bf67f2f1eee834ddc97f602  guix-build-f59e9057e2aa/output/riscv64-linux-gnu/bitcoin-f59e9057e2aa-riscv64-linux-gnu.tar.gz
59e2f661e5fcc44eaed1476618f765225609a1f2d5776c4b9f88bd7fdfb36fb6  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/SHA256SUMS.part
e7486f0a29beb0c14f3949b7b2dc6387842d94d3c7379db8e8bd1c7cde221a07  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/bitcoin-f59e9057e2aa-x86_64-apple-darwin-unsigned.tar.gz
a5bc7e46e4663a4de58e4ddc22b072a0987cfa4a5996b67f059b06b573bb0e48  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/bitcoin-f59e9057e2aa-x86_64-apple-darwin-unsigned.zip
71a1359a0d51029c3757e908c5580544e5b00d47bdff3ebcfbed6f3f38f68fe5  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/bitcoin-f59e9057e2aa-x86_64-apple-darwin.tar.gz
56b9393b3002e8ee9aee46e09b0e8a2de8aeb99a1c7d5d3271e1b7ef19d01282  guix-build-f59e9057e2aa/output/x86_64-linux-gnu/SHA256SUMS.part
67cb5897c74067400a788f3d7f5ee72c76c2500c8f690be1c30a673fbb4dc083  guix-build-f59e9057e2aa/output/x86_64-linux-gnu/bitcoin-f59e9057e2aa-x86_64-linux-gnu-debug.tar.gz
ac384de91a8c93a661a639817e86aeb431e881e86582ff1c22fe1da2e1c353bf  guix-build-f59e9057e2aa/output/x86_64-linux-gnu/bitcoin-f59e9057e2aa-x86_64-linux-gnu.tar.gz
3fd25c0a6270115f4680aa97009497f14d7912736e58715875ab0b750a84430b  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/SHA256SUMS.part
e70a51f884fc57420b5d4bcbf72d1b2ea84368015cc6634374d6059f5fc31eab  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64-debug.zip
988e4e0389834169b1b372d65a6daec712ba6fcb48c1ecd7b5694103c92bbd9e  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64-setup-unsigned.exe
9952ba40daaf6e123fffe3bd45e563c57d2a50fc7cbadd9771b9dc8befc514b0  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64-unsigned.tar.gz
64a7c44fbd4941ba991368fcf4c69151e8f0f6fdd4bb563312e3ea47b4fd2f37  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64.zip

Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK f59e905

@fanquake fanquake requested a review from theuni July 1, 2024 13:01
@willcl-ark
Copy link
Member

My build on x86_64 (excluding SHA256SUMS.part):

d806e1994bc873a975714ce75bca87fd3fcec4055e24d1ed0afe99ebc3503288  bitcoin-f59e9057e2aa-aarch64-linux-gnu-debug.tar.gz
a9844e6a4d3e86df69b98281c942ac01136b4b115fc6a2504740368c5d441fbd  bitcoin-f59e9057e2aa-aarch64-linux-gnu.tar.gz
99712894848ef7a0b90b3a8582d617809e986abda202e9d4941ee970ca0d9a3d  bitcoin-f59e9057e2aa-arm-linux-gnueabihf-debug.tar.gz
aec34ff47cf315949f2ddbf4eb0ed69dd2ec278b20ab7909a16ce48abd41e7ee  bitcoin-f59e9057e2aa-arm-linux-gnueabihf.tar.gz
8cdcab079ab725e3d823592c0f1b11a900515bc70c949605f5750e9666cccd02  bitcoin-f59e9057e2aa-arm64-apple-darwin-unsigned.tar.gz
85d962a1a068ce77bb689af1a7ddcbdb347928f7e80dc7fb461d6d49d278e72a  bitcoin-f59e9057e2aa-arm64-apple-darwin-unsigned.zip
7693aa014666780dad65c51e25bca5f2c67682475b40c570e30515f75ec73fdb  bitcoin-f59e9057e2aa-arm64-apple-darwin.tar.gz
081d771bff0deefa9a298df40b8e564a77d527cf6be3268402ee3746b19156a2  bitcoin-f59e9057e2aa.tar.gz
aac0fd663a9418a016ded828a3961371f17b8cec19306ef278061c02b15308fc  bitcoin-f59e9057e2aa-powerpc64-linux-gnu-debug.tar.gz
56b9c6e5b114701dc3f862414343a0c41c840795706f9289e17fd4967bd72a7b  bitcoin-f59e9057e2aa-powerpc64-linux-gnu.tar.gz
b6a6948fea45d1fb571029264f3d406b0c1846d3e47bd2929e12096372f33385  bitcoin-f59e9057e2aa-riscv64-linux-gnu-debug.tar.gz
125670ea7e908757ce988faf6f9c815d9e74ccbc9bf67f2f1eee834ddc97f602  bitcoin-f59e9057e2aa-riscv64-linux-gnu.tar.gz
e7486f0a29beb0c14f3949b7b2dc6387842d94d3c7379db8e8bd1c7cde221a07  bitcoin-f59e9057e2aa-x86_64-apple-darwin-unsigned.tar.gz
a5bc7e46e4663a4de58e4ddc22b072a0987cfa4a5996b67f059b06b573bb0e48  bitcoin-f59e9057e2aa-x86_64-apple-darwin-unsigned.zip
71a1359a0d51029c3757e908c5580544e5b00d47bdff3ebcfbed6f3f38f68fe5  bitcoin-f59e9057e2aa-x86_64-apple-darwin.tar.gz
67cb5897c74067400a788f3d7f5ee72c76c2500c8f690be1c30a673fbb4dc083  bitcoin-f59e9057e2aa-x86_64-linux-gnu-debug.tar.gz
ac384de91a8c93a661a639817e86aeb431e881e86582ff1c22fe1da2e1c353bf  bitcoin-f59e9057e2aa-x86_64-linux-gnu.tar.gz
e70a51f884fc57420b5d4bcbf72d1b2ea84368015cc6634374d6059f5fc31eab  bitcoin-f59e9057e2aa-win64-debug.zip
988e4e0389834169b1b372d65a6daec712ba6fcb48c1ecd7b5694103c92bbd9e  bitcoin-f59e9057e2aa-win64-setup-unsigned.exe
9952ba40daaf6e123fffe3bd45e563c57d2a50fc7cbadd9771b9dc8befc514b0  bitcoin-f59e9057e2aa-win64-unsigned.tar.gz
64a7c44fbd4941ba991368fcf4c69151e8f0f6fdd4bb563312e3ea47b4fd2f37  bitcoin-f59e9057e2aa-win64.zip

Copy link
Member

@willcl-ark willcl-ark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK f59e905

Tested locally and with guix build. Changes all look good to me, with equivalent options being set where possible.

There are not direct equivalents of --disable-dependency-tracking and --enable-option-checking for cmake, but this doesn't seem like a problem for us here.

@fanquake fanquake merged commit bd5d168 into bitcoin:master Jul 4, 2024
16 checks passed
@maflcko
Copy link
Member

maflcko commented Jul 4, 2024

/src/bitcoin-core/depends/work/download/libevent-2.1.12-stable/libevent-2.1.12-stable.tar.gz.temp: OK
Extracting libevent...
/src/bitcoin-core/depends/sources/libevent-2.1.12-stable.tar.gz: OK
Preprocessing libevent...
patching file CMakeLists.txt
patching file cmake/AddEventLibrary.cmake
Configuring libevent...
-- The C compiler identification is Clang 18.0.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - failed
-- Check for working C compiler: /usr/local/bin/clang
-- Check for working C compiler: /usr/local/bin/clang - broken
CMake Error at /usr/local/share/cmake-3.29/Modules/CMakeTestCCompiler.cmake:67 (message):
  The C compiler

    "/usr/local/bin/clang"

  is not able to compile a simple test program.

  It fails with the following output:

    Change Dir: '/src/bitcoin-core/depends/work/build/i686-pc-linux-gnu/libevent/2.1.12-stable-1d09648eb87/build/CMakeFiles/CMakeScratch/TryCompile-OemzaG'
    
    Run Build Command(s): /usr/local/bin/cmake -E env VERBOSE=1 /usr/bin/make -f Makefile cmTC_76ce3/fast
    make[1]: Entering directory '/src/bitcoin-core/depends/work/build/i686-pc-linux-gnu/libevent/2.1.12-stable-1d09648eb87/build/CMakeFiles/CMakeScratch/TryCompile-OemzaG'
    /usr/bin/make  -f CMakeFiles/cmTC_76ce3.dir/build.make CMakeFiles/cmTC_76ce3.dir/build
    make[2]: Entering directory '/src/bitcoin-core/depends/work/build/i686-pc-linux-gnu/libevent/2.1.12-stable-1d09648eb87/build/CMakeFiles/CMakeScratch/TryCompile-OemzaG'
    Building C object CMakeFiles/cmTC_76ce3.dir/testCCompiler.c.o
    /usr/local/bin/clang --target=i686-pc-linux-gnu   -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG -DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE -I/src/bitcoin-core/depends/i686-pc-linux-gnu/include -D_FORTIFY_SOURCE=3      -m32 -O1 -fno-omit-frame-pointer -gline-tables-only -Wno-error=enum-constexpr-conversion -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion -Wno-error=deprecated-declarations -Wno-error=implicit-function-declaration -Wno-error=implicit-int -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=address -fsanitize-address-use-after-scope -fsanitize=fuzzer-no-link  -fPIE -MD -MT CMakeFiles/cmTC_76ce3.dir/testCCompiler.c.o -MF CMakeFiles/cmTC_76ce3.dir/testCCompiler.c.o.d -o CMakeFiles/cmTC_76ce3.dir/testCCompiler.c.o -c /src/bitcoin-core/depends/work/build/i686-pc-linux-gnu/libevent/2.1.12-stable-1d09648eb87/build/CMakeFiles/CMakeScratch/TryCompile-OemzaG/testCCompiler.c
    Linking C executable cmTC_76ce3
    /usr/local/bin/cmake -E cmake_link_script CMakeFiles/cmTC_76ce3.dir/link.txt --verbose=1
    /usr/local/bin/clang --target=i686-pc-linux-gnu -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG -DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE -I/src/bitcoin-core/depends/i686-pc-linux-gnu/include -D_FORTIFY_SOURCE=3      -m32 -O1 -fno-omit-frame-pointer -gline-tables-only -Wno-error=enum-constexpr-conversion -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion -Wno-error=deprecated-declarations -Wno-error=implicit-function-declaration -Wno-error=implicit-int -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=address -fsanitize-address-use-after-scope -fsanitize=fuzzer-no-link  -L/src/bitcoin-core/depends/i686-pc-linux-gnu/lib  CMakeFiles/cmTC_76ce3.dir/testCCompiler.c.o -o cmTC_76ce3
    /usr/bin/ld: cannot find /usr/local/lib/clang/18/lib/linux/libclang_rt.asan_static-i386.a: No such file or directory
    /usr/bin/ld: cannot find /usr/local/lib/clang/18/lib/linux/libclang_rt.asan-i386.a: No such file or directory
    clang: error: linker command failed with exit code 1 (use -v to see invocation)
    make[2]: *** [CMakeFiles/cmTC_76ce3.dir/build.make:100: cmTC_76ce3] Error 1
    make[2]: Leaving directory '/src/bitcoin-core/depends/work/build/i686-pc-linux-gnu/libevent/2.1.12-stable-1d09648eb87/build/CMakeFiles/CMakeScratch/TryCompile-OemzaG'
    make[1]: *** [Makefile:127: cmTC_76ce3/fast] Error 2
    make[1]: Leaving directory '/src/bitcoin-core/depends/work/build/i686-pc-linux-gnu/libevent/2.1.12-stable-1d09648eb87/build/CMakeFiles/CMakeScratch/TryCompile-OemzaG'
    
    

  

  CMake will not be able to correctly generate this project.
Call Stack (most recent call first):
  CMakeLists.txt:47 (project)


-- Configuring incomplete, errors occurred!
make: *** [funcs.mk:301: /src/bitcoin-core/depends/i686-pc-linux-gnu/.libevent_stamp_configured] Error 1
ERROR:__main__:Building fuzzers failed.
['libfuzzer', 'honggfuzz']
['address', 'undefined', 'memory']
['x86_64', 'i386']
Building project bitcoin-core
Running command: python /home/runner/work/oss-fuzz/oss-fuzz/infra/helper.py build_fuzzers bitcoin-core --engine libfuzzer --sanitizer address --architecture i386
Failed projects: bitcoin-core
Error: Process completed with exit code 1.

@maflcko
Copy link
Member

maflcko commented Jul 4, 2024

@maflcko
Copy link
Member

maflcko commented Jul 4, 2024

Not sure if this is a real issue, because OSS-Fuzz broke their infra today. I'll check back tomorrow.

@maflcko
Copy link
Member

maflcko commented Jul 5, 2024

Maybe something like OSGeo/PROJ@8f29b8f is needed in oss-fuzz?

@m3dwards
Copy link
Contributor

m3dwards commented Jul 5, 2024

Post merge Guix build matched:

d702d02df48bc540da55c47ca7110d122a27ba179ab728fb8bdb6e27589f754c  guix-build-f59e9057e2aa/output/aarch64-linux-gnu/SHA256SUMS.part
d806e1994bc873a975714ce75bca87fd3fcec4055e24d1ed0afe99ebc3503288  guix-build-f59e9057e2aa/output/aarch64-linux-gnu/bitcoin-f59e9057e2aa-aarch64-linux-gnu-debug.tar.gz
a9844e6a4d3e86df69b98281c942ac01136b4b115fc6a2504740368c5d441fbd  guix-build-f59e9057e2aa/output/aarch64-linux-gnu/bitcoin-f59e9057e2aa-aarch64-linux-gnu.tar.gz
4e3ea3b82c4c46c1539ba6cfe6627e331e50feda973d0627598671c03fd727f4  guix-build-f59e9057e2aa/output/arm-linux-gnueabihf/SHA256SUMS.part
99712894848ef7a0b90b3a8582d617809e986abda202e9d4941ee970ca0d9a3d  guix-build-f59e9057e2aa/output/arm-linux-gnueabihf/bitcoin-f59e9057e2aa-arm-linux-gnueabihf-debug.tar.gz
aec34ff47cf315949f2ddbf4eb0ed69dd2ec278b20ab7909a16ce48abd41e7ee  guix-build-f59e9057e2aa/output/arm-linux-gnueabihf/bitcoin-f59e9057e2aa-arm-linux-gnueabihf.tar.gz
072b0091fb89e726931fe214b7b2f03e188f64c67df86ae1342354713697eea8  guix-build-f59e9057e2aa/output/arm64-apple-darwin/SHA256SUMS.part
8cdcab079ab725e3d823592c0f1b11a900515bc70c949605f5750e9666cccd02  guix-build-f59e9057e2aa/output/arm64-apple-darwin/bitcoin-f59e9057e2aa-arm64-apple-darwin-unsigned.tar.gz
85d962a1a068ce77bb689af1a7ddcbdb347928f7e80dc7fb461d6d49d278e72a  guix-build-f59e9057e2aa/output/arm64-apple-darwin/bitcoin-f59e9057e2aa-arm64-apple-darwin-unsigned.zip
7693aa014666780dad65c51e25bca5f2c67682475b40c570e30515f75ec73fdb  guix-build-f59e9057e2aa/output/arm64-apple-darwin/bitcoin-f59e9057e2aa-arm64-apple-darwin.tar.gz
081d771bff0deefa9a298df40b8e564a77d527cf6be3268402ee3746b19156a2  guix-build-f59e9057e2aa/output/dist-archive/bitcoin-f59e9057e2aa.tar.gz
6bcae84c9b5e1a74e9ad490af8a020b0baf567b7e1ac798af1f37755de699169  guix-build-f59e9057e2aa/output/powerpc64-linux-gnu/SHA256SUMS.part
aac0fd663a9418a016ded828a3961371f17b8cec19306ef278061c02b15308fc  guix-build-f59e9057e2aa/output/powerpc64-linux-gnu/bitcoin-f59e9057e2aa-powerpc64-linux-gnu-debug.tar.gz
56b9c6e5b114701dc3f862414343a0c41c840795706f9289e17fd4967bd72a7b  guix-build-f59e9057e2aa/output/powerpc64-linux-gnu/bitcoin-f59e9057e2aa-powerpc64-linux-gnu.tar.gz
6b0eb35a6af793049302ab284999c143d23b9f60080070c221ae93fd46ee4715  guix-build-f59e9057e2aa/output/riscv64-linux-gnu/SHA256SUMS.part
b6a6948fea45d1fb571029264f3d406b0c1846d3e47bd2929e12096372f33385  guix-build-f59e9057e2aa/output/riscv64-linux-gnu/bitcoin-f59e9057e2aa-riscv64-linux-gnu-debug.tar.gz
125670ea7e908757ce988faf6f9c815d9e74ccbc9bf67f2f1eee834ddc97f602  guix-build-f59e9057e2aa/output/riscv64-linux-gnu/bitcoin-f59e9057e2aa-riscv64-linux-gnu.tar.gz
59e2f661e5fcc44eaed1476618f765225609a1f2d5776c4b9f88bd7fdfb36fb6  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/SHA256SUMS.part
e7486f0a29beb0c14f3949b7b2dc6387842d94d3c7379db8e8bd1c7cde221a07  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/bitcoin-f59e9057e2aa-x86_64-apple-darwin-unsigned.tar.gz
a5bc7e46e4663a4de58e4ddc22b072a0987cfa4a5996b67f059b06b573bb0e48  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/bitcoin-f59e9057e2aa-x86_64-apple-darwin-unsigned.zip
71a1359a0d51029c3757e908c5580544e5b00d47bdff3ebcfbed6f3f38f68fe5  guix-build-f59e9057e2aa/output/x86_64-apple-darwin/bitcoin-f59e9057e2aa-x86_64-apple-darwin.tar.gz
56b9393b3002e8ee9aee46e09b0e8a2de8aeb99a1c7d5d3271e1b7ef19d01282  guix-build-f59e9057e2aa/output/x86_64-linux-gnu/SHA256SUMS.part
67cb5897c74067400a788f3d7f5ee72c76c2500c8f690be1c30a673fbb4dc083  guix-build-f59e9057e2aa/output/x86_64-linux-gnu/bitcoin-f59e9057e2aa-x86_64-linux-gnu-debug.tar.gz
ac384de91a8c93a661a639817e86aeb431e881e86582ff1c22fe1da2e1c353bf  guix-build-f59e9057e2aa/output/x86_64-linux-gnu/bitcoin-f59e9057e2aa-x86_64-linux-gnu.tar.gz
3fd25c0a6270115f4680aa97009497f14d7912736e58715875ab0b750a84430b  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/SHA256SUMS.part
e70a51f884fc57420b5d4bcbf72d1b2ea84368015cc6634374d6059f5fc31eab  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64-debug.zip
988e4e0389834169b1b372d65a6daec712ba6fcb48c1ecd7b5694103c92bbd9e  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64-setup-unsigned.exe
9952ba40daaf6e123fffe3bd45e563c57d2a50fc7cbadd9771b9dc8befc514b0  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64-unsigned.tar.gz
64a7c44fbd4941ba991368fcf4c69151e8f0f6fdd4bb563312e3ea47b4fd2f37  guix-build-f59e9057e2aa/output/x86_64-w64-mingw32/bitcoin-f59e9057e2aa-win64.zip

@maflcko
Copy link
Member

maflcko commented Jul 8, 2024

I worked around the OSS-Fuzz issue with google/oss-fuzz@a346f56 for now.

@fanquake fanquake deleted the libevent_master_cmake branch July 10, 2024 14:51
@hebasto
Copy link
Member

hebasto commented Jul 12, 2024

Ported to the CMake-based build system in hebasto#262.

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 13, 2024
e1f8205 depends: Fix CMake-generated `libevent*.pc` files (Hennadii Stepanov)
9ccd533 depends: switch libevent to CMake (Cory Fields)
dad9737 Revert "depends: Fix Autotools-generated `libevent*.pc` files" (Hennadii Stepanov)

Pull request description:

  This PR ports bitcoin#29835.

ACKs for top commit:
  m3dwards:
    ACK e1f8205

Tree-SHA512: 7d1c43af291dd290cf30f3aaa3132db2bc4e27576043bf3b396c0c09f539c5f5ac07b7fcdd117fd423b4f9e1dfdbb69675a97bd762bf511394abbc6c34e68e56
fanquake added a commit that referenced this pull request Jul 22, 2024
8c935e6 depends: Fix CMake-generated `libevent*.pc` files (Hennadii Stepanov)

Pull request description:

  Broken out of #30454. This is a backport of the merged upstream PR: libevent/libevent#1622.

  Note that after #29835 we might end up dropping pkg-config and using the installed CMake files directly, but that depends on whether or not enough distros actually ship those files.

  Either way, having fixed up .pc files won't hurt.

ACKs for top commit:
  hebasto:
    ACK 8c935e6.
  fanquake:
    ACK 8c935e6

Tree-SHA512: 259c2ad78fb9e90370a7205dc71c40acda1a872f6509435133bc1c4c2c3de57366e80679aa083e13ed85e7966883dc470c0147ee171a2ed0171a18cd5ffc99b3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants