summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/tbb/tbb/0001-CMakeLists.txt-exclude-riscv64-riscv32.patch35
-rw-r--r--meta-oe/recipes-support/tbb/tbb_2021.11.0.bb (renamed from meta-oe/recipes-support/tbb/tbb_2021.9.0.bb)3
2 files changed, 1 insertions, 37 deletions
diff --git a/meta-oe/recipes-support/tbb/tbb/0001-CMakeLists.txt-exclude-riscv64-riscv32.patch b/meta-oe/recipes-support/tbb/tbb/0001-CMakeLists.txt-exclude-riscv64-riscv32.patch
deleted file mode 100644
index b34762710d..0000000000
--- a/meta-oe/recipes-support/tbb/tbb/0001-CMakeLists.txt-exclude-riscv64-riscv32.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From cb9e9b5b1ad05dd9de07a65ee7147cdb3433746a Mon Sep 17 00:00:00 2001
2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Fri, 9 Apr 2021 15:41:35 +0800
4Subject: [PATCH] CMakeLists.txt: exclude riscv64 & riscv32
5
6Upstream-Status: Pending
7
8Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
9---
10 src/tbb/CMakeLists.txt | 2 +-
11 src/tbbmalloc/CMakeLists.txt | 2 +-
12 2 files changed, 2 insertions(+), 2 deletions(-)
13
14--- a/src/tbb/CMakeLists.txt
15+++ b/src/tbb/CMakeLists.txt
16@@ -58,7 +58,7 @@ target_compile_definitions(tbb
17 $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_DYNAMIC_LOAD_ENABLED=0>
18 $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_SOURCE_DIRECTLY_INCLUDED=1>)
19
20-if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64)" OR
21+if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64|riscv64|riscv32)" OR
22 "${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64" OR
23 WINDOWS_STORE OR
24 TBB_WINDOWS_DRIVER))
25--- a/src/tbbmalloc/CMakeLists.txt
26+++ b/src/tbbmalloc/CMakeLists.txt
27@@ -30,7 +30,7 @@ target_compile_definitions(tbbmalloc
28 $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_DYNAMIC_LOAD_ENABLED=0>
29 $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_SOURCE_DIRECTLY_INCLUDED=1>)
30
31-if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64)" OR
32+if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64|riscv64|riscv32)" OR
33 "${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64" OR
34 WINDOWS_STORE OR
35 TBB_WINDOWS_DRIVER OR
diff --git a/meta-oe/recipes-support/tbb/tbb_2021.9.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb
index 028291c965..1a1d9988bc 100644
--- a/meta-oe/recipes-support/tbb/tbb_2021.9.0.bb
+++ b/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb
@@ -12,9 +12,8 @@ DEPENDS:append:libc-musl = " libucontext"
12PE = "1" 12PE = "1"
13 13
14BRANCH = "onetbb_2021" 14BRANCH = "onetbb_2021"
15SRCREV = "a00cc3b8b5fb4d8115e9de56bf713157073ed68c" 15SRCREV = "8b829acc65569019edb896c5150d427f288e8aba"
16SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ 16SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
17 file://0001-CMakeLists.txt-exclude-riscv64-riscv32.patch \
18" 17"
19S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
20 19