(#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
conan-io · Jul 20, 2023 · d7da970 · d7da970
1 parent 26ef075
commit d7da970
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/recipes/ccache/all/conandata.yml b/recipes/ccache/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "4.8.2":
+    url: "https://github.com/ccache/ccache/releases/download/v4.8.2/ccache-4.8.2.tar.xz"
+    sha256: "3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49"
   "4.8.1":
     url: "https://github.com/ccache/ccache/releases/download/v4.8.1/ccache-4.8.1.tar.xz"
     sha256: "87959b6819530b3dcaeb39992f585b9fc2c7120302809741378097774919fb6f"
@@ -9,6 +12,10 @@ sources:
     url: "https://github.com/ccache/ccache/releases/download/v4.7.4/ccache-4.7.4.tar.xz"
     sha256: "df0c64d15d3efaf0b4f6837dd6b1467e40eeaaa807db25ce79c3a08a46a84e36"
 patches:
+  "4.8.2":
+    - patch_file: "patches/4.8-cmake-msvc-runtime.patch"
+      patch_description: "fixup MSVC runtime"
+      patch_type: "conan"
   "4.8.1":
     - patch_file: "patches/4.8-cmake-msvc-runtime.patch"
       patch_description: "fixup MSVC runtime"

diff --git a/recipes/ccache/all/conanfile.py b/recipes/ccache/all/conanfile.py
@@ -48,7 +48,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("zstd/1.5.2")
+        self.requires("zstd/1.5.5")
         if self.options.redis_storage_backend:
             self.requires("hiredis/1.1.0")
 
@@ -67,7 +67,7 @@ def validate(self):
             raise ConanInvalidConfiguration(f"{self.ref} requires C++ filesystem library, that is not supported by Clang 11 + libstdc++.")
 
     def build_requirements(self):
-        self.tool_requires("cmake/3.25.3")
+        self.tool_requires("cmake/[>=3.15 <4]")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version],
@@ -77,6 +77,7 @@ def generate(self):
         tc = CMakeToolchain(self)
         tc.variables["REDIS_STORAGE_BACKEND"] = self.options.redis_storage_backend
         tc.variables["HIREDIS_FROM_INTERNET"] = False
+        tc.variables["ZSTD_FROM_INTERNET"] = False
         tc.variables["ENABLE_DOCUMENTATION"] = False
         tc.variables["ENABLE_TESTING"] = False
         tc.generate()
@@ -85,6 +86,7 @@ def generate(self):
         deps.set_property("hiredis", "cmake_target_name", "HIREDIS::HIREDIS")
         deps.set_property("hiredis", "cmake_find_mode", "module")
         deps.set_property("zstd", "cmake_target_name", "ZSTD::ZSTD")
+        deps.set_property("zstd", "cmake_find_mode", "module")
         deps.generate()
 
     def build(self):

diff --git a/recipes/ccache/config.yml b/recipes/ccache/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "4.8.2":
+    folder: all
   "4.8.1":
     folder: all
   "4.8":