Similar to #30488. Broken out of #30454. This is just taking the (merged) upstreamed PR: https://github.com/zeromq/libzmq/pull/4667
On top of #29723 as that would otherwise conflict and is likely to be merged soon. I’ll rebase here and undraft after that’s merged.
Like #30488, this may be obsoleted soon after switching to building with CMake because we’ll be able to use those files rather than pkg-config, but again it doesn’t hurt to have the fixed files.