Skip to content

Commit 1558ff7

Browse files
committed
Update install_db4.sh
1 parent 5c92f16 commit 1558ff7

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

contrib/install_db4.sh

+16-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export LC_ALL=C
66
set -e
77

88
if [ -z "${1}" ]; then
9-
echo "Usage: ./install_db4.sh <base-dir> [<extra-bdb-configure-flag> ...]"
9+
echo "Usage: $0 <base-dir> [<extra-bdb-configure-flag> ...]"
1010
echo
1111
echo "Must specify a single argument: the directory in which db4 will be built."
1212
echo "This is probably \`pwd\` if you're at the root of the pivx repository."
@@ -51,7 +51,7 @@ http_get() {
5151
if [ -f "${2}" ]; then
5252
echo "File ${2} already exists; not downloading again"
5353
elif check_exists curl; then
54-
curl --insecure "${1}" -o "${2}"
54+
curl --insecure --retry 5 "${1}" -o "${2}"
5555
else
5656
wget --no-check-certificate "${1}" -O "${2}"
5757
fi
@@ -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)