diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-05 13:25:51 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-05 13:26:37 +0100 |
commit | 76ae7a1ac9b18437e89b54fa23bc22cff507ad42 (patch) | |
tree | 1d4362cb7ab58459a8dd89631647213c9ae42b3f | |
parent | 15a219ff8eaed23acb31fcf2ef54b55bd22ee3e8 (diff) | |
parent | 33ae985912623dbee39e2689743fa9a29e31f632 (diff) | |
download | bitcoin-76ae7a1ac9b18437e89b54fa23bc22cff507ad42.tar.xz |
Merge #14515: doc: Update OpenBSD build guide for 6.4
33ae985912623dbee39e2689743fa9a29e31f632 doc: Update OpenBSD build guide for 6.4 (fanquake)
6d247b1148c61ab7923f324a425d8185dcf1616b gitignore contents of db4 folder (Marty Jones)
Pull request description:
Includes a commit from #14314.
The `disable-dependency-tracking ` workaround is still required to run `./configure` (cc #14404).
`gmake check -j4` pass.
`src/bitcoind` runs and "starts" syncing.
Tree-SHA512: 72d78eb0d94fc4f2bbcf901d867f10f0e85d8a4f43969c598953278343ed826a26d1ebe6772dcc0fbd1fc608e88b7c86e31656232c1efb0656c537176fb9de4c
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | doc/build-openbsd.md | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index d083c63ea0..380d2eab98 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,6 @@ test/cache/* libbitcoinconsensus.pc contrib/devtools/split-debug.sh + +# Output from running db4 installation +db4/ diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md index 48ac0525b9..dad2566a6c 100644 --- a/doc/build-openbsd.md +++ b/doc/build-openbsd.md @@ -1,6 +1,6 @@ OpenBSD build guide ====================== -(updated for OpenBSD 6.3) +(updated for OpenBSD 6.4) This guide describes how to build bitcoind and command-line utilities on OpenBSD. @@ -14,7 +14,7 @@ Run the following as root to install the base dependencies for building: ```bash pkg_add git gmake libevent libtool boost pkg_add autoconf # (select highest version, e.g. 2.69) -pkg_add automake # (select highest version, e.g. 1.15) +pkg_add automake # (select highest version, e.g. 1.16) pkg_add python # (select highest version, e.g. 3.6) git clone https://github.com/bitcoin/bitcoin.git @@ -60,8 +60,8 @@ Preparation: export AUTOCONF_VERSION=2.69 # Replace this with the automake version that you installed. Include only -# the major and minor parts of the version: use "1.15" for "automake-1.15.1". -export AUTOMAKE_VERSION=1.15 +# the major and minor parts of the version: use "1.16" for "automake-1.16.1". +export AUTOMAKE_VERSION=1.16 ./autogen.sh ``` |