diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-05-29 14:19:15 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-05-29 14:21:21 +0200 |
| commit | c7cfd20a77ce57d200b3b9e5e0dfb0d63818abdc (patch) | |
| tree | 9206149684d022ce161b0ca10ce684e038e032ea | |
| parent | abcce46a33afbd746c805768b6a6141bd09705ea (diff) | |
| parent | 00fade007c8c0aba82a2a8c40129ae0b6e530d33 (diff) | |
| download | bitcoin-c7cfd20a77ce57d200b3b9e5e0dfb0d63818abdc.tar.xz | |
Merge #16086: contrib: use newer config.guess & config.sub in install_db4.sh
00fade007c8c0aba82a2a8c40129ae0b6e530d33 contrib: use newer config.guess & config.sub in install_db4.sh (fanquake)
Pull request description:
The `config.guess` and `config.sub` packaged with `db-4.8.30.NC.tar.gz` are fairly old (2009) and fail to identify some system types i.e `ppc64le`. Replace them with more modern versions before configuring `db4`.
Fixes #16064.
ACKs for commit 00fade:
jamesob:
tACK https://github.com/bitcoin/bitcoin/pull/16086/commits/00fade007c8c0aba82a2a8c40129ae0b6e530d33
dongcarl:
utACK 00fade007c8c0aba82a2a8c40129ae0b6e530d33
laanwj:
Tested ACK 00fade007c8c0aba82a2a8c40129ae0b6e530d33
Tree-SHA512: 54f9f2b0fcf802e6a284214035fcb3833577aa5881beb293921b6036b71d0bcd0872f06d14ddc76a4f8c0eee7ba71461dcc99dc907e7ddb5ae403fc02b245538
| -rwxr-xr-x | contrib/install_db4.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/contrib/install_db4.sh b/contrib/install_db4.sh index 088d1c9dce..47594a5b0a 100755 --- a/contrib/install_db4.sh +++ b/contrib/install_db4.sh @@ -70,6 +70,20 @@ CLANG_CXX11_PATCH_HASH='7a9a47b03fd5fb93a16ef42235fa9512db9b0829cfc3bdf90edd3ec1 http_get "${CLANG_CXX11_PATCH_URL}" clang.patch "${CLANG_CXX11_PATCH_HASH}" patch -p2 < clang.patch +# The packaged config.guess and config.sub are ancient (2009) and can cause build issues. +# Replace them with modern versions. +# See https://github.com/bitcoin/bitcoin/issues/16064 +CONFIG_GUESS_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=55eaf3e779455c4e5cc9f82efb5278be8f8f900b' +CONFIG_GUESS_HASH='2d1ff7bca773d2ec3c6217118129220fa72d8adda67c7d2bf79994b3129232c1' +CONFIG_SUB_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=55eaf3e779455c4e5cc9f82efb5278be8f8f900b' +CONFIG_SUB_HASH='3a4befde9bcdf0fdb2763fc1bfa74e8696df94e1ad7aac8042d133c8ff1d2e32' + +rm -f "dist/config.guess" +rm -f "dist/config.sub" + +http_get "${CONFIG_GUESS_URL}" dist/config.guess "${CONFIG_GUESS_HASH}" +http_get "${CONFIG_SUB_URL}" dist/config.sub "${CONFIG_SUB_HASH}" + cd build_unix/ "${BDB_PREFIX}/${BDB_VERSION}/dist/configure" \ |