From 7e477dea7bcecea5f0a08a2542cb062d507a677c Mon Sep 17 00:00:00 2001 From: Esteban DUGUEPEROUX Date: Thu, 20 Jul 2023 12:42:28 +0200 Subject: [PATCH] Add onetbb/2021.5.0 needed by cctag/1.0.3 --- recipes/onetbb/all/conandata.yml | 8 ++++++++ recipes/onetbb/config.yml | 2 ++ 2 files changed, 10 insertions(+) diff --git a/recipes/onetbb/all/conandata.yml b/recipes/onetbb/all/conandata.yml index 9ccf39c2f9dca4..389d41e9b80d3f 100644 --- a/recipes/onetbb/all/conandata.yml +++ b/recipes/onetbb/all/conandata.yml @@ -11,6 +11,9 @@ sources: "2021.6.0": url: "https://github.com/oneapi-src/oneTBB/archive/v2021.6.0.tar.gz" sha256: "4897dd106d573e9dacda8509ca5af1a0e008755bf9c383ef6777ac490223031f" + "2021.5.0": + url: "https://github.com/oneapi-src/oneTBB/archive/v2021.5.0.tar.gz" + sha256: "e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a" "2021.3.0": url: "https://github.com/oneapi-src/oneTBB/archive/v2021.3.0.tar.gz" sha256: "8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e" @@ -30,6 +33,11 @@ patches: patch_type: "portability" patch_source: "https://github.com/oneapi-src/oneTBB/pull/716.diff" patch_file: "patches/fix-overeager-stripping-of-compile-flag.diff" + "2021.5.0": + - patch_description: "cherry-pick upstream patch: avoid android compile errors for current NDKs on releases <= 2021.6.0" + patch_type: "portability" + patch_source: "https://github.com/oneapi-src/oneTBB/pull/716.diff" + patch_file: "patches/fix-overeager-stripping-of-compile-flag.diff" "2021.3.0": - patch_description: "cherry-pick upstream patch: avoid android compile errors for current NDKs on releases <= 2021.6.0" patch_type: "portability" diff --git a/recipes/onetbb/config.yml b/recipes/onetbb/config.yml index 7995868f434adb..7976e2187f70d4 100644 --- a/recipes/onetbb/config.yml +++ b/recipes/onetbb/config.yml @@ -7,6 +7,8 @@ versions: folder: all "2021.6.0": folder: all + "2021.5.0": + folder: all "2021.3.0": folder: all "2020.3":