oneTBB: Update to 2021.9.0 (#7462)

JuliaPackaging · Oct 4, 2023 · 942be05 · 942be05
1 parent 96fb019
commit 942be05
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/O/oneTBB/build_tarballs.jl b/O/oneTBB/build_tarballs.jl
@@ -3,12 +3,12 @@
 using BinaryBuilder, Pkg
 
 name = "oneTBB"
-version = v"2021.8.0"
+version = v"2021.9.0"
 
 # Collection of sources required to complete build
 sources = [
     GitSource("https://github.com/oneapi-src/oneTBB.git",
-    "c9497714821c3d443ee44c732609eb6850195ffb"),
+              "a00cc3b8b5fb4d8115e9de56bf713157073ed68c"),
     DirectorySource("./bundled"),
 ]
 
@@ -29,6 +29,7 @@ mkdir build && cd build/
 cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
     -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \
     -DCMAKE_BUILD_TYPE=Release \
+    -DTBB_STRICT=OFF \
     -DTBB_TEST=OFF \
     -DTBB_EXAMPLES=OFF \
     ..
@@ -50,4 +51,5 @@ dependencies = Dependency[
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
-build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6", preferred_gcc_version=v"9")
+build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
+               julia_compat="1.6", preferred_gcc_version=v"9")
diff --git a/O/oneTBB/bundled/patches/mingw.patch b/O/oneTBB/bundled/patches/mingw.patch
@@ -10,3 +10,14 @@
 
  if (MINGW AND CMAKE_SYSTEM_PROCESSOR MATCHES "i.86")
      list (APPEND TBB_COMMON_COMPILE_FLAGS -msse2)
+--- a/src/tbb/tools_api/ittnotify_config.h
++++ b/src/tbb/tools_api/ittnotify_config.h
+@@ -284,7 +284,7 @@
+ #define __itt_unload_lib(handle)  FreeLibrary(handle)
+ #define __itt_system_error()      (int)GetLastError()
+ #define __itt_fstrcmp(s1, s2)     lstrcmpA(s1, s2)
+-#define __itt_fstrnlen(s, l)      strnlen_s(s, l)
++#define __itt_fstrnlen(s, l)      strnlen(s, l)
+ #define __itt_fstrcpyn(s1, b, s2, l) strncpy_s(s1, b, s2, l)
+ #define __itt_thread_id()         GetCurrentThreadId()
+ #define __itt_thread_yield()      SwitchToThread()