-
Notifications
You must be signed in to change notification settings - Fork 37.7k
depends: Fix CMake-generated libzmq.pc
file
#30508
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
Conversation
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code CoverageFor detailed information about the code coverage, see the test coverage report. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsNo conflicts as of last run. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
00355fd depends: switch zmq to CMake (Cory Fields) 5989754 depends: add zeromq no librt patch (fanquake) b4c5f72 depends: add zeromq cmake minimum patch (fanquake) caae50a depends: add zeromq windows usage patch (fanquake) 1b55c75 depends: add zeromq builtin sha1 patch (fanquake) 73eda12 depends: add zeromq mktemp macos patch (fanquake) 30e258d fixup! cmake: Add `libzmq` optional package support (Hennadii Stepanov) fcc075d Revert "depends: Fix Autotools-generated `libzmq.pc` file" (Hennadii Stepanov) Pull request description: This PR ports bitcoin#29723. It aims to avoid conflicts when pushing the `cmake-staging` branch as an update of bitcoin#30454. Also a documenting comment added in regard to bitcoin#30508. Top commit has no ACKs. Tree-SHA512: 7976db24bd347d7ce7d63cbe7a6c6544009a93fdfb1ffc7709f2711a47c5a6c7d0bec3c03fb236a4c52ced01bfd69a778a7373484152157b359ae643a474dc00
Looks like upstream either forgot about, or missed this, so I guess someone should followup. |
Could rebase the upstream pull, which currently fails CI, to pick up the upstream CI fixes? |
Done. |
It has been just merged. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice. UtACK f1e39c4
@@ -0,0 +1,35 @@ | |||
commit 0977870006bd1b02a184608ccdd27152478e98ce |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't an upstream commit? Can just drop the commit/author/date etc.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Amended per your request.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK 371910a
66dd1b4 build: Drop no longer needed workaround (Hennadii Stepanov) Pull request description: This PR deletes a workaround that is no longer needed since #30508 was merged. ACKs for top commit: fanquake: ACK 66dd1b4 Tree-SHA512: abb8e79b525989afe88f94899e4dc29c80d4593ea23f44c6b3d08710e6ddd1619e748798534973fa4ee9f48d9fad7226445b7a2cb4aec0bdb5d1b7ff2f6689ea
371910a depends: Fix CMake-generated `libzmq.pc` file (Hennadii Stepanov) Pull request description: This is a backport of: zeromq/libzmq#4706. Similar to bitcoin#30488. Addresses bitcoin#29723 (comment): > Looking at the mingw .pc generated by this PR: > > ``` > Libs: -L${libdir} -lzmq > Libs.private: > Requires.private: > ``` > > It looks like we'll need to take [zeromq/libzmq#4706](zeromq/libzmq#4706) as well for CMake. That can be done as a follow-up though, as it's not yet merged upstream. ACKs for top commit: fanquake: ACK 371910a Tree-SHA512: 6f9c2e32f83c0e629e32fd3e4c86712af00ffeaf0906bf85e5c2df889302707b9df102e8031249d1bae036eb4fc019c2a5124655682fbc5652d9337cb21c5f2c
371910a depends: Fix CMake-generated `libzmq.pc` file (Hennadii Stepanov) Pull request description: This is a backport of: zeromq/libzmq#4706. Similar to bitcoin#30488. Addresses bitcoin#29723 (comment): > Looking at the mingw .pc generated by this PR: > > ``` > Libs: -L${libdir} -lzmq > Libs.private: > Requires.private: > ``` > > It looks like we'll need to take [zeromq/libzmq#4706](zeromq/libzmq#4706) as well for CMake. That can be done as a follow-up though, as it's not yet merged upstream. ACKs for top commit: fanquake: ACK 371910a Tree-SHA512: 6f9c2e32f83c0e629e32fd3e4c86712af00ffeaf0906bf85e5c2df889302707b9df102e8031249d1bae036eb4fc019c2a5124655682fbc5652d9337cb21c5f2c
371910a depends: Fix CMake-generated `libzmq.pc` file (Hennadii Stepanov) Pull request description: This is a backport of: zeromq/libzmq#4706. Similar to bitcoin#30488. Addresses bitcoin#29723 (comment): > Looking at the mingw .pc generated by this PR: > > ``` > Libs: -L${libdir} -lzmq > Libs.private: > Requires.private: > ``` > > It looks like we'll need to take [zeromq/libzmq#4706](zeromq/libzmq#4706) as well for CMake. That can be done as a follow-up though, as it's not yet merged upstream. ACKs for top commit: fanquake: ACK 371910a Tree-SHA512: 6f9c2e32f83c0e629e32fd3e4c86712af00ffeaf0906bf85e5c2df889302707b9df102e8031249d1bae036eb4fc019c2a5124655682fbc5652d9337cb21c5f2c
ae6e0ad Merge bitcoin#29725: depends: build libqrencode with CMake (fanquake) 1522896 fix mingw32 build (UdjinM6) 7bb1d0e Merge bitcoin#22724: windres: use PACKAGE_VERSION rather than building more version numbers (fanquake) 6bee8e2 Merge bitcoin#27496: depends: reuse _config_opts for CMake options (fanquake) 24973ee Merge bitcoin#30488: depends: Fix CMake-generated `libevent*.pc` files (merge-script) a27b08e Merge bitcoin#29835: depends: build libevent with CMake (merge-script) a204616 Merge bitcoin#30464: test, refactor: Fix MSVC warning C4101 "unreferenced local variable" (merge-script) 02aee12 Merge bitcoin#30508: depends: Fix CMake-generated `libzmq.pc` file (merge-script) e2b2446 Merge bitcoin#29723: depends: build zeromq with CMake (merge-script) 685b7a7 Merge bitcoin#23611: build: add `LTO` option to depends (laanwj) d2b8c6b Merge bitcoin#19952: build, ci: Add file-based logging for individual packages (laanwj) fc1c29c partial Merge bitcoin#23478: build: Add support for Android NDK r23 LTS (fanquake) Pull request description: ## Issue being fixed or feature implemented depends on #6293 ## What was done? _Describe your changes in detail_ ## How Has This Been Tested? _Please describe in detail how you tested your changes._ _Include details of your testing environment, and the tests you ran to see how your change affects other areas of the code, etc._ ## Breaking Changes _Please describe any breaking changes your code introduces_ ## Checklist: _Go over all the following points, and put an `x` in all the boxes that apply._ - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK ae6e0ad knst: utACK ae6e0ad knst: utACK ae6e0ad Tree-SHA512: 0606c7596394155417ad0fea96ce7e1f905109ce2978987e1c4132e8b0f5a8593c5c62ea7217510169228e8238ba42b418a74635ded01f5d674f62495ad3b3a9
See zeromq/libzmq#4706. Github-Pull: bitcoin#30508 Rebased-From: 371910a
This is a backport of: zeromq/libzmq#4706.
Similar to #30488.
Addresses #29723 (comment):