Skip to content

Commit

Permalink
Merge #12095: [contrib] Use BDB_LIBS/CFLAGS and pass --disable-replic…
Browse files Browse the repository at this point in the history
…ation

f3196a0 [contrib] Add --disable-replication to install_db4 (fanquake)
311a423 [contrib] Use BDB_LIBS/CFLAGS in install_db4 (fanquake)

Pull request description:

  Switch install_db4 to use BDB_LIBS/BDB_CFLAGS, mentioned [here](https://github.com/bitcoin/bitcoin/pull/12041/files#r159616003).

  Pass ```--disable-replication``` to configure to match what we do in [depends](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/bdb.mk#L9).

  Documentation about --disable-replication is available [here](https://docs.oracle.com/cd/E17275_01/html/programmer_reference/build_unix_small.html).

Tree-SHA512: 6f58728f27859614f499719583b0c2e8cd0ee89cb7e8fa34d1c54399877d6822ec2d8549c72ae4aff61daf7169bd330ad6ddc6c81e63008dedf028abd834f24c
  • Loading branch information
laanwj committed Jan 29, 2018
2 parents 000ac4f + f3196a0 commit 3fa1ab4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/install_db4.sh
Expand Up @@ -72,7 +72,7 @@ patch -p2 < clang.patch
cd build_unix/

"${BDB_PREFIX}/${BDB_VERSION}/dist/configure" \
--enable-cxx --disable-shared --with-pic --prefix="${BDB_PREFIX}" \
--enable-cxx --disable-shared --disable-replication --with-pic --prefix="${BDB_PREFIX}" \
"${@}"

make install
Expand All @@ -83,4 +83,4 @@ echo
echo 'When compiling bitcoind, run `./configure` in the following way:'
echo
echo " export BDB_PREFIX='${BDB_PREFIX}'"
echo ' ./configure LDFLAGS="-L${BDB_PREFIX}/lib/" CPPFLAGS="-I${BDB_PREFIX}/include/" ...'
echo ' ./configure BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" BDB_CFLAGS="-I${BDB_PREFIX}/include" ...'

0 comments on commit 3fa1ab4

Please sign in to comment.