From 58e9996105ce023f70d49a14fd31a7339d0ad821 Mon Sep 17 00:00:00 2001 From: Maciej Lisiewski Date: Wed, 31 May 2023 17:20:34 -0400 Subject: [PATCH] Backport TBB fix to allow building on GCC13 --- deps/TBB/0001-TBB-GCC13.patch | 11 +++++++++++ deps/TBB/TBB.cmake | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 deps/TBB/0001-TBB-GCC13.patch diff --git a/deps/TBB/0001-TBB-GCC13.patch b/deps/TBB/0001-TBB-GCC13.patch new file mode 100644 index 000000000..047daa449 --- /dev/null +++ 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 */ + diff --git a/deps/TBB/TBB.cmake b/deps/TBB/TBB.cmake index 9891fca41..304b3ffb1 100644 --- 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