From cc879675e16c310f3ce3f2387b7aa966e64e4352 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 5 Mar 2018 17:23:35 -0500
Subject: depends: Remove ccache
---
.travis.yml | 3 ++-
depends/config.site.in | 1 -
depends/packages/native_ccache.mk | 25 -------------------------
depends/packages/packages.mk | 1 -
doc/dependencies.md | 1 -
5 files changed, 2 insertions(+), 29 deletions(-)
delete mode 100644 depends/packages/native_ccache.mk
diff --git a/.travis.yml b/.travis.yml
index 0332a0e204..b38c911a2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ dist: trusty
os: linux
language: minimal
cache:
+ ccache: true
directories:
- depends/built
- depends/sdk-sources
@@ -68,7 +69,7 @@ script:
- if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
- OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
- BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
- - if [ -z "$NO_DEPENDS" ]; then depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE; fi
+ - if [ -z "$NO_DEPENDS" ]; then ccache --max-size=$CCACHE_SIZE; fi
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
- mkdir build && cd build
- ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
diff --git a/depends/config.site.in b/depends/config.site.in
index 0a4a9c327e..8444dc26f2 100644
--- a/depends/config.site.in
+++ b/depends/config.site.in
@@ -64,7 +64,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 8f4eb22538..0000000000
--- a/depends/packages/native_ccache.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-package=native_ccache
-$(package)_version=3.4.1
-$(package)_download_path=https://samba.org/ftp/ccache
-$(package)_file_name=ccache-$($(package)_version).tar.bz2
-$(package)_sha256_hash=ca5a01fb4868cdb5176c77b8b4a390be7929a6064be80741217e0686f03f8389
-
-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 088723ebd0..551c9fa70b 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -1,5 +1,4 @@
packages:=boost openssl libevent zeromq
-native_packages := native_ccache
qt_native_packages = native_protobuf
qt_packages = qrencode protobuf zlib
diff --git a/doc/dependencies.md b/doc/dependencies.md
index 5e698126d4..52ec8e3575 100644
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -7,7 +7,6 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
| --- | --- | --- | --- | --- | --- |
| Berkeley DB | [4.8.30](http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html) | 4.8.x | No | | |
| Boost | [1.64.0](http://www.boost.org/users/download/) | [1.47.0](https://github.com/bitcoin/bitcoin/pull/8920) | No | | |
-| ccache | [3.3.6](https://ccache.samba.org/download.html) | | No | | |
| Clang | | [3.3+](http://llvm.org/releases/download.html) (C++11 support) | | | |
| D-Bus | [1.10.18](https://cgit.freedesktop.org/dbus/dbus/tree/NEWS?h=dbus-1.10) | | No | Yes | |
| Expat | [2.2.5](https://libexpat.github.io/) | | No | Yes | |
--
cgit v1.2.3