From ce11f44b3aaeb59b06b91dcf8a09e88ce2a86cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=BCnther?= Date: Fri, 23 Sep 2022 18:06:25 +0200 Subject: [PATCH 1/4] onetbb/2021.6.0 version bump --- recipes/onetbb/all/conandata.yml | 3 +++ recipes/onetbb/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/onetbb/all/conandata.yml b/recipes/onetbb/all/conandata.yml index ea0c621b1ec0c..53ada28e0ef3c 100644 --- a/recipes/onetbb/all/conandata.yml +++ b/recipes/onetbb/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2021.6.0": + url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.6.0.tar.gz" + sha256: "4897dd106d573e9dacda8509ca5af1a0e008755bf9c383ef6777ac490223031f" "2021.3.0": url: "https://github.com/oneapi-src/oneTBB/archive/v2021.3.0.tar.gz" sha256: "8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e" diff --git a/recipes/onetbb/config.yml b/recipes/onetbb/config.yml index 198048be7bd45..4fc6c42cf957b 100644 --- a/recipes/onetbb/config.yml +++ b/recipes/onetbb/config.yml @@ -1,4 +1,6 @@ versions: + "2021.6.0": + folder: all "2021.3.0": folder: all "2020.3": From 69f7c5b697a6f85bf9df21ac542bed846de19b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=BCnther?= Date: Mon, 26 Sep 2022 13:41:38 +0200 Subject: [PATCH 2/4] remove pylint: skip-file from test_v1_package as noted from conan hook check: https://github.com/conan-io/conan-center-index/pull/13116#issuecomment-1256402132 --- recipes/onetbb/all/test_v1_package/conanfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/onetbb/all/test_v1_package/conanfile.py b/recipes/onetbb/all/test_v1_package/conanfile.py index 75c0cd81d2d2f..38f4483872d47 100644 --- a/recipes/onetbb/all/test_v1_package/conanfile.py +++ b/recipes/onetbb/all/test_v1_package/conanfile.py @@ -1,4 +1,3 @@ -# pylint: skip-file from conans import ConanFile, CMake, tools import os From d3cd7346687357bfeff228b021e6ef1ca13186f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=BCnther?= Date: Tue, 27 Sep 2022 11:53:27 +0200 Subject: [PATCH 3/4] clean up libm dependencies on libs --- recipes/onetbb/all/conanfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/onetbb/all/conanfile.py b/recipes/onetbb/all/conanfile.py index 0a0702971da74..c6dcb4d1e8a32 100644 --- a/recipes/onetbb/all/conanfile.py +++ b/recipes/onetbb/all/conanfile.py @@ -120,7 +120,7 @@ def lib_name(name): ) tbb.libs.append(lib_name("tbb{}".format(binary_version))) if self.settings.os in ["Linux", "FreeBSD"]: - tbb.system_libs = ["dl", "rt", "pthread"] + tbb.system_libs = ["m", "dl", "rt", "pthread"] # tbbmalloc if self.options.tbbmalloc: @@ -137,6 +137,7 @@ def lib_name(name): tbbproxy.set_property("cmake_target_name", "TBB::tbbmalloc_proxy") tbbproxy.libs = [lib_name("tbbmalloc_proxy")] + tbbproxy.system_libs = ["m", "dl", "pthread"] tbbproxy.requires = ["tbbmalloc"] # TODO: to remove in conan v2 once cmake_find_package* & pkg_config generators removed From 3bb64a034ca2aca82acd3ca7f7896f496b94d6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=BCnther?= Date: Tue, 27 Sep 2022 11:58:31 +0200 Subject: [PATCH 4/4] populate tbbmalloc and tbbproxy options to cmake --- recipes/onetbb/all/conanfile.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/onetbb/all/conanfile.py b/recipes/onetbb/all/conanfile.py index c6dcb4d1e8a32..e0b9cdcdf1903 100644 --- a/recipes/onetbb/all/conanfile.py +++ b/recipes/onetbb/all/conanfile.py @@ -75,9 +75,12 @@ def source(self): destination=self.source_folder, strip_root=True) def generate(self): + # https://github.com/oneapi-src/oneTBB/blob/master/cmake/README.md#build-system-description toolchain = CMakeToolchain(self) toolchain.variables["TBB_TEST"] = False toolchain.variables["TBB_STRICT"] = False + toolchain.variables["TBBMALLOC_BUILD"] = self.options.tbbmalloc + toolchain.variables["TBBMALLOC_PROXY_BUILD"] = self.options.tbbproxy toolchain.generate() def build(self):