Add /opt/local/include/db48 only if it exists. #5395

pull paveljanik wants to merge 1 commits into bitcoin:master from paveljanik:no_db48_path changing 1 files +6 −2

paveljanik commented at 9:02 AM on November 30, 2014: contributor

On one of my Mac OS X machines, I do have MacPorts installed, but no Berkeley DB (it is elsewhere). Thus /opt/local/include/db48 doesn't exist and our build shows too many warnings for that. Silence them. Low prio.
Add /opt/local/include/db48 only if it exists. 4c69ebed44
jonasschnelli commented at 9:03 AM on November 30, 2014: contributor

utACK
laanwj added the label Build system on Dec 2, 2014
laanwj added the label Mac on Dec 2, 2014
laanwj commented at 8:17 AM on December 2, 2014: member

Deferring this to @theuni when he comes back.
gavinandresen commented at 5:09 PM on December 2, 2014: contributor

Tested ACK from me.

NOTE: secp256k1 configure needs a similar fix, I think.
paveljanik commented at 5:47 PM on December 2, 2014: contributor

@gavinandresen do you mean src/secp256k1/configure.ac and -I/opt/local/include/-L...?
theuni commented at 7:53 PM on December 8, 2014: member

ut ACK. After this, we should also sync up with the most recent fixes to secp256k1, which changes the behavior so that macports paths are only added if homebrew paths aren't.
laanwj merged this on Dec 10, 2014
laanwj closed this on Dec 10, 2014
laanwj referenced this in commit 12c05ee938 on Dec 10, 2014
paveljanik deleted the branch on Dec 10, 2014
paveljanik commented at 7:40 AM on December 10, 2014: contributor

@gavinandresen ping - what is needed in secp256k1? Is it about /opt/local/include? If you have port command installed, it should be available thus no warnings should be emitted because of this.
theuni commented at 5:19 PM on December 10, 2014: member

@paveljanik This is already fixed-ish in secp256k1, though it's possible that the fix hasn't made it downstream into the bitcoin repo yet. See https://github.com/bitcoin/secp256k1/commit/e2274c58e66759dd4a9502734c8a289a09e44083 . This is what I was referencing in my comment above.

I suppose we could add the path detection there as well, but it's not as necessary since the paths are only added if homebrew isn't installed.
paveljanik commented at 5:37 PM on December 10, 2014: contributor

Yes, I think this is now fixed completely.
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels