From f5d27050446f1b63dc976fcf706e58c8732570f8 Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 21 Jan 2023 09:07:09 +0900 Subject: [PATCH] xtensor: add version 0.24.3, update xtl --- recipes/xtensor/all/conandata.yml | 41 +++++++++++++++++++++++-------- recipes/xtensor/all/conanfile.py | 2 +- recipes/xtensor/config.yml | 2 ++ 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/recipes/xtensor/all/conandata.yml b/recipes/xtensor/all/conandata.yml index 5b2596a448217..40af805ba9e93 100644 --- a/recipes/xtensor/all/conandata.yml +++ b/recipes/xtensor/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.24.3": + url: "https://github.com/xtensor-stack/xtensor/archive/0.24.3.tar.gz" + sha256: "3acde856b9fb8cf4e2a7b66726da541275d40ab9b002e618ad985ab97f08ca4f" "0.24.2": url: "https://github.com/xtensor-stack/xtensor/archive/0.24.2.tar.gz" sha256: "790d9e449add817154177157a850b9afd0260dc0f9df857d8b3a38886a10ef8b" @@ -9,30 +12,48 @@ sources: url: "https://github.com/xtensor-stack/xtensor/archive/0.23.10.tar.gz" sha256: "2e770a6d636962eedc868fef4930b919e26efe783cd5d8732c11e14cf72d871c" "0.23.9": - sha256: 5bdb9d85ee82c60be0bce32d891b5cc20eb633284a0aabb907f55bbe722cc8e3 - url: https://github.com/xtensor-stack/xtensor/archive/refs/tags/0.23.9.tar.gz + url: "https://github.com/xtensor-stack/xtensor/archive/0.23.9.tar.gz" + sha256: "5bdb9d85ee82c60be0bce32d891b5cc20eb633284a0aabb907f55bbe722cc8e3" "0.21.5": - sha256: 30cb896b6686683ddaefb12c98bf1109fdfe666136dd027aba1a1e9aa825c241 - url: https://github.com/xtensor-stack/xtensor/archive/0.21.5.tar.gz + url: "https://github.com/xtensor-stack/xtensor/archive/0.21.5.tar.gz" + sha256: "30cb896b6686683ddaefb12c98bf1109fdfe666136dd027aba1a1e9aa825c241" "0.21.4": - sha256: 143ef2536f1671e1c7c7834de4a040f1694112e23222fcd2ae59b0f5e5124b57 - url: https://github.com/xtensor-stack/xtensor/archive/0.21.4.tar.gz + url: "https://github.com/xtensor-stack/xtensor/archive/0.21.4.tar.gz" + sha256: "143ef2536f1671e1c7c7834de4a040f1694112e23222fcd2ae59b0f5e5124b57" "0.21.3": - sha256: f63c25cafea4bfc268edb26e6f5004a28a2f689e6a852bb3559c553106c8d6bf - url: https://github.com/xtensor-stack/xtensor/archive/0.21.3.tar.gz + url: "https://github.com/xtensor-stack/xtensor/archive/0.21.3.tar.gz" + sha256: "f63c25cafea4bfc268edb26e6f5004a28a2f689e6a852bb3559c553106c8d6bf" "0.21.2": - sha256: a32490bc8499f59f8e30c288e178ff41c9511cf4959dc59c9628b29b77049a4a - url: https://github.com/xtensor-stack/xtensor/archive/0.21.2.tar.gz + url: "https://github.com/xtensor-stack/xtensor/archive/0.21.2.tar.gz" + sha256: "a32490bc8499f59f8e30c288e178ff41c9511cf4959dc59c9628b29b77049a4a" patches: "0.24.2": - patch_file: "patches/0.24.0-cxx11-abi.patch" + patch_description: "has_trivial_default_constructor has been removed from libstdc++ since version 7" + patch_type: "bugfix" + patch_source: "https://github.com/xtensor-stack/xtensor/pull/2459" "0.24.0": - patch_file: "patches/0.24.0-cxx11-abi.patch" + patch_description: "has_trivial_default_constructor has been removed from libstdc++ since version 7" + patch_type: "bugfix" + patch_source: "https://github.com/xtensor-stack/xtensor/pull/2459" "0.23.10": - patch_file: "patches/0.23.9-cxx11-abi.patch" + patch_description: "has_trivial_default_constructor has been removed from libstdc++ since version 7" + patch_type: "bugfix" + patch_source: "https://github.com/xtensor-stack/xtensor/pull/2459" "0.23.9": - patch_file: "patches/0.23.9-cxx11-abi.patch" + patch_description: "has_trivial_default_constructor has been removed from libstdc++ since version 7" + patch_type: "bugfix" + patch_source: "https://github.com/xtensor-stack/xtensor/pull/2459" "0.21.5": - patch_file: "patches/0.21.5-cxx11-abi.patch" + patch_description: "has_trivial_default_constructor has been removed from libstdc++ since version 7" + patch_type: "bugfix" + patch_source: "https://github.com/xtensor-stack/xtensor/pull/2459" "0.21.4": - patch_file: "patches/0.21.4-cxx11-abi.patch" + patch_description: "has_trivial_default_constructor has been removed from libstdc++ since version 7" + patch_type: "bugfix" + patch_source: "https://github.com/xtensor-stack/xtensor/pull/2459" diff --git a/recipes/xtensor/all/conanfile.py b/recipes/xtensor/all/conanfile.py index 8d9d0a5f99215..9a77cdf6361a6 100644 --- a/recipes/xtensor/all/conanfile.py +++ b/recipes/xtensor/all/conanfile.py @@ -50,7 +50,7 @@ def layout(self): basic_layout(self, src_folder="src") def requirements(self): - self.requires("xtl/0.7.4") + self.requires("xtl/0.7.5") self.requires("nlohmann_json/3.11.2") if self.options.xsimd: if Version(self.version) < "0.24.0": diff --git a/recipes/xtensor/config.yml b/recipes/xtensor/config.yml index 6237bf2c3ae5d..0077748f19ef0 100644 --- a/recipes/xtensor/config.yml +++ b/recipes/xtensor/config.yml @@ -1,4 +1,6 @@ versions: + "0.24.3": + folder: all "0.24.2": folder: all "0.24.0":