diff options
author | rion <rion@cs.stanford.edu> | 2015-06-15 21:02:29 -0700 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-17 08:58:35 +0200 |
commit | 3902c15a03ee24c4268a9b3e9c8dc81dba515eaa (patch) | |
tree | 6bcb264b334c0928775422fbff20ab6e8b2d871f /doc | |
parent | ef1d5060544fd4f468a19b090fabae5e3be84e1e (diff) | |
download | bitcoin-3902c15a03ee24c4268a9b3e9c8dc81dba515eaa.tar.xz |
remove berkeley-db4 workaround
"brew install berkeley-db4" appears to be working again. simplified instructions by removing the berkeley-db4 workaround.
Github-Pull: #6286
Rebased-From: a3a80c253cdd0299f92b9e1ba9888f0f9421f245
Diffstat (limited to 'doc')
-rw-r--r-- | doc/build-osx.md | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/doc/build-osx.md b/doc/build-osx.md index 913e72519f..dc319dd1c4 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -32,33 +32,10 @@ Instructions: Homebrew #### Install dependencies using Homebrew - brew install autoconf automake libtool boost miniupnpc openssl pkg-config protobuf qt5 + brew install autoconf automake berkeley-db4 libtool boost miniupnpc openssl pkg-config protobuf qt5 NOTE: Building with Qt4 is still supported, however, could result in a broken UI. As such, building with Qt5 is recommended. -#### Installing berkeley-db4 using Homebrew - -The homebrew package for berkeley-db4 has been broken for some time. It will install without Java though. - -Running this command takes you into brew's interactive mode, which allows you to configure, make, and install by hand: -``` -$ brew install https://raw.github.com/homebrew/homebrew/master/Library/Formula/berkeley-db4.rb -–without-java -``` - -The rest of these commands are run inside brew interactive mode: -``` -/private/tmp/berkeley-db4-UGpd0O/db-4.8.30 $ cd .. -/private/tmp/berkeley-db4-UGpd0O $ db-4.8.30/dist/configure --prefix=/usr/local/Cellar/berkeley-db4/4.8.30 --mandir=/usr/local/Cellar/berkeley-db4/4.8.30/share/man --enable-cxx -/private/tmp/berkeley-db4-UGpd0O $ make -/private/tmp/berkeley-db4-UGpd0O $ make install -/private/tmp/berkeley-db4-UGpd0O $ exit -``` - -After exiting, you'll get a warning that the install is keg-only, which means it wasn't symlinked to `/usr/local`. You don't need it to link it to build bitcoin, but if you want to, here's how: - - $ brew link --force berkeley-db4 - - ### Building `bitcoind` 1. Clone the github tree to get the source code and go into the directory. |