mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
tbb: upgrade 2021.11.0 -> 2021.13.0
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> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-33
@@ -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
|
||||
|
||||
+3
-3
@@ -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
|
||||
Reference in New Issue
Block a user