Merge pull request #3187 from codablock/pr_remove_ccache

Remove ccache from depends subsystem
This commit is contained in:
UdjinM6 2019-11-04 20:35:08 +03:00 committed by GitHub
commit ff1869d3f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 32 deletions

View File

@ -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 #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 if [ -n "$USE_SHELL" ]; then
export CONFIG_SHELL="$USE_SHELL" export CONFIG_SHELL="$USE_SHELL"

View File

@ -63,7 +63,6 @@ LDFLAGS="-L$depends_prefix/lib $LDFLAGS"
CC="@CC@" CC="@CC@"
CXX="@CXX@" CXX="@CXX@"
OBJC="${CC}" OBJC="${CC}"
CCACHE=$depends_prefix/native/bin/ccache
PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH
if test -n "@AR@"; then if test -n "@AR@"; then

View File

@ -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

View File

@ -1,5 +1,4 @@
packages:=boost openssl libevent zeromq gmp chia_bls backtrace packages:=boost openssl libevent zeromq gmp chia_bls backtrace
native_packages := native_ccache
qt_native_packages = native_protobuf qt_native_packages = native_protobuf
qt_packages = qrencode protobuf zlib qt_packages = qrencode protobuf zlib

View File

@ -61,15 +61,15 @@ If you want to build for the same host but different distro, add `--enable-glibc
ccache ccache
------ ------
The depends system also contains [ccache](https://ccache.samba.org/), which caches build results on source->object `./configure` of Dash Core will autodetect the presence of ccache and enable use of it. To disable ccache, use
level. `./configure` of Dash Core will autodetect the presence of ccache and enable use of it. To disable ccache, use `./configure --prefix=<prefix> --disable-ccache`. When installed and enabled, [ccache](https://ccache.samba.org/) will
`./configure --prefix=<prefix> --disable-ccache`. 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 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: very often. It is advised to increase the maximum cache size:
```bash ```bash
$ ./depends/<host>/native/bin/ccache -M20G $ ccache -M20G
``` ```
Additional Configure Flags Additional Configure Flags