depends: Fix CMake-generated `libzmq.pc` file #30508

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:240723-zmq-pc changing 2 files +34 −1

hebasto commented at 1:52 pm on July 23, 2024: member
This is a backport of: https://github.com/zeromq/libzmq/pull/4706.

Similar to #30488.

Addresses #29723 (comment):
Looking at the mingw .pc generated by this PR:

0Libs: -L${libdir} -lzmq 1Libs.private: 2Requires.private:
It looks like we’ll need to take zeromq/libzmq#4706 as well for CMake. That can be done as a follow-up though, as it’s not yet merged upstream.
hebasto added the label Build system on Jul 23, 2024
DrahtBot commented at 1:52 pm on July 23, 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 fanquake

Stale ACK theuni

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

Conflicts

No conflicts as of last run.
theuni commented at 8:16 pm on July 23, 2024: member

Concept ACK and utACK. I’d rather wait until upstream weighs in though, since we don’t need this at least until we switch to CMake.
hebasto referenced this in commit 7a59ed6910 on Jul 24, 2024
maflcko added the label DrahtBot Guix build requested on Aug 21, 2024
fanquake commented at 8:28 am on August 21, 2024: member

I’d rather wait until upstream weighs in though, since we don’t need this at least until we switch to CMake.

Looks like upstream either forgot about, or missed this, so I guess someone should followup.
maflcko commented at 8:48 am on August 21, 2024: member

Could rebase the upstream pull, which currently fails CI, to pick up the upstream CI fixes?
hebasto commented at 10:54 am on August 21, 2024: member

Could rebase the upstream pull, which currently fails CI, to pick up the upstream CI fixes?

Done.
hebasto commented at 12:42 pm on August 21, 2024: member

I’d rather wait until upstream weighs in though, since we don’t need this at least until we switch to CMake.

Looks like upstream either forgot about, or missed this, so I guess someone should followup.

It has been just merged.

Type	Reviewers
ACK	fanquake
Stale ACK	theuni

DrahtBot commented at 3:46 pm on August 21, 2024: contributor

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

File	commit 60b816439eb4bd837778d424628cd3978e0856d9(master)	commit 8e39baa05f0ea9260e7985258550bc7707de8b0b(master and this pull)
SHA256SUMS.part	`e1d20819f9fe7a08...`	`8cd3087329c70a5e...`
*-aarch64-linux-gnu-debug.tar.gz	`d590bd07c550b27e...`	`6995ea8d83ff65fe...`
*-aarch64-linux-gnu.tar.gz	`14fe218ce0710623...`	`90d6642b73088655...`
*-arm-linux-gnueabihf-debug.tar.gz	`f77e35f6875b444e...`	`d0015f2add470b74...`
*-arm-linux-gnueabihf.tar.gz	`b753e4d2cbcf3170...`	`25b2eb8ae9ebbc5e...`
*-arm64-apple-darwin-unsigned.tar.gz	`0da23890907ff0e4...`	`796cd1941987c771...`
*-arm64-apple-darwin-unsigned.zip	`03a550731d6f916d...`	`2b9710b1e52f4b68...`
*-arm64-apple-darwin.tar.gz	`0f1c6d7fd51e93aa...`	`7f5efe938690e511...`
*-powerpc64-linux-gnu-debug.tar.gz	`d11c0b00be5deae7...`	`09efb33aac8558ab...`
*-powerpc64-linux-gnu.tar.gz	`004050b4e0aa297b...`	`ed867ed304e9bd8b...`
*-riscv64-linux-gnu-debug.tar.gz	`4b9974943c7fde6a...`	`7faee0485ea7e303...`
*-riscv64-linux-gnu.tar.gz	`c9c043b43ac975cc...`	`994a1941d5afaa6d...`
*-x86_64-apple-darwin-unsigned.tar.gz	`0f28bd1b9bab6404...`	`0c2153e83db6da36...`
*-x86_64-apple-darwin-unsigned.zip	`3ca821a78bf5243a...`	`60f3453d772b9518...`
*-x86_64-apple-darwin.tar.gz	`cb4902c99574904c...`	`326f9a41f13f53d6...`
*-x86_64-linux-gnu-debug.tar.gz	`e3d2e19faaae8906...`	`8e6a1aadee878f3d...`
*-x86_64-linux-gnu.tar.gz	`13782a4c41a807bc...`	`2a2402b17671c7c5...`
*.tar.gz	`1ef40f849dfafbd5...`	`e8136abd8d3c8eef...`
guix_build.log	`3a1f71160fcc6070...`	`9b7ba245b998da86...`
guix_build.log.diff		`e056534bdf250b1e...`

DrahtBot removed the label DrahtBot Guix build requested on Aug 21, 2024
theuni approved
theuni commented at 6:02 pm on August 21, 2024: member

Nice. UtACK f1e39c4594295b4ce5976145ee665e38f2f8e5f1
depends: Fix CMake-generated `libzmq.pc` file
See https://github.com/zeromq/libzmq/pull/4706.
371910a768
in depends/patches/zeromq/fix_mingw_link.patch:1 in f1e39c4594 outdated
0@@ -0,0 +1,35 @@ 1+commit 0977870006bd1b02a184608ccdd27152478e98ce
fanquake commented at 10:52 am on August 28, 2024:

Isn’t an upstream commit? Can just drop the commit/author/date etc.

hebasto commented at 11:02 am on August 28, 2024:

Amended per your request.
hebasto force-pushed on Aug 28, 2024
maflcko added the label DrahtBot Guix build requested on Aug 28, 2024
fanquake approved
fanquake commented at 11:17 am on August 28, 2024: member

ACK 371910a7682ecdaf86b3e65753667746add1ecd2
DrahtBot requested review from theuni on Aug 28, 2024
fanquake merged this on Aug 28, 2024
fanquake closed this on Aug 28, 2024
hebasto deleted the branch on Aug 28, 2024
maflcko removed the label DrahtBot Guix build requested on Aug 28, 2024

Contributors
hebasto DrahtBot theuni fanquake maflcko

Review Requested
theuni

Labels
Build system

depends: Fix CMake-generated libzmq.pc file #30508

Code Coverage

Reviews

Conflicts

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

depends: Fix CMake-generated `libzmq.pc` file #30508