Instead of maintaining rote instructions for building BerkeleyDB in doc/build-{unix,openbsd}.md, reference a script that does the same thing and can be called from unanticipated contexts, e.g. Docker builds.
The script was written with portability in mind, though I haven't tested it on openbsd.
I wasn't sure if we wanted to create a separate directory for this sort of thing (e.g. contrib/install) so I just stuck it in contrib/; happy to move it around if anyone has another preference.
26 | + 27 | +tar -xzvf ${BDB_VERSION}.tar.gz -C $BDB_PREFIX 28 | + 29 | +rm "${BDB_VERSION}.tar.gz" 30 | + 31 | +cd "${BDB_PREFIX}/${BDB_VERSION}/build_unix/"
seems not to work with relative path
18 | +BDB_HASH='12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef' 19 | +BDB_URL="https://download.oracle.com/berkeley-db/${BDB_VERSION}.tar.gz" 20 | + 21 | +mkdir -p $BDB_PREFIX 22 | + 23 | +wget --no-check-certificate "${BDB_URL}" -O "${BDB_VERSION}.tar.gz"
would be great if we could have a curl --insecure fallback if wget is not present. IMO curl should be the default nowadays.
20 | + 21 | +mkdir -p $BDB_PREFIX 22 | + 23 | +wget --no-check-certificate "${BDB_URL}" -O "${BDB_VERSION}.tar.gz" 24 | + 25 | +echo "${BDB_HASH} ${BDB_VERSION}.tar.gz" | sha256sum -c
sha256sum should have a fallback to shasum -a 256
Concept ACK. Ideally this would also work on OSX. See points above and maybe – if you can – apply this patch in case of macOS: https://github.com/narkoleptik/os-x-berkeleydb-patch/blob/master/atomic.patch
If not interested to support this on OSX (can also be done later...), please mention in the new script that this is linux/bsd only.
Thanks for the good feedback, @jonasschnelli. I've incorporated your inline comments and am now testing use on OS X. Will report back when I finish testing.
I've completed testing on Ubuntu 17.04 and macOS 10.12.1. I've also added reference to the script in doc/build-osx.md.
Very nice! Concept ACK. I'll test on OpenBSD.
25 | +check_exists() { 26 | + which "$1" >/dev/null 2>&1 27 | +} 28 | + 29 | +http_get() { 30 | + if check_exists curl; then
Might add a comment that this skipping cert check is acceptable because we check the SHA256 hash later, or even roll the sha256_check into the download function so that it is impossible to accidentally skip it.
Good idea, will do.
0 | @@ -0,0 +1,77 @@ 1 | +#!/bin/sh
Should be part of the tarball / make dist (DIST_CONTRIB in Makefile.am)
Done, thanks!
41 | + echo "${1} ${2}" | shasum -a 256 -c 42 | + fi 43 | +} 44 | + 45 | +mkdir -p "${BDB_PREFIX}" 46 | +http_get "${BDB_URL}" "${BDB_VERSION}.tar.gz"
We shouldn't download the file if it already exists.
Small patch for openbsd:
--- install_db4.sh Thu Nov 16 10:10:50 2017
+++ install_db4.sh.new Thu Nov 16 09:56:10 2017
@@ -31,6 +31,8 @@
#
if check_exists sha256sum; then
echo "${1} ${2}" | sha256sum -c
+ elif check_exists sha256; then
+ echo "${1} ${2}" | sha256 -c
else
echo "${1} ${2}" | shasum -a 256 -c
fi
With this, it works. I'm surprised :)
52 | +} 53 | + 54 | +mkdir -p "${BDB_PREFIX}" 55 | +http_get "${BDB_URL}" "${BDB_VERSION}.tar.gz" "${BDB_HASH}" 56 | +tar -xzvf ${BDB_VERSION}.tar.gz -C "$BDB_PREFIX" 57 | +rm "${BDB_VERSION}.tar.gz"
I personally wouldn't remove the tar.gz here. I like to keep it around in case I want/need to re-build (e.g. new gcc version).
Nice! Works on macOS.
Tested ACK (OSX) d573d7c6783b658283c60689524cc3c3e2a407a8.
Instead of maintaining not-easily-tested instructions for building BerkeleyDB
in doc/build-unix.md, package the installation as a script in contrib/. This
allows shared usage from a number of contexts, e.g. Docker.
Thanks to @jonasschnelli, @laanwj for feedback.
wasn't sure how to best do attribution for the patch
it's ok - mentioning in the commit message is ok for those two lines, no need to keep it as separate commit :)
Re-tested ACK https://github.com/bitcoin/bitcoin/pull/11702/commits/6e4cdd67b1f2b3927a525ebba843c27ef3c63e1c