Backport TBB fix to allow building on GCC13

2023-05-31 17:20:34 -04:00 · 2023-05-31 17:20:34 -04:00 · 58e9996105
parent fbc04a98fc
commit 58e9996105
2 changed files with 13 additions and 1 deletions
--- a/deps/TBB/0001-TBB-GCC13.patch
+++ b/deps/TBB/0001-TBB-GCC13.patch
@ -0,0 +1,11 @@
+--- a/include/tbb/task.h
+++ b/include/tbb/task.h
+@@ -219,7 +219,7 @@
+ #if __TBB_TASK_PRIORITY
+         //! Pointer to the next offloaded lower priority task.
+         /** Used to maintain a list of offloaded tasks inside the scheduler. **/
+-        task* next_offloaded;
+        tbb::task* next_offloaded;
+         };
+ #endif /* __TBB_TASK_PRIORITY */
+
--- a/deps/TBB/TBB.cmake
+++ b/deps/TBB/TBB.cmake
@ -2,7 +2,8 @@ bambustudio_add_cmake_project(
    TBB
    URL "https://github.com/wjakob/tbb/archive/a0dc9bf76d0120f917b641ed095360448cabc85b.tar.gz"
    URL_HASH SHA256=0545cb6033bd1873fcae3ea304def720a380a88292726943ae3b9b207f322efe
-    CMAKE_ARGS          
+    PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-TBB-GCC13.patch
+    CMAKE_ARGS
        -DTBB_BUILD_SHARED=OFF
        -DTBB_BUILD_TESTS=OFF
        -DTBB_BUILD_TESTS=OFF