Skip to content

Commit 76ae7a1

Browse files
committed
Merge #14515: doc: Update OpenBSD build guide for 6.4
33ae985 doc: Update OpenBSD build guide for 6.4 (fanquake) 6d247b1 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
2 parents 15a219f + 33ae985 commit 76ae7a1

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,6 @@ test/cache/*
116116

117117
libbitcoinconsensus.pc
118118
contrib/devtools/split-debug.sh
119+
120+
# Output from running db4 installation
121+
db4/

doc/build-openbsd.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
OpenBSD build guide
22
======================
3-
(updated for OpenBSD 6.3)
3+
(updated for OpenBSD 6.4)
44

55
This guide describes how to build bitcoind and command-line utilities on OpenBSD.
66

@@ -14,7 +14,7 @@ Run the following as root to install the base dependencies for building:
1414
```bash
1515
pkg_add git gmake libevent libtool boost
1616
pkg_add autoconf # (select highest version, e.g. 2.69)
17-
pkg_add automake # (select highest version, e.g. 1.15)
17+
pkg_add automake # (select highest version, e.g. 1.16)
1818
pkg_add python # (select highest version, e.g. 3.6)
1919

2020
git clone https://github.com/bitcoin/bitcoin.git
@@ -60,8 +60,8 @@ Preparation:
6060
export AUTOCONF_VERSION=2.69
6161

6262
# Replace this with the automake version that you installed. Include only
63-
# the major and minor parts of the version: use "1.15" for "automake-1.15.1".
64-
export AUTOMAKE_VERSION=1.15
63+
# the major and minor parts of the version: use "1.16" for "automake-1.16.1".
64+
export AUTOMAKE_VERSION=1.16
6565

6666
./autogen.sh
6767
```

0 commit comments

Comments
 (0)