Skip to content

Commit d7da970

Browse files
authored
(#18315) ccache: add version 4.8.2
* ccache: add version 4.8.2 Also update the dependencies * ccache: never download ZSTD from the internet * ccache: set find_mode for zstd
1 parent 26ef075 commit d7da970

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

recipes/ccache/all/conandata.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
sources:
2+
"4.8.2":
3+
url: "https://github.com/ccache/ccache/releases/download/v4.8.2/ccache-4.8.2.tar.xz"
4+
sha256: "3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49"
25
"4.8.1":
36
url: "https://github.com/ccache/ccache/releases/download/v4.8.1/ccache-4.8.1.tar.xz"
47
sha256: "87959b6819530b3dcaeb39992f585b9fc2c7120302809741378097774919fb6f"
@@ -9,6 +12,10 @@ sources:
912
url: "https://github.com/ccache/ccache/releases/download/v4.7.4/ccache-4.7.4.tar.xz"
1013
sha256: "df0c64d15d3efaf0b4f6837dd6b1467e40eeaaa807db25ce79c3a08a46a84e36"
1114
patches:
15+
"4.8.2":
16+
- patch_file: "patches/4.8-cmake-msvc-runtime.patch"
17+
patch_description: "fixup MSVC runtime"
18+
patch_type: "conan"
1219
"4.8.1":
1320
- patch_file: "patches/4.8-cmake-msvc-runtime.patch"
1421
patch_description: "fixup MSVC runtime"

recipes/ccache/all/conanfile.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def layout(self):
4848
cmake_layout(self, src_folder="src")
4949

5050
def requirements(self):
51-
self.requires("zstd/1.5.2")
51+
self.requires("zstd/1.5.5")
5252
if self.options.redis_storage_backend:
5353
self.requires("hiredis/1.1.0")
5454

@@ -67,7 +67,7 @@ def validate(self):
6767
raise ConanInvalidConfiguration(f"{self.ref} requires C++ filesystem library, that is not supported by Clang 11 + libstdc++.")
6868

6969
def build_requirements(self):
70-
self.tool_requires("cmake/3.25.3")
70+
self.tool_requires("cmake/[>=3.15 <4]")
7171

7272
def source(self):
7373
get(self, **self.conan_data["sources"][self.version],
@@ -77,6 +77,7 @@ def generate(self):
7777
tc = CMakeToolchain(self)
7878
tc.variables["REDIS_STORAGE_BACKEND"] = self.options.redis_storage_backend
7979
tc.variables["HIREDIS_FROM_INTERNET"] = False
80+
tc.variables["ZSTD_FROM_INTERNET"] = False
8081
tc.variables["ENABLE_DOCUMENTATION"] = False
8182
tc.variables["ENABLE_TESTING"] = False
8283
tc.generate()
@@ -85,6 +86,7 @@ def generate(self):
8586
deps.set_property("hiredis", "cmake_target_name", "HIREDIS::HIREDIS")
8687
deps.set_property("hiredis", "cmake_find_mode", "module")
8788
deps.set_property("zstd", "cmake_target_name", "ZSTD::ZSTD")
89+
deps.set_property("zstd", "cmake_find_mode", "module")
8890
deps.generate()
8991

9092
def build(self):

recipes/ccache/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
versions:
2+
"4.8.2":
3+
folder: all
24
"4.8.1":
35
folder: all
46
"4.8":

0 commit comments

Comments
 (0)