Skip to content

Commit c7cfd20

Browse files
committed
Merge bitcoin#16086: contrib: use newer config.guess & config.sub in install_db4.sh
00fade0 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 bitcoin#16064. ACKs for commit 00fade: jamesob: tACK bitcoin@00fade0 dongcarl: utACK 00fade0 laanwj: Tested ACK 00fade0 Tree-SHA512: 54f9f2b0fcf802e6a284214035fcb3833577aa5881beb293921b6036b71d0bcd0872f06d14ddc76a4f8c0eee7ba71461dcc99dc907e7ddb5ae403fc02b245538
2 parents abcce46 + 00fade0 commit c7cfd20

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

contrib/install_db4.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,20 @@ CLANG_CXX11_PATCH_HASH='7a9a47b03fd5fb93a16ef42235fa9512db9b0829cfc3bdf90edd3ec1
7070
http_get "${CLANG_CXX11_PATCH_URL}" clang.patch "${CLANG_CXX11_PATCH_HASH}"
7171
patch -p2 < clang.patch
7272

73+
# The packaged config.guess and config.sub are ancient (2009) and can cause build issues.
74+
# Replace them with modern versions.
75+
# See https://github.com/bitcoin/bitcoin/issues/16064
76+
CONFIG_GUESS_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=55eaf3e779455c4e5cc9f82efb5278be8f8f900b'
77+
CONFIG_GUESS_HASH='2d1ff7bca773d2ec3c6217118129220fa72d8adda67c7d2bf79994b3129232c1'
78+
CONFIG_SUB_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=55eaf3e779455c4e5cc9f82efb5278be8f8f900b'
79+
CONFIG_SUB_HASH='3a4befde9bcdf0fdb2763fc1bfa74e8696df94e1ad7aac8042d133c8ff1d2e32'
80+
81+
rm -f "dist/config.guess"
82+
rm -f "dist/config.sub"
83+
84+
http_get "${CONFIG_GUESS_URL}" dist/config.guess "${CONFIG_GUESS_HASH}"
85+
http_get "${CONFIG_SUB_URL}" dist/config.sub "${CONFIG_SUB_HASH}"
86+
7387
cd build_unix/
7488

7589
"${BDB_PREFIX}/${BDB_VERSION}/dist/configure" \

0 commit comments

Comments
 (0)