Backport TBB fix to allow building on GCC13 tizen
authorMyungJoo Ham <myungjoo.ham@samsung.com>
Wed, 17 Apr 2024 04:30:58 +0000 (13:30 +0900)
committerMyungJoo Ham <myungjoo.ham@samsung.com>
Wed, 17 Apr 2024 10:17:36 +0000 (19:17 +0900)
Ubuntu mantic/noble uses gcc13.
Reference: https://github.com/bambulab/BambuStudio/pull/1882/commits/d3459cb1b9f791531fe24b0558c581117243eade

Change-Id: I8c623030a37c3734627916c3daa450fd2dca8134
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
debian/rules

index 96af22e..b05e1aa 100755 (executable)
@@ -37,6 +37,7 @@ prepare_tbb:
        rm -rf $(SRC_ROOT)/inference-engine/temp && mkdir -p $(SRC_ROOT)/inference-engine/temp
        cp $(SRC_ROOT)/packaging/$(EXTERNAL_TBB_ARCHIVE).tar.gz $(SRC_ROOT)/inference-engine/temp
        cd $(SRC_ROOT)/inference-engine/temp && tar zxvf $(EXTERNAL_TBB_ARCHIVE).tar.gz && rm -f *.tar.gz
+       cd $(SRC_ROOT)/inference-engine/temp/tbb/include/tbb && sed -i 's/task\* next_offloaded;/tbb::task* next_offloaded;/' task.h
        cp $(SRC_ROOT)/debian/tbb_patches/*.patch $(EXTERNAL_TBB_SRC_ROOT)
        patch -d $(EXTERNAL_TBB_SRC_ROOT) -p1 < $(EXTERNAL_TBB_SRC_ROOT)/$(EXTERNAL_TBB_SRC_PATCH0)
        cd $(EXTERNAL_TBB_SRC_ROOT) && LDFLAGS="" $(MAKE) tbb_build_prefix=ubuntu_$(DEB_HOST_ARCH) extra_inc=big_iron.inc -j$(nproc)