diff options
-rw-r--r-- | meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-support/tbb/tbb_2021.13.0.bb (renamed from meta-oe/recipes-support/tbb/tbb_2021.11.0.bb) | 6 |
2 files changed, 3 insertions, 36 deletions
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 @@ | |||
1 | From 7ffc1eba8596544d6e3af0fd5f4004fff6d56f84 Mon Sep 17 00:00:00 2001 | ||
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 15:48:57 +0800 | ||
4 | Subject: [PATCH] hwloc_detection.cmake: remove cross-compiation check | ||
5 | |||
6 | This check is preventing pkgconfig to | ||
7 | search for hwloc under cross-compilation. | ||
8 | |||
9 | pkgconfig able to find hwloc pkg from sysroot. | ||
10 | |||
11 | Upstream-Status: Inappropriate | ||
12 | |||
13 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
14 | --- | ||
15 | cmake/hwloc_detection.cmake | 2 -- | ||
16 | 1 file changed, 2 deletions(-) | ||
17 | |||
18 | diff --git a/cmake/hwloc_detection.cmake b/cmake/hwloc_detection.cmake | ||
19 | index 47233b17..5a7e84c3 100644 | ||
20 | --- a/cmake/hwloc_detection.cmake | ||
21 | +++ b/cmake/hwloc_detection.cmake | ||
22 | @@ -46,8 +46,6 @@ endforeach() | ||
23 | unset(HWLOC_TARGET_NAME) | ||
24 | |||
25 | if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND | ||
26 | - # No hwloc auto detection for cross compilation | ||
27 | - NOT CMAKE_CROSSCOMPILING AND | ||
28 | NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH | ||
29 | ) | ||
30 | find_package(PkgConfig QUIET) | ||
31 | -- | ||
32 | 2.37.3 | ||
33 | |||
diff --git a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.13.0.bb index 0f9f02655e..e2b7543c0f 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" | |||
13 | PE = "1" | 13 | PE = "1" |
14 | 14 | ||
15 | BRANCH = "onetbb_2021" | 15 | BRANCH = "onetbb_2021" |
16 | SRCREV = "8b829acc65569019edb896c5150d427f288e8aba" | 16 | SRCREV = "1c4c93fc5398c4a1acb3492c02db4699f3048dea" |
17 | SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ | 17 | SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ |
18 | file://0001-hwloc_detection.cmake-remove-cross-compiation-check.patch \ | 18 | " |
19 | " | 19 | |
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
22 | inherit cmake pkgconfig | 22 | inherit cmake pkgconfig |