diff mbox series

[meta-oe,3/3] tbb: upgrade 2021.11.0 -> 2021.13.0

Message ID 20240917040558.2231178-3-yi.zhao@windriver.com
State Accepted
Headers show
Series [meta-oe,1/3] v4l-utils: upgrade 1.26.1 -> 1.28.1 | expand

Commit Message

Yi Zhao Sept. 17, 2024, 4:05 a.m. UTC 
ChangeLog:
https://github.com/oneapi-src/oneTBB/releases/tag/v2021.12.0
https://github.com/oneapi-src/oneTBB/releases/tag/v2021.13.0

Drop 0001-hwloc_detection.cmake-remove-cross-compiation-check.patch as
the issue has been fixed upstream.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 ....cmake-remove-cross-compiation-check.patch | 33 -------------------
 .../{tbb_2021.11.0.bb => tbb_2021.13.0.bb}    |  6 ++--
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch
 rename meta-oe/recipes-support/tbb/{tbb_2021.11.0.bb => tbb_2021.13.0.bb} (95%)
diff mbox series

Patch

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 640b13170..000000000
--- 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.13.0.bb
similarity index 95%
rename from meta-oe/recipes-support/tbb/tbb_2021.11.0.bb
rename to meta-oe/recipes-support/tbb/tbb_2021.13.0.bb
index 0f9f02655..e2b7543c0 100644
--- a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb
+++ b/meta-oe/recipes-support/tbb/tbb_2021.13.0.bb
@@ -13,10 +13,10 @@  DEPENDS:append:class-target = " hwloc"
 PE = "1"
 
 BRANCH = "onetbb_2021"
-SRCREV = "8b829acc65569019edb896c5150d427f288e8aba"
+SRCREV = "1c4c93fc5398c4a1acb3492c02db4699f3048dea"
 SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
-            file://0001-hwloc_detection.cmake-remove-cross-compiation-check.patch \
-"
+          "
+
 S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig