diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index a2537077b6..744e167489 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -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 +sha256 de4684f5251a0a2c58f3a7ab94d6a8d3443822cbd01abcdadd9250d3d1e0bfe1 LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 0b2c02e8a7..d92608512c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -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 diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 132bdb9680..0c9308701b 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -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