diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-01-29 11:32:42 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-01-29 11:33:02 +0100 |
| commit | 3fa1ab4368cf61a746066604cddbae898d327340 (patch) | |
| tree | 00fa83d0f79cb83a5a9037e7ccc5371fd5aa53e0 | |
| parent | 000ac4fd015cca5b75317bae507e19ba1f41e14f (diff) | |
| parent | f3196a03aa99702f657d80bf2b7e0415fcb861b5 (diff) | |
Merge #12095: [contrib] Use BDB_LIBS/CFLAGS and pass --disable-replication
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
| -rwxr-xr-x | contrib/install_db4.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/install_db4.sh b/contrib/install_db4.sh index b57ade139d..d315a7d3b7 100755 --- a/contrib/install_db4.sh +++ b/contrib/install_db4.sh @@ -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 @@ -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" ...' |