From faee733a5d366ee53238f7b3459a3c390e61e095 Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Mon, 23 Sep 2024 13:18:52 +0300 Subject: [PATCH 1/3] disable tbbind for Apple non-macOS hwloc can't be built for these platforms --- recipes/onetbb/all/conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/onetbb/all/conanfile.py b/recipes/onetbb/all/conanfile.py index 7031f90417a73..01eabe7d3ac11 100644 --- a/recipes/onetbb/all/conanfile.py +++ b/recipes/onetbb/all/conanfile.py @@ -1,5 +1,6 @@ from conan import ConanFile from conan.errors import ConanInvalidConfiguration +from conan.tools.apple import is_apple_os from conan.tools.build import cross_building from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout from conan.tools.env import VirtualBuildEnv @@ -52,7 +53,9 @@ def _tbbbind_hwloc_version(self): @property def _tbbbind_supported(self): - return self.settings.os != "Macos" or Version(self.version) >= "2021.11.0" + if not is_apple_os(self): + return True + return self.settings.os == "Macos" and Version(self.version) >= "2021.11.0" @property def _tbbbind_build(self): From 37cd3eab3a4e6cdabe83850703382fcd29a283e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 23 Sep 2024 13:01:36 +0200 Subject: [PATCH 2/3] Update recipes/onetbb/all/conanfile.py Co-authored-by: Martin Valgur --- recipes/onetbb/all/conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/onetbb/all/conanfile.py b/recipes/onetbb/all/conanfile.py index 01eabe7d3ac11..7ec3c7342d889 100644 --- a/recipes/onetbb/all/conanfile.py +++ b/recipes/onetbb/all/conanfile.py @@ -53,9 +53,9 @@ def _tbbbind_hwloc_version(self): @property def _tbbbind_supported(self): - if not is_apple_os(self): - return True - return self.settings.os == "Macos" and Version(self.version) >= "2021.11.0" + if is_apple_os(self): + return return self.settings.os == "Macos" and Version(self.version) >= "2021.11.0" + return True @property def _tbbbind_build(self): From caf8d2c6446f44a2f65b1e63f4b4e90c2ee582f3 Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Mon, 23 Sep 2024 14:27:41 +0300 Subject: [PATCH 3/3] Update recipes/onetbb/all/conanfile.py Co-authored-by: Martin Valgur --- recipes/onetbb/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/onetbb/all/conanfile.py b/recipes/onetbb/all/conanfile.py index 7ec3c7342d889..1d40fac290ce1 100644 --- a/recipes/onetbb/all/conanfile.py +++ b/recipes/onetbb/all/conanfile.py @@ -54,7 +54,7 @@ def _tbbbind_hwloc_version(self): @property def _tbbbind_supported(self): if is_apple_os(self): - return return self.settings.os == "Macos" and Version(self.version) >= "2021.11.0" + return self.settings.os == "Macos" and Version(self.version) >= "2021.11.0" return True @property