Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

c-blosc2: add version 2.4.3 and update dependencies #13714

Merged
merged 1 commit into from
Oct 25, 2022
Merged

c-blosc2: add version 2.4.3 and update dependencies #13714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions recipes/c-blosc2/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"2.4.3":
url: "https://github.com/Blosc/c-blosc2/archive/v2.4.3.tar.gz"
sha256: "d4aa5e0794598794f20ab950e973d44f0d0d9c133ea1a5a07cb200fa54d2e036"
"2.4.2":
url: "https://github.com/Blosc/c-blosc2/archive/v2.4.2.tar.gz"
sha256: "763ded7a6286abd248a79b1560ce8bfda11018b699a450b3e43c529f284a5232"
Expand All @@ -10,6 +13,8 @@ sources:
sha256: "66f9977de26d6bc9ea1c0e623d873c3225e4fff709aa09b3335fd09d41d57c0e"

patches:
"2.4.3":
- patch_file: "patches/2.4.1-0001-fix-cmake.patch"
"2.4.2":
- patch_file: "patches/2.4.1-0001-fix-cmake.patch"
"2.4.1":
Expand Down
13 changes: 6 additions & 7 deletions recipes/c-blosc2/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from conan import ConanFile
from conan.tools.microsoft import is_msvc_static_runtime, is_msvc
from conan.tools.files import apply_conandata_patches, get, copy, rm, rmdir
from conan.tools.microsoft import is_msvc
from conan.tools.files import export_conandata_patches, apply_conandata_patches, get, copy, rm, rmdir
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout

import os
import glob

required_conan_version = ">=1.51.3"
required_conan_version = ">=1.52.0"

class CBlosc2Conan(ConanFile):
name = "c-blosc2"
Expand Down Expand Up @@ -36,8 +36,7 @@ class CBlosc2Conan(ConanFile):
}

def export_sources(self):
for p in self.conan_data.get("patches", {}).get(self.version, []):
copy(self, p["patch_file"], self.recipe_folder, self.export_sources_folder)
export_conandata_patches(self)

def config_options(self):
if self.settings.os == "Windows":
Expand Down Expand Up @@ -71,11 +70,11 @@ def layout(self):

def requirements(self):
if self.options.with_lz4:
self.requires("lz4/1.9.3")
self.requires("lz4/1.9.4")
if self.options.with_zlib in ["zlib-ng", "zlib-ng-compat"]:
self.requires("zlib-ng/2.0.6")
elif self.options.with_zlib == "zlib":
self.requires("zlib/1.2.12")
self.requires("zlib/1.2.13")
if self.options.with_zstd:
self.requires("zstd/1.5.2")

Expand Down
2 changes: 2 additions & 0 deletions recipes/c-blosc2/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"2.4.3":
folder: all
"2.4.2":
folder: all
"2.4.1":
Expand Down