tbb: upgrade 2021.9.0 -> 2021.11.0

riscv arch support enabled in this release, so patching
for riscv* not required anymore. Drop patch.

Release note:
https://github.com/oneapi-src/oneTBB/releases/tag/v2021.11.0

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Naveen Saini
2023-11-30 13:20:06 +08:00
committed by Khem Raj
parent 501e5aa4b5
commit d5f16f18c3
2 changed files with 1 additions and 37 deletions
@@ -1,35 +0,0 @@
From cb9e9b5b1ad05dd9de07a65ee7147cdb3433746a Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Fri, 9 Apr 2021 15:41:35 +0800
Subject: [PATCH] CMakeLists.txt: exclude riscv64 & riscv32
Upstream-Status: Pending
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
src/tbb/CMakeLists.txt | 2 +-
src/tbbmalloc/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/src/tbb/CMakeLists.txt
+++ b/src/tbb/CMakeLists.txt
@@ -58,7 +58,7 @@ target_compile_definitions(tbb
$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_DYNAMIC_LOAD_ENABLED=0>
$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_SOURCE_DIRECTLY_INCLUDED=1>)
-if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64)" OR
+if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64|riscv64|riscv32)" OR
"${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64" OR
WINDOWS_STORE OR
TBB_WINDOWS_DRIVER))
--- a/src/tbbmalloc/CMakeLists.txt
+++ b/src/tbbmalloc/CMakeLists.txt
@@ -30,7 +30,7 @@ target_compile_definitions(tbbmalloc
$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_DYNAMIC_LOAD_ENABLED=0>
$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:__TBB_SOURCE_DIRECTLY_INCLUDED=1>)
-if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64)" OR
+if (NOT ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(armv7-a|aarch64|mips|arm64|riscv64|riscv32)" OR
"${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64" OR
WINDOWS_STORE OR
TBB_WINDOWS_DRIVER OR
@@ -12,9 +12,8 @@ DEPENDS:append:libc-musl = " libucontext"
PE = "1"
BRANCH = "onetbb_2021"
SRCREV = "a00cc3b8b5fb4d8115e9de56bf713157073ed68c"
SRCREV = "8b829acc65569019edb896c5150d427f288e8aba"
SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
file://0001-CMakeLists.txt-exclude-riscv64-riscv32.patch \
"
S = "${WORKDIR}/git"