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

Add onetbb/2021.5.0 needed by cctag/1.0.3 #18714

Closed
wants to merge 2 commits into from
Closed

Add onetbb/2021.5.0 needed by cctag/1.0.3 #18714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78ecc09
Add onetbb/2021.5.0 needed by cctag/1.0.3
EstebanDugueperoux2 Jul 20, 2023
53f8874
test
EstebanDugueperoux2 Aug 10, 2023
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
8 changes: 8 additions & 0 deletions recipes/onetbb/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions recipes/onetbb/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ def generate(self):
toolchain.variables[f"CMAKE_HWLOC_{self._tbbbind_hwloc_version}_INCLUDE_PATH"] = os.path.join(hwloc_package_folder, "include")
if self.settings.os == "Windows":
toolchain.variables[f"CMAKE_HWLOC_{self._tbbbind_hwloc_version}_DLL_PATH"] = os.path.join(hwloc_package_folder, "bin", "hwloc.dll")

# To be able to build statically, see https://github.com/oneapi-src/oneTBB/issues/802#issuecomment-1062799037
if not self.options.shared:
toolchain.preprocessor_definitions["__TBB_DYNAMIC_LOAD_ENABLED"] = "0"

toolchain.generate()

def build(self):
Expand Down
2 changes: 2 additions & 0 deletions recipes/onetbb/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ versions:
folder: all
"2021.6.0":
folder: all
"2021.5.0":
folder: all
"2021.3.0":
folder: all
"2020.3":
Expand Down