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

Jump to bottom

onetbb: Fix hwloc shared detection after changes to that recipe #21544

Merged
merged 1 commit into from
Dec 4, 2023
Merged

onetbb: Fix hwloc shared detection after changes to that recipe #21544

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
3 changes: 2 additions & 1 deletion recipes/onetbb/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ def validate(self):
if self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "11.0":
raise ConanInvalidConfiguration(f"{self.ref} couldn't be built by apple-clang < 11.0")

if self._tbbbind_explicit_hwloc and not self.dependencies["hwloc"].options.shared:
# Old versions used to have shared option before hwloc dependency was moved to shared only
if self._tbbbind_explicit_hwloc and not self.dependencies["hwloc"].options.get_safe("shared", True):
raise ConanInvalidConfiguration(f"{self.ref} requires hwloc:shared=True to be built.")

def build_requirements(self):
Expand Down