Skip to content

Conversation

@hebasto
Copy link
Member

@hebasto hebasto commented Jul 23, 2024

This PR amends #30490 and bumps the upstream branch, which now includes a required CMake fix.

Addresses #30490 (comment).

The CI logs are available in #29790 where the recent push uses this PR implementation.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jul 23, 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 ryanofsky, theuni

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

@hebasto
Copy link
Member Author

hebasto commented Jul 23, 2024

cc @ryanofsky @theuni

@fanquake
Copy link
Member

Any reason to not include the most recent merge?

@ryanofsky
Copy link
Contributor

Any reason to not include the most recent merge?

It would be nice to include bitcoin-core/libmultiprocess#104 not just bitcoin-core/libmultiprocess#103, though only 103 should be necessary to fix problems with CMake.

104 is just nice because it lets earlier commits of #30510 compile, since they include empty structs.

@fanquake
Copy link
Member

Seems good to pull it in then, and unblock other work, otherwise we are just going to have to bump again.

Copy link
Contributor

@ryanofsky ryanofsky left a comment

Choose a reason for hiding this comment

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

Code review ACK a9bfa3a

(checked version hash locally and ran make MULTIPROCESS=1 native_libmultiprocess_extracted to check the package hash)

@hebasto
Copy link
Member Author

hebasto commented Jul 23, 2024

It would be nice to include chaincodelabs/libmultiprocess#104 not just chaincodelabs/libmultiprocess#103, though only 103 should be necessary to fix problems with CMake.

104 is just nice because it lets earlier commits of #30510 compile, since they include empty structs.

bitcoin-core/libmultiprocess#104 has been included.

Copy link
Contributor

@ryanofsky ryanofsky left a comment

Choose a reason for hiding this comment

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

Code review ACK ec0e805

Copy link
Member

@theuni theuni left a comment

Choose a reason for hiding this comment

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

Sorry for jumping the gun and causing extra churn with #30490. Hopefully this is the last bump for CMake :)

utACK ec0e805.

@ryanofsky
Copy link
Contributor

Sorry for jumping the gun and causing extra churn with #30490. Hopefully this is the last bump for CMake :)

I probably should have asked about this when I reviewed #30490. I knew the cmake changes it included caused problems earlier, but I assumed the problems were fixed since then.

@fanquake fanquake merged commit 1518c08 into bitcoin:master Jul 24, 2024
@hebasto hebasto deleted the 240723-mp branch July 24, 2024 08:11
hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 24, 2024
1995169 fixup! cmake: Add `MULTIPROCESS` option (Hennadii Stepanov)
fbf9a64 fixup! build: Generate `toolchain.cmake` in depends (Hennadii Stepanov)
4ef9fc6 depends: Bump `libmultiprocess` for CMake fixes (Hennadii Stepanov)
ff3916c depends: bump libmultiprocess for CMake fixes (Cory Fields)
07f6cd7 Revert "depends: Bump libmultiprocess source" (Hennadii Stepanov)

Pull request description:

  This PR ports bitcoin#30490 and bitcoin#30513.

  The first commit ensures there are no conflicts when applying commits being ported.

Top commit has no ACKs.

Tree-SHA512: 6dbfc608aedcc3ab991b2983146a459f64b43f57f6612ffdaf1152b83591cb260a885e86dd8aed25c46869d197582a59fa780932c3fad1ffa150fe8aa4fee010
@hebasto
Copy link
Member Author

hebasto commented Jul 24, 2024

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

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Oct 3, 2024
ec0e805 depends: Bump `libmultiprocess` for CMake fixes (Hennadii Stepanov)

Pull request description:

  This PR amends bitcoin#30490 and bumps the upstream branch, which now includes a required CMake [fix](bitcoin-core/libmultiprocess#103).

  Addresses bitcoin#30490 (comment).

  The CI logs are available in bitcoin#29790 where the recent [push](https://github.com/hebasto/bitcoin/tree/pr29790-0723.2.mp) uses this PR implementation.

ACKs for top commit:
  ryanofsky:
    Code review ACK ec0e805
  theuni:
    utACK ec0e805.

Tree-SHA512: e300a27bcab80a63a518719e9af8e10a938294fc07289cadbf4a7744627c10b0e9541a36971d08b65152f3f7d0eb434e427274d9c9d9f0bdd216afd914027a0f
PastaPastaPasta added a commit to dashpay/dash that referenced this pull request Oct 4, 2024
2f751ed fixup! Merge bitcoin#30567: qt, build: Drop `QT_STATICPLUGIN` macro (pasta)
142245d Merge bitcoin#29733: build, macos: Drop unused `osx_volname` target (fanquake)
02f81e5 Merge bitcoin#23511: require glibc 2.18+ (pasta)
9f0e4ae Merge bitcoin#29706: depends: set two CMake options globally (fanquake)
be07bbe Merge bitcoin#28846: depends: fix libmultiprocess build on aarch64 (fanquake)
0dea194 Merge bitcoin#28856: depends: Build the `native_capnp` and `capnp` packages with CMake (fanquake)
a23eee1 partial Merge bitcoin#23619: build: Propagate user-defined flags to host packages (fanquake)
7cdacdc Merge bitcoin#30513: depends: Bump `libmultiprocess` for CMake fixes (merge-script)
4f44750 Merge bitcoin#30491: Fix MSVC warning C4273 "inconsistent dll linkage" (merge-script)
5ba1309 Merge bitcoin#30567: qt, build: Drop `QT_STATICPLUGIN` macro (merge-script)

Pull request description:

  ## Issue being fixed or feature implemented
  Batch of more PRs that I found during make work

  ## What was done?

  ## How Has This Been Tested?
  hasn't yet

  ## Breaking Changes

  ## 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
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  knst:
    utACK 2f751ed
  UdjinM6:
    utACK 2f751ed

Tree-SHA512: 1d8433daaf8dc8c8f04beca1cf0281f0dc29a623e5e8ed941bcb556568d72d8ce0ac5b5c001b10645fdffaa4e7083b76d61075049b2418bb8dd9b5ba0f53a8a9
@bitcoin bitcoin locked and limited conversation to collaborators Jul 24, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

No open projects
Status: ⭐ Prerequisites

Development

Successfully merging this pull request may close these issues.

5 participants