Skip to content

Commit

Permalink
Auto merge of #4567 - oxarbitrage:issue4537, r=daira
Browse files Browse the repository at this point in the history
Build BDB utilities

To install the binaries we need to build with just `install` instead of `install_lib` and `install_include`, this will install everything.

Then the binaries will be moved to a folder in `zcutil` directory. We can just leave them in staging however the user might have a hard time to find them there.

Closes #4537
  • Loading branch information
zkbot committed Aug 7, 2020
2 parents d6f527a + 45b2a61 commit 022c3a4
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ src/zcash-cli
src/zcash-gtest
src/zcash-tx
src/test/test_bitcoin
zcutil/bin/

*zcashTest.pk
*zcashTest.vk
Expand Down Expand Up @@ -116,5 +117,6 @@ libzcashconsensus.pc
contrib/debian/files
contrib/debian/substvars

src/fuzzing/*/input
src/fuzzing/*/output
src/fuzz.cpp
4 changes: 4 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-man
clean-local:
rm -rf test_bitcoin.coverage/ zcash-gtest.coverage/ total.coverage/
rm -rf afl-temp

distclean-local:
rm -f zcutil/bin/db_*
rmdir zcutil/bin 2>/dev/null || true
8 changes: 7 additions & 1 deletion depends/packages/bdb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,11 @@ define $(package)_build_cmds
endef

define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install_lib install_include
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef

define $(package)_postprocess_cmds
cd $(BASEDIR)/../zcutil && \
mkdir -p bin && \
mv -f $($(package)_staging_dir)$(host_prefix)/bin/db_* bin
endef
3 changes: 3 additions & 0 deletions zcutil/distclean.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ rm -rf depends/sources
rm -rf afl-temp
rm -rf src/fuzzing/*/output

# These are not in clean.sh because they are only generated when building dependencies.
rm -f zcutil/bin/db_*
rmdir zcutil/bin 2>/dev/null || true

0 comments on commit 022c3a4

Please sign in to comment.