fix(deps): bump tbb and enable its compilation with emscripten

Signed-off-by: Roberto Scolaro <roberto.scolaro21@gmail.com>
falcosecurity · Nov 8, 2024 · 92ac60c · 92ac60c
1 parent 10d5968
commit 92ac60c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/cmake/modules/tbb.cmake b/cmake/modules/tbb.cmake
@@ -58,16 +58,20 @@ else()
 
 	if(NOT TARGET tbb)
 		message(STATUS "Using bundled tbb in '${TBB_SRC}'")
-		set(TBB_SRC_URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.9.0.tar.gz")
+		set(TBB_SRC_URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2022.0.0.tar.gz")
 		set(TBB_SRC_URL_HASH
-			"SHA256=1ce48f34dada7837f510735ff1172f6e2c261b09460e3bf773b49791d247d24e"
+			"SHA256=e8e89c9c345415b17b30a2db3095ba9d47647611662073f7fbf54ad48b7f3c2a"
 		)
 		set(TBB_FLAGS "")
 		if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 			# latest TBB has issues with GCC >= 12 see:
 			# https://github.com/oneapi-src/oneTBB/issues/843#issuecomment-1152646035
 			set(TBB_FLAGS "-Wno-error=stringop-overflow")
 		endif()
+		if(EMSCRIPTEN)
+			set(TBB_FLAGS "${TBB_FLAGS} -Wno-unused-command-line-argument")
+			set(TBB_EMSCRIPTEN "ON")
+		endif()
 
 		if(NOT WIN32)
 			ExternalProject_Add(
@@ -84,6 +88,7 @@ else()
 						   -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_PIC}
 						   -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
 						   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+						   -DEMSCRIPTEN=${TBB_EMSCRIPTEN}
 				BUILD_BYPRODUCTS ${TBB_LIB}
 				INSTALL_COMMAND ""
 			)

diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
@@ -32,6 +32,7 @@ include(ExternalProject)
 include(BuildPkgConfigDependencies)
 include(jsoncpp)
 include(zlib)
+include(tbb)
 
 if(NOT MINIMAL_BUILD)
 	if(NOT WIN32 AND NOT EMSCRIPTEN)
@@ -48,10 +49,6 @@ if(NOT WIN32 AND NOT APPLE)
 	endif() # NOT MINIMAL_BUILD
 endif()
 
-if(NOT EMSCRIPTEN)
-	include(tbb)
-endif()
-
 add_library(
 	sinsp
 	filter/ast.cpp