build: bdb detection and configuration fixes for macOs/brew #3308
Conversation
This file contains 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
This was referenced Aug 7, 2023
Fixes the detection of bdb on brew enabled systems by using dogecoin_find_bdb53.m4 parametrization and checking if the brew-located files actually work. Searches brew installed packages in the order: 5.x, 4.x, default. The reason for this order is that 4.x is still fully readable by 5.3.27NC that is distributed by default, and therefore prefered over newer-than 5.x versions.
patricklodder
force-pushed
the
1.14.7-fix-brew
branch
from
dca56de to
b09aa70
Compare
|
ACK, all tests pass on 64-bit x86-Linux and the code changes make sense to me. I think we should have another test on Mac though. @michilumin can you take this for a spin too? |
|
Yup will do. About a day until I get back to my Mac but yes. |
michilumin
reviewed
Sep 25, 2023
|
Using brew berkeley-db@5 (vs berkeley-db), configures OK, builds OK, passes all unit tests (Core 2/2, libsec 2/2, univalue 3/3), on x86 Mac OS 13/Ventura build 13.6 (Intel, virgin install to ext SSD.) |
|
wrong button. |
michilumin
approved these changes
Sep 28, 2023
|
With Michi's approval, we're well past the 24 hour merge window so here we go! |
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Currently, brew logic in
configure.acalways adds the defaultberkeley-dbpath when compiling on macOs. This causes link-time and/or run-time issues when the default version (18.x) is installed on the compiling system, and prevents proper linking when using thecontrib/install_bdb.shscript. This has been blocking #2686.This PR fixes that issue by:
dogecoin_find_bdb53.m4to also check manually specifiedBDB_CFLAGSandBDB_LIBS. This prevents link-time and run-time errors by catching the error during configuration.BITCOIN_FIND_BDB53m4 macro when using brew for bdb detection instead of appending values to the genericCPPFLAGSandLIBS, because these are used generically for every binary and can cause issues with libtool archive scope.BDB_CFLAGSorBDB_LIBSis manually given. This is to allow maximum flexibility for custom compiles, while retaining automatic configuration.berkeley-dbpackage, in the order@5,@4and only then the default version. The reason for this detection order is that 4.x is still fully readable by 5.3.27NC that is distributed by default, and therefore preferred over newer-than 5.x versions.I've tested this to work on x86_64-linux, arm64-darwin and x86_64-darwin
After applying this patch on top of #3301, configuration on macOs only requires manual specification of boost, i.e.:
./autogen.sh ./configure --with-boost=`brew --prefix boost`Note: this PR is best tested on top of #3301, so it's probably best to rebase this after that, or an alternative fix, gets merged.