Merge IB/CMSSW_12_1_X/master into IB/CMSSW_12_1_X/cc8.

tbb.spec

@@ -1,21 +1,15 @@
-### RPM external tbb v2021.3.0
+### RPM external tbb v2021.4.0
 
 %define tag %{realversion}
 %define branch onetbb_2021
 %define github_user oneapi-src
 %define github_repo oneTBB
 Source: git+https://github.com/%{github_user}/%{github_repo}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{branch}-%{tag}.tgz
-# ASAN: Use after scope in conformance_concurrent_queue
-Source1: https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/435.patch
-# Remove arch macros checks for getSmallObjectIndex
-Source2: https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/461.patch
 Requires: hwloc
 BuildRequires: cmake
 
 %prep
 %setup -n %{n}-%{realversion}
-patch -p1 < %{_sourcedir}/435.patch
-patch -p1 < %{_sourcedir}/461.patch
 
 %build
 rm -rf %{_builddir}/build