scripted-diff: Fix includes when secp256k1 is locally installed on macOS #20366

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:201111-incl changing 5 files +7 −8

hebasto commented at 7:35 AM on November 11, 2020: member

If secp256k1 is locally installed on macOS, during Bitcoin Core building a compiler looks for /usr/local/include/secp256k1.h instead of secp256k1.h in the source tree (#20351).

Fix #20351.

scripted-diff: Fix includes when secp256k1 is locally installed on macOS

-BEGIN VERIFY SCRIPT-
sed -i 's|#include <secp256k1|#include <secp256k1/include/secp256k1|' src/key.cpp src/pubkey.cpp src/test/fuzz/secp256k1*
sed -i '/BITCOIN_INCLUDES += -I$(srcdir)\/secp256k1\/include/d' src/Makefile.am
-END VERIFY SCRIPT-

f4a2f58b34

hebasto marked this as ready for review on Nov 11, 2020
MarcoFalke added the label Build system on Nov 11, 2020
MarcoFalke added the label Needs gitian build on Nov 11, 2020
MarcoFalke added the label Needs Guix build on Nov 11, 2020
fanquake added the label macOS on Nov 11, 2020

DrahtBot commented at 6:51 AM on November 12, 2020: member

Guix builds

File	commit fa8dd34e918cd80db215df8937aaf6bb1552fcd9<br>(master)	commit 931c5e7a0317efa2709534f2c18f518c4a588c96<br>(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`2920f7c69e16e9ae...`	`37d811c52df7660c...`
*-aarch64-linux-gnu.tar.gz	`8c8704570b205375...`	`1cb30b76baf9d533...`
*-arm-linux-gnueabihf-debug.tar.gz	`521e898a64241d9b...`	`24d3f9eb689a9c8a...`
*-arm-linux-gnueabihf.tar.gz	`f5f7a27aa5725d6b...`	`5f8bf2454be37137...`
*-riscv64-linux-gnu-debug.tar.gz	`38f7aee1c530fefc...`	`b225cf5173a374eb...`
*-riscv64-linux-gnu.tar.gz	`b050eaa1071c49f2...`	`95dc31708ee6adb9...`
*-win-unsigned.tar.gz	`679ee639127c799a...`	`936e80c509d73322...`
*-win64-debug.zip	`47655d356ac6f38b...`	`6ff7b1829c1b4ccc...`
*-win64-setup-unsigned.exe	`94edc6469f18b678...`	`ab6c9cb70432c1ea...`
*-win64.zip	`5530cd812d72aeb7...`	`9cbf7b3b95248c56...`
*-x86_64-linux-gnu-debug.tar.gz	`f562f5e9c94ed019...`	`d08f36a912b11422...`
*-x86_64-linux-gnu.tar.gz	`f818e1ec923d60dd...`	`c8a04584948518a4...`
*.tar.gz	`03fa1e65c66cd166...`	`f4b5481f4e49d7a6...`
guix_build.log	`df9b6e0870743e5d...`	`597c009d211ed2b8...`
guix_build.log.diff		`20741f085713e8d7...`

DrahtBot removed the label Needs Guix build on Nov 12, 2020
MarcoFalke commented at 6:55 AM on November 12, 2020: member

Concept ACK

DrahtBot commented at 8:24 AM on November 13, 2020: member

Gitian builds

File	commit 9bd1316697292251ed5690390794fc64517fc86b<br>(master)	commit 8ab8319391d94aa4292b8645831ab5b12e1b70be<br>(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`3db97c8d57eafd40...`	`c4bb9ea4913e3575...`
*-aarch64-linux-gnu.tar.gz	`7177e87fa21510c4...`	`5ccb2c9b56c725ca...`
*-arm-linux-gnueabihf-debug.tar.gz	`de949360e89ca7e2...`	`2f633b102cdfc313...`
*-arm-linux-gnueabihf.tar.gz	`db92b060ef5f368d...`	`a8f19a6f25557669...`
*-osx-unsigned.dmg	`b9873d776a740dfa...`	`502f231592cb214a...`
*-osx64.tar.gz	`76843fd4454474d0...`	`6b961424e65a7611...`
*-riscv64-linux-gnu-debug.tar.gz	`7800e259dfae5375...`	`4c43e58e9441d045...`
*-riscv64-linux-gnu.tar.gz	`fa1e5a6e6038d9b9...`	`919ddcbe96e8d068...`
*-win64-debug.zip	`134801c89b67e956...`	`b0ece3b6e6735bda...`
*-win64-setup-unsigned.exe	`b4ddfe0ad9081707...`	`efc881e88a0dfc12...`
*-win64.zip	`163278774d745486...`	`b079c1114aa59b32...`
*-x86_64-linux-gnu-debug.tar.gz	`888b6f88584393a1...`	`e5a4c8da7112efa7...`
*-x86_64-linux-gnu.tar.gz	`8779618b53513b4e...`	`142ef4481004f692...`
*.tar.gz	`0069354516661e24...`	`084cb8c0d566190a...`
bitcoin-core-linux-0.21-res.yml	`003deb12731f3ac3...`	`8a5e68932a144190...`
bitcoin-core-osx-0.21-res.yml	`d3c14565c88c1b9f...`	`caec1eeadeb68046...`
bitcoin-core-win-0.21-res.yml	`3e726a36d3e22fe4...`	`ea9933d9c5c47d94...`
linux-build.log	`3c1b0e7b94595c46...`	`e8e2bbb86a2036f1...`
osx-build.log	`e9caa22e1dc57761...`	`a6bb575a95ab828f...`
win-build.log	`3ff1cd4fa1e23bb3...`	`78fd36a6cfccd892...`
bitcoin-core-linux-0.21-res.yml.diff		`7f93d68562dd38b1...`
bitcoin-core-osx-0.21-res.yml.diff		`f54932f32dacc765...`
bitcoin-core-win-0.21-res.yml.diff		`f61e3cd63022fffe...`
linux-build.log.diff		`9eb1e240c20d8502...`
osx-build.log.diff		`630f0e2f31aa2e0d...`
win-build.log.diff		`0d9da2cd1ce2cc89...`

DrahtBot removed the label Needs gitian build on Nov 13, 2020
luke-jr changes_requested
luke-jr commented at 6:40 PM on November 13, 2020: member

Concept NACK. This is the wrong way to fix this.
hebasto commented at 7:51 AM on November 16, 2020: member

After upgrading Big Sur 11.0.1 from Beta 20B28 to 20B29, I'm not able to reproduce the initial buggy behavior. Also I cannot reproduce it on Catalina 10.15.7 (19H15).

Closing.
hebasto closed this on Nov 16, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

Labels

Linked (view graph)

#20351 build error with secp256k1 on OSX