aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2019-05-24 15:45:46 -0400
committerfanquake <fanquake@gmail.com>2019-05-24 15:48:34 -0400
commit00fade007c8c0aba82a2a8c40129ae0b6e530d33 (patch)
tree252a8e14fcf7954d1a3829780a53793baff6566c
parent65c4bbe629bbb6eb4347d35a12b0b1c90eeabce9 (diff)
contrib: use newer config.guess & config.sub in install_db4.sh
-rwxr-xr-xcontrib/install_db4.sh14
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" \