3 files changed, 3 insertions, 95 deletions

diff --git a/meta-oe/recipes-support/tbb/tbb/0001-Fix-suppress-new-GCC-12-13-warnings-1192.patch b/meta-oe/recipes-support/tbb/tbb/0001-Fix-suppress-new-GCC-12-13-warnings-1192.patch
deleted file mode 100644
index 489f011b84..0000000000
--- a/meta-oe/recipes-support/tbb/tbb/0001-Fix-suppress-new-GCC-12-13-warnings-1192.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e131071769ee3df51b56b053ba6bfa06ae9eff25 Mon Sep 17 00:00:00 2001
-From: Dmitri Mokhov <dmitri.n.mokhov@intel.com>
-Date: Mon, 11 Sep 2023 10:35:07 -0500
-Subject: [PATCH] Fix/suppress new GCC 12/13 warnings (#1192)
-
-Upstream-Status: Backport [https://github.com/oneapi-src/oneTBB/commit/e131071769ee3df51b56b053ba6bfa06ae9eff25]
-Signed-off-by: Dmitri Mokhov <dmitri.n.mokhov@intel.com>
----
- .../oneapi/tbb/detail/_concurrent_unordered_base.h   |  2 +-
- src/tbb/concurrent_monitor.h                         | 12 +++++++++++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/include/oneapi/tbb/detail/_concurrent_unordered_base.h b/include/oneapi/tbb/detail/_concurrent_unordered_base.h
-index ade91c33..40829208 100644
---- a/include/oneapi/tbb/detail/_concurrent_unordered_base.h
-+++ b/include/oneapi/tbb/detail/_concurrent_unordered_base.h
-@@ -921,7 +921,7 @@ private:
-             node_allocator_traits::deallocate(dummy_node_allocator, node, 1);
-         } else {
-             // GCC 11.1 issues a warning here that incorrect destructor might be called for dummy_nodes
--            #if (__TBB_GCC_VERSION >= 110100 && __TBB_GCC_VERSION < 130000 ) && !__clang__ && !__INTEL_COMPILER
-+            #if (__TBB_GCC_VERSION >= 110100 && __TBB_GCC_VERSION < 140000 ) && !__clang__ && !__INTEL_COMPILER
-             volatile
-             #endif
-             value_node_ptr val_node = static_cast<value_node_ptr>(node);
-diff --git a/src/tbb/concurrent_monitor.h b/src/tbb/concurrent_monitor.h
-index 3d20ef5b..3e5c4beb 100644
---- a/src/tbb/concurrent_monitor.h
-+++ b/src/tbb/concurrent_monitor.h
-@@ -1,5 +1,5 @@
- /*
--    Copyright (c) 2005-2021 Intel Corporation
-+    Copyright (c) 2005-2023 Intel Corporation
- 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-@@ -290,7 +290,17 @@ public:
-             n = my_waitset.front();
-             if (n != end) {
-                 my_waitset.remove(*n);
-+
-+// GCC 12.x-13.x issues a warning here that to_wait_node(n)->my_is_in_list might have size 0, since n is
-+// a base_node pointer. (This cannot happen, because only wait_node pointers are added to my_waitset.)
-+#if (__TBB_GCC_VERSION >= 120100 && __TBB_GCC_VERSION < 140000 ) && !__clang__ && !__INTEL_COMPILER
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wstringop-overflow"
-+#endif
-                 to_wait_node(n)->my_is_in_list.store(false, std::memory_order_relaxed);
-+#if (__TBB_GCC_VERSION >= 120100 && __TBB_GCC_VERSION < 140000 ) && !__clang__ && !__INTEL_COMPILER
-+#pragma GCC diagnostic pop
-+#endif
-             }
-         }
- 
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch b/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch
deleted file mode 100644
index 640b131703..0000000000
--- a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7ffc1eba8596544d6e3af0fd5f4004fff6d56f84 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 29 Nov 2023 15:48:57 +0800
-Subject: [PATCH] hwloc_detection.cmake: remove cross-compiation check
-
-This check is preventing pkgconfig to
-search for hwloc under cross-compilation.
-
-pkgconfig able to find hwloc pkg from sysroot.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- cmake/hwloc_detection.cmake | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/cmake/hwloc_detection.cmake b/cmake/hwloc_detection.cmake
-index 47233b17..5a7e84c3 100644
---- a/cmake/hwloc_detection.cmake
-+++ b/cmake/hwloc_detection.cmake
-@@ -46,8 +46,6 @@ endforeach()
- unset(HWLOC_TARGET_NAME)
- 
- if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND
--    # No hwloc auto detection for cross compilation
--    NOT CMAKE_CROSSCOMPILING AND
-     NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH
- )
-     find_package(PkgConfig QUIET)
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.12.0.bb
index 318cd87643..ed5dc04866 100644
--- a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb
+++ b/meta-oe/recipes-support/tbb/tbb_2021.12.0.bb
@@ -13,11 +13,8 @@ DEPENDS:append:class-target = " hwloc"
 PE = "1"
 
 BRANCH = "onetbb_2021"
-SRCREV = "8b829acc65569019edb896c5150d427f288e8aba"
-SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
-            file://0001-hwloc_detection.cmake-remove-cross-compiation-check.patch \
-            file://0001-Fix-suppress-new-GCC-12-13-warnings-1192.patch \
-"
+SRCREV = "9afd759b72c0c233cd5ea3c3c06b0894c9da9c54"
+SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH}"
 S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
@@ -26,6 +23,7 @@ inherit cmake pkgconfig
 EXTRA_OECMAKE += " \
                     -DTBB_TEST=OFF \
                     -DCMAKE_BUILD_TYPE=Release \
+                    -DTBB_DISABLE_HWLOC_AUTOMATIC_SEARCH=OFF \
                 "
 
 # Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi)