From 1ef70ac9ef5bed1d77db9c617d71251b39f095ff Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 7 Mar 2018 21:12:41 -0500 Subject: [PATCH 1/2] Merge #12607: depends: Remove ccache cc879675e1 depends: Remove ccache (fanquake) Pull request description: After discussion with @theuni, we can possibly just remove ccache from depends entirely. Related to #12606 Tree-SHA512: ae0a60c8d97467fa41d617daa48ed22159cf32613808634a983304901dd5ed27124e77868d2314004e5144f7b35ba1333f720bb12daec4c5ca03aaf29d593ef2 --- depends/config.site.in | 1 - depends/packages/native_ccache.mk | 25 ------------------------- depends/packages/packages.mk | 1 - 3 files changed, 27 deletions(-) delete mode 100644 depends/packages/native_ccache.mk diff --git a/depends/config.site.in b/depends/config.site.in index 3d7c9fd43c..370c9ee7b9 100644 --- a/depends/config.site.in +++ b/depends/config.site.in @@ -63,7 +63,6 @@ LDFLAGS="-L$depends_prefix/lib $LDFLAGS" CC="@CC@" CXX="@CXX@" OBJC="${CC}" -CCACHE=$depends_prefix/native/bin/ccache PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH if test -n "@AR@"; then diff --git a/depends/packages/native_ccache.mk b/depends/packages/native_ccache.mk deleted file mode 100644 index 3be669dc47..0000000000 --- a/depends/packages/native_ccache.mk +++ /dev/null @@ -1,25 +0,0 @@ -package=native_ccache -$(package)_version=3.4.2 -$(package)_download_path=https://samba.org/ftp/ccache -$(package)_file_name=ccache-$($(package)_version).tar.bz2 -$(package)_sha256_hash=3aa5587793d4c790bd22999bfc678250c029307b3afb9d16f6f4a49c67b78fb3 - -define $(package)_set_vars -$(package)_config_opts= -endef - -define $(package)_config_cmds - $($(package)_autoconf) -endef - -define $(package)_build_cmds - $(MAKE) -endef - -define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef - -define $(package)_postprocess_cmds - rm -rf lib include -endef diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 8fa5ce4322..01e72b7d4a 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -1,5 +1,4 @@ packages:=boost openssl libevent zeromq gmp chia_bls backtrace -native_packages := native_ccache qt_native_packages = native_protobuf qt_packages = qrencode protobuf zlib From df04cdcd236e4b5ebf3a0fee7a5084379740eb9c Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Mon, 4 Nov 2019 13:29:32 +0100 Subject: [PATCH 2/2] Fix Dash specific docs and scripts --- ci/build_src.sh | 2 +- doc/build-generic.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/build_src.sh b/ci/build_src.sh index 1d694ec6fb..6422b0f2f3 100755 --- a/ci/build_src.sh +++ b/ci/build_src.sh @@ -16,7 +16,7 @@ if [ "$PULL_REQUEST" != "false" ]; then contrib/devtools/commit-script-check.sh #if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi TODO reenable after all Bitcoin PRs have been merged and docs fully fixed -depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE +ccache --max-size=$CCACHE_SIZE if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL" diff --git a/doc/build-generic.md b/doc/build-generic.md index 5402fabbd1..b5e95eab75 100644 --- a/doc/build-generic.md +++ b/doc/build-generic.md @@ -61,15 +61,15 @@ If you want to build for the same host but different distro, add `--enable-glibc ccache ------ -The depends system also contains [ccache](https://ccache.samba.org/), which caches build results on source->object -level. `./configure` of Dash Core will autodetect the presence of ccache and enable use of it. To disable ccache, use -`./configure --prefix= --disable-ccache`. +`./configure` of Dash Core will autodetect the presence of ccache and enable use of it. To disable ccache, use +`./configure --prefix= --disable-ccache`. When installed and enabled, [ccache](https://ccache.samba.org/) will +cache build results on source->object level. The default maximum cache size is 5G, which might not be enough to cache multiple builds when switching Git branches very often. It is advised to increase the maximum cache size: ```bash -$ ./depends//native/bin/ccache -M20G +$ ccache -M20G ``` Additional Configure Flags