Fix protobuf linking when building without the wallet
ClosedPublic
Actions

Authored by jasonbcox on Dec 22 2019, 17:47.

Details

Reviewers

deadalnix
Fabien

Group Reviewers

Restricted Project

Commits

rSTAGING18413b603601: Fix protobuf linking when building without the wallet
rABC18413b603601: Fix protobuf linking when building without the wallet

Summary

This last minute modification of D4619: https://reviews.bitcoinabc.org/D4619?vs=14737&id=15017#toc broke the build without the wallet (regardless of the value for ENABLE_BIP70). Digging into my build history, I found I accidentally tested that change with -DBUILD_WITHWALLET=OFF instead of the correct -DBUILD_BITCOIN_WALLET=OFF

This patch fixes the linking such that the build works as expected when the wallet is disabled but BIP70 is still enabled.

Test Plan

cmake -GNinja -DBUILD_BITCOIN_WALLET=OFF ..
ninja check

Also run build-without-wallet on CI for sanity.

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

jasonbcox created this revision.Dec 22 2019, 17:47

Herald added a reviewer: deadalnix. · View Herald TranscriptDec 22 2019, 17:47

jasonbcox planned changes to this revision.Dec 22 2019, 17:47

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8681: Diff 15071.Dec 22 2019, 18:08

jasonbcox edited the summary of this revision. (Show Details)Dec 22 2019, 19:19

jasonbcox edited the test plan for this revision. (Show Details)

jasonbcox requested review of this revision.Dec 22 2019, 19:39

jasonbcox edited the summary of this revision. (Show Details)

jasonbcox edited the test plan for this revision. (Show Details)

deadalnix requested changes to this revision.Dec 23 2019, 00:01

deadalnix added inline comments.

src/qt/CMakeLists.txt
126 ↗	(On Diff #15071)	Is there something so terrible about that if that it cannot be used?

This revision now requires changes to proceed.Dec 23 2019, 00:01

Move target_link_libraries to already existing ENABLE_BIP70 branch.

Build Bitcoin-ABC / Diffs / Diff Testing started.

jasonbcox edited the test plan for this revision. (Show Details)Jan 2 2020, 21:28

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8711: Diff 15114.Jan 2 2020, 21:37

Fabien accepted this revision.Jan 2 2020, 22:11

The diff's description is misleading. The required changes were not the cause of the problem, as teh change you had to make in this very patch demonstrate.

The code is looks correct now.

This revision now requires changes to proceed.Jan 3 2020, 06:10

deadalnix accepted this revision.Jan 3 2020, 06:10

This revision is now accepted and ready to land.Jan 3 2020, 06:10

jasonbcox edited the summary of this revision. (Show Details)Jan 3 2020, 17:19

Closed by commit rABC18413b603601: Fix protobuf linking when building without the wallet (authored by jasonbcox). · Explain WhyJan 3 2020, 17:30

This revision was automatically updated to reflect the committed changes.

jasonbcox added a commit: rABC18413b603601: Fix protobuf linking when building without the wallet.

jasonbcox added a commit: rSTAGING18413b603601: Fix protobuf linking when building without the wallet.Apr 7 2020, 22:15