-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
onetbb/2021.9.0: add patch for correctly building with emscripten #17777
Conversation
This comment has been minimized.
This comment has been minimized.
While technically it's not required as long as cmake will detect crossbuilding, documentation recommeds adding it anyway
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks very much for the contribution. I am pinging upstream to get feedback about the patch status.
"2021.9.0": | ||
- patch_description: "fix building for emscripten" | ||
patch_type: "portability" | ||
patch_source: "https://github.com/oneapi-src/oneTBB/pull/1006.patch" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am asking in uxlfoundation/oneTBB#1006 (comment) what is the status of this patch, it is not that trivial, so some insights from the original author could be useful.
I detected other pull requests that are modifying onetbb/all recipe:
This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there. |
@@ -90,6 +90,8 @@ def generate(self): | |||
toolchain.variables["TBB_ENABLE_IPO"] = self.options.interprocedural_optimization | |||
if Version(self.version) >= "2021.6.0" and self.options.get_safe("tbbproxy"): | |||
toolchain.variables["TBBMALLOC_PROXY_BUILD"] = self.options.tbbproxy | |||
if self.settings.os == "Emscripten": | |||
toolchain.variables["TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH"] = True |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suppose when we build for emscripten, it's a cross-compilation.
And during cross-compilation, hwloc is not searched. See https://github.com/oneapi-src/oneTBB/blob/master/cmake/hwloc_detection.cmake#L48-L51
So, we don't need to add these lines.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've seen this, but decided to follow recommendation from INSTALL.md in the patch. Although yes, it should work fine if cmake has detected crosscompiling properly
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
1 similar comment
Conan v1 pipeline ❌Sorry, the system is under maintenance and it doesn't accept builds right now. Conan v2 pipeline ❌
The v2 pipeline failed. Please, review the errors and note this will be required for pull requests to be merged in the near future. See details:Sorry, the system is under maintenance and it doesn't accept builds right now. |
@ovostrikov there are some conflicts in this PR now (sorry for that). I was going to fix them myself but I am not sure about the recent changes in the recipe. Maybe the changes in this PR are not needed, so better that you check it. Thank you! |
Next oneTBB version (presumably 2021.11.0) will contain this patch. Maybe we should wait for official upstream support? |
Yes, I think it's not worth patching since proper upsteam support will arrive soon-ish. Closing PR |
Add patch for proper emscripten support.
Patch taken from yet unmerged PR in upstream.
Fixes #17776