mirror of
https://git.freebsd.org/ports.git
synced 2025-06-11 07:40:40 -04:00
34fdd4dc58
Intel oneAPI tbb 2021.1 (onetbb) has been released[1][2] and has deprecated several interfaces over tbb 2020, breaking most dependent ports. Old tbb 2020 will be kept for a certain time to allow transition but will be removed in a near future as it CONFLICTS with devel/onetbb. New ports should now use devel/onetbb instead of devel/tbb. We tried to move a maximum number of dependent ports to devel/onetbb (or disable dependency when not possible), but some of them still remain stuck to devel/tbb. Remaining ones have not been identified as major dependencies themselves and will be fixed as soon as updates are available from upstream. PR: 252648, 252688 [3], 252683 [4], 252651 [5], 252690 [3], 252693 [3], 252695 [3], 252696 [3], 252786 [3], 252649, 252868 [6], 252870 [5], 252684 [7], 252785 [7] Approved by: yuri [3], jwb [4], thierry [5], FreeBSD@Shaneware.biz [6], maintainer timeout [7] [1] https://software.intel.com/content/www/us/en/develop/articles/intel-oneapi-threading-building-blocks-release-notes.html [2] https://software.intel.com/content/www/us/en/develop/articles/tbb-revamp.html
17 lines
430 B
C
17 lines
430 B
C
--- intern/cycles/util/util_tbb.h.orig 2021-01-23 14:10:16 UTC
|
|
+++ intern/cycles/util/util_tbb.h
|
|
@@ -36,7 +36,14 @@ using tbb::parallel_for;
|
|
|
|
static inline void parallel_for_cancel()
|
|
{
|
|
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
|
|
+ tbb::task_group_context *ctx = tbb::task::current_context();
|
|
+ if (ctx) {
|
|
+ ctx->cancel_group_execution();
|
|
+ }
|
|
+#else
|
|
tbb::task::self().cancel_group_execution();
|
|
+#endif
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|