@@ -1,4 +1,4 @@
# sha256 computed locally
-sha256 4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25 ccache-4.9.1.tar.xz
+sha256 3a43442ce3916ea48bb6ccf6f850891cbff01d1feddff7cd4bbd49c5cf1188f6 ccache-4.10.1.tar.xz
sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt
sha256 a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84 LICENSE.adoc
@@ -4,20 +4,27 @@
#
################################################################################
-CCACHE_VERSION = 4.9.1
+CCACHE_VERSION = 4.10.1
CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION)
CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
CCACHE_LICENSE = GPL-3.0+, others
CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt
-HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd
+HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd host-xxhash host-blake3
# We are ccache, so we can't use ccache
HOST_CCACHE_CONF_OPTS += \
-UCMAKE_C_COMPILER_LAUNCHER \
-UCMAKE_CXX_COMPILER_LAUNCHER \
-DCCACHE_DEV_MODE=OFF \
- -DZSTD_FROM_INTERNET=OFF \
- -DHIREDIS_FROM_INTERNET=OFF \
+ -DDEP_BLAKE3=SYSTEM \
+ -DDEP_FMT=BUNDLED \
+ -DDEP_CPPHTTPLIB=BUNDLED \
+ -DDEP_HIREDIS=SYSTEM \
+ -DDEP_NONSTDSPAN=BUNDLED \
+ -DDEP_TLEXPECTED=BUNDLED \
+ -DDEP_XXHASH=SYSTEM \
+ -DDEP_ZSTD=SYSTEM \
+ -DENABLE_DOCUMENTATION=OFF \
-DENABLE_TESTING=OFF
# Patch host-ccache as follows:
@@ -32,12 +39,12 @@ HOST_CCACHE_CONF_OPTS += \
HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,%,$(BR_CACHE_DIR))
define HOST_CCACHE_PATCH_CONFIGURATION
- sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/Config.cpp
- sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp
- sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp
- sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp
- sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/Config.cpp
- sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/Config.cpp
+ sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache/Config.cpp
+ sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp
+ sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp
+ sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp
+ sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/ccache/Config.cpp
+ sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/ccache/Config.cpp
endef
HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION
@@ -793,7 +793,7 @@ $(2)_EXTRACT_DEPENDENCIES += \
endif
ifeq ($$(BR2_CCACHE),y)
-ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd,$(1)),)
+ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd host-xxhash host-blake3,$(1)),)
$(2)_DEPENDENCIES += host-ccache
endif
endif
https://ccache.dev/releasenotes.html#_ccache_4_10_1 This version requires use the system dependencies of host-blake3 and host-xxhash. The bundled version is not able to build/download. The ZSTD_FROM_INTERNET and HIREDIS_FROM_INTERNET variables are replaced in the ccache build system with DEP_ZSTD and DEP_HIREDIS in version 4.10. For the sake of completeness, all DEP_<xxx> variables were set for external dependencies. The generation of documentation has also been switched off. Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> --- v2: - replaced ZSTD_FROM_INTERNET and HIREDIS_FROM_INTERNET config options with DEP_ZSTD and DEP_HIREDIS - added and set all DEP_ config variables - disabled documentation build package/ccache/ccache.hash | 2 +- package/ccache/ccache.mk | 27 +++++++++++++++++---------- package/pkg-generic.mk | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-)