mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-08-09 23:05:04 -06:00
Fix building with GCC13 (required to build on Arch and Fedora) (#1220)
* Backport TBB fix to allow building on GCC13 * Fix OpenEXR build with GCC13 * Fix Clipper2 build with GCC13 --------- Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
parent
6108d8ee40
commit
e065809e3a
6 changed files with 140 additions and 91 deletions
11
deps/TBB/0001-TBB-GCC13.patch
vendored
Normal file
11
deps/TBB/0001-TBB-GCC13.patch
vendored
Normal file
|
@ -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 */
|
||||
|
3
deps/TBB/TBB.cmake
vendored
3
deps/TBB/TBB.cmake
vendored
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue