Don't set BDB flags when configuring without#20478
Merged
jonasschnelli merged 1 commit intobitcoin:masterfrom Dec 1, 2020
Merged
Don't set BDB flags when configuring without#20478jonasschnelli merged 1 commit intobitcoin:masterfrom
jonasschnelli merged 1 commit intobitcoin:masterfrom
Conversation
Contributor
Author
|
Missed in #20202. |
Contributor
|
Tested ACK 982e548. |
laanwj
reviewed
Nov 24, 2020
| @@ -643,7 +643,7 @@ case $host in | |||
|
|
|||
| bdb_prefix=$($BREW --prefix berkeley-db4 2>/dev/null) | |||
Member
There was a problem hiding this comment.
I guess it shouldn't even call brew here in case bdb is not used?
Contributor
Author
There was a problem hiding this comment.
brew just returns the expected directory (based on the available - also uninstalled – formulas). But we could also just avoid the brew call (complicated the folding though...)
Contributor
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Dec 1, 2020
jonasschnelli
added a commit
that referenced
this pull request
Dec 4, 2020
…tually installed d3ef947 build: Check that Homebrew's berkeley-db4 package is actually installed (Hennadii Stepanov) Pull request description: On master (a0489f3) the `configure` script is not able to determine that Homebrew's `berkeley-db4` package is uninstalled. This causes a compile error on macOS. With this PR, and with the [uninstalled](https://stackoverflow.com/questions/20802320/detect-if-homebrew-package-is-installed) `berkeley-db4` package: ``` % ./configure -q configure: error: libdb_cxx headers missing, Bitcoin Core requires this library for BDB wallet support (--without-bdb to disable BDB wallet support) ``` Related #20478. ACKs for top commit: promag: Tested ACK d3ef947. willcl-ark: tACK d3ef947 jonasschnelli: utACK d3ef947 Tree-SHA512: 8dc532e08249ec63bd357594aa458d314b6e8537fc63f5b1d509c84d0d71d5b1f70172caa1a7efe2fc8af31c829e7982a0695cf3fbe5cbc477019550269915e1
Member
maflcko
pushed a commit
to maflcko/bitcoin-core
that referenced
this pull request
Dec 10, 2020
Github-Pull: bitcoin#20478 Rebased-From: 982e548
Member
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Configuring
--without-bdbon MacOS leads to a compile error (when BerkeleyDB is not installed).brew --prefix berkeley-db4always reports the target directory (even if not installed).This PR prevents BDB_CFLAGS (et al) from being populated when configuring
--without-bdb