4 files changed, 77 insertions, 1 deletions
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 1e72e17fbd67..b5058f84379a 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,13 +1,15 @@
 AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4
 AUX tbb-2021.4.0-lto.patch 9710 BLAKE2B 801b7886af6ec02f118add4607c22b26cfafb14997162d5d4e72ec3b48d6ab5ea03995c6a02957331b65172b2d18d932b59bf655352dcbbc178aa508613681f1 SHA512 d65c84a3246dcf5a7c799fd87566834842adfd104bca2c0b0cbd9e2dcae0b900a189154ca9d9c95351c32ff9014cee15f0eb924228e486b58fdcfc624b12d46b
 AUX tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch 645 BLAKE2B 8a769caed4817413f8e8d11ae3264a75769826989e3815cf24fa856d601ded1ffbd7edd772aa268ca0f8afa15f9fab8bf1deb019635f2355377367814c62d5ce SHA512 d84bed45b82cd63c8afb1f22e2688a7e298014997fa3d1107d7a91b1d4a0f7a54a42cfa38841a051c6a0ca6721182584472f34362c97edba02e3131c77230545
+AUX tbb-2021.5.0-flags-stripping.patch 1078 BLAKE2B 32b5463980ae8841ce551caffb91d5bb20a70af4d93d6c0d9e45bd235f3948599c42fa779eb4c53a6994275d827c0074dab8cb2e66313989a1ffe067e48b12c3 SHA512 22460e212ea506bfd13765eb9557d21cb19d4fd9f42e195ed36f12aabd6e9b4c24a218a5bcb55894f45ce0f118de89287751913d386931bd9cda3a389bc04345
 AUX tbb-2021.5.0-musl-deepbind.patch 982 BLAKE2B a605db66a697ce4cf826448ea843529464b224882708c26623acdaa573a07ca157d562c0e03e12dc8480871f3327daca144a0bc238a5a15421b17966c429c9fd SHA512 6a6deca9d6ac037704e75abaf1544627c369057636214fa0a9c573fc190900226fab3760d8b5afe3ac7ac456bdaa105f0912173d054fe2eaa6dcdbadcb9822d1
 AUX tbb-2021.5.0-musl-mallinfo.patch 931 BLAKE2B 7e77b6bed7d0a8422e45499317fd02ea080e94575e96c0610e1503633a296855095b675be1b679d4b97c8e50e72736d71582c30a91d7630c02b0c98996d2abb2 SHA512 21555821262a29b904ff3c0c8a023459c5c2ae0df11d17e0e2ec36d680016a0a2c4808ad257e1a3fabd78046e5ac795f5906aed129c35e40c257251957722723
 AUX tbb-2021.5.0-musl-setcontext.patch 1409 BLAKE2B b7dbb2379cdf8c27fe704850e9ef9d9630719c3031d7f5591e973648c5e299f90b25684aab7af95a56038dde3e490e6711f5a443e016404129d92de549f9c55e SHA512 558c917326408818cd0c1d8169fd958533dab9470e2a04621ff396de61c8a371a68c9f4a2d9f1e91ed79bd57605be3208e4e473e80cb3f38db526a673ff3468d
+AUX tbb-2021.5.0-x86-mwaitpkg.patch 1975 BLAKE2B d072f7dfa7f1fbe5986c409147419d782abd1c21e602a8555a696833c7c919f2e6996f8a2fd1e61fb6d3ccdf00f0ce5ee9b78ad53770a06f632cb6029bb74029 SHA512 de952018c2b82634f02f38754d0cb92d31229b9546a135ac54d43b53ad2d0a74ba3bd02946e856c29455438e539a0cf5bc3fb4eae35aa0774baa1faf723e8b61
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
 DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B a635c6efa1894c33e2f75c1aa03b6c0f4a86ebef3b58fa42bd25b53d661ed7a9d21f49f121dd3679735f219fbfc35604600bcc72ba60d3602e6de77b0d62e37b SHA512 96da2bc351fd64dfa854f8e6cabc1c4e53af3d55760e99d6f83ad53779c727af333d13d6be0828ed70371cf796498d2063e9dd0e4b2f6451623bb5d28ccbf20b
 DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
 EBUILD tbb-2020.3.ebuild 3328 BLAKE2B 49da765405909bdf94c7e315ae00b4503113db99ea1c13e411a5349bd52b816b36654e06a2cb7c8d10b66caced270f8a7bc2d9c569296ecf4f99a91accf2301e SHA512 19edba39e17bf21471309fb769a3ffb0af06b6cbf61f3523767b8980ea2655cca96edd6191ace397610d9e2460a2e684361077e57b82393500950255dd0a7c8a
 EBUILD tbb-2021.4.0.ebuild 1003 BLAKE2B 60f60e47a512ee0a715cabc1f7bf876aa8f4be338cf3563ccc5aeb6b4f8c83dc6671e1fe168a96c2e856c95912fd5766021040ce593b5d656e95136f7afff5e2 SHA512 27a5925c68d5f369753c72e4cd8bb472cdc9e21758e7b3e1d144afb374f12d92964b1721d39c885c6da9500aed0aecee17914ffc87a675721e7b6a5d41c43a60
-EBUILD tbb-2021.5.0-r1.ebuild 1275 BLAKE2B 72e0c6204e656d5ac9028e2ce9cd85977186ca4cf091e625219b7112088acaafad716489caf289cbcd6c41a4de52a8866e8a8e060dcefa33194e3d0c4c4d8087 SHA512 38cec889d464d496890acb94dfe8fea0052a865fd42dca5e40fcd3b4699236b58f6427de267c38b6cc89fda558d4b47fbf103193c5bfd19453935df7e205fe12
+EBUILD tbb-2021.5.0-r1.ebuild 1401 BLAKE2B 8ea211e11e41bed9902e9801d7a707d9d33687ba8cbd4a501c039550a771a456db9c5b65ce363380bdb404cfdb69786e0c9df3e1a89bd483b7f6c5e717139de3 SHA512 e8729d979a480ebbe6fccb7086aef1492649637c78600c984104f491dc98e77ffe3dc1b481d0da7d8d1f64aa2ea77889f14c2a3e704648d3cdb731d97a082aea
 MISC metadata.xml 688 BLAKE2B 5bd4c0fa3ce3f055bd8265a2133ad2b4ea6de984ccf295544f3013851b02a1f1d577070c2ecc1e2748fa8356d3d25278e9a8649a2523763eba6bc7e6ba830f79 SHA512 93b90fc74511f35e02dd7f7c7b3aeb08d2e4c88e2af852fcce40bdb780a3828975955b751542b8a9d3aa0561155858b91842f3cf98c713dcb08c9ce2152f0fe3
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
new file mode 100644
index 000000000000..4252ea446423
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
@@ -0,0 +1,27 @@
+https://github.com/oneapi-src/oneTBB/pull/716
+
+From 9595b9699ae6863d1e0cf770a89728eafcaf8845 Mon Sep 17 00:00:00 2001
+From: Christoph Erhardt <github@sicherha.de>
+Date: Wed, 5 Jan 2022 15:13:32 +0100
+Subject: [PATCH] Fix overeager stripping of compile flag
+
+The existing regex strips all occurrences of the given string from
+`${CMAKE_CXX_FLAGS}`, regardless of whether it is just a substring of a
+flag. For instance, `-Werror=format-security` gets truncated to
+`=format-security`.
+
+The new regex makes sure that only whole words get replaced.
+
+Signed-off-by: Christoph Erhardt <github@sicherha.de>
+--- a/cmake/utils.cmake
++++ b/cmake/utils.cmake
+@@ -18,7 +18,7 @@ macro(tbb_remove_compile_flag flag)
+     set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS ${_tbb_compile_options})
+     unset(_tbb_compile_options)
+     if (CMAKE_CXX_FLAGS)
+-        string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++        string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+     endif()
+ endmacro()
+ 
+
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
new file mode 100644
index 000000000000..83f119a9acd3
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
@@ -0,0 +1,43 @@
+https://github.com/oneapi-src/oneTBB/pull/609
+https://github.com/oneapi-src/oneTBB/issues/370
+https://bugs.gentoo.org/842762
+
+From 542a27fa1cfafaf76772e793549d9f4d288d03a9 Mon Sep 17 00:00:00 2001
+From: Ilya Isaev <ilya.isaev@intel.com>
+Date: Fri, 8 Oct 2021 10:18:16 +0300
+Subject: [PATCH] Detect 32 bit x86 systems while adding -mwaitpkg option
+
+Signed-off-by: Ilya Isaev <ilya.isaev@intel.com>
+--- a/cmake/compilers/Clang.cmake
++++ b/cmake/compilers/Clang.cmake
+@@ -44,7 +44,7 @@ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
+ endif()
+ 
+ # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
+ endif()
+ 
+--- a/cmake/compilers/GNU.cmake
++++ b/cmake/compilers/GNU.cmake
+@@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
+ endif()
+ 
+ # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
+ endif()
+ 
+--- a/cmake/compilers/MSVC.cmake
++++ b/cmake/compilers/MSVC.cmake
+@@ -72,7 +72,7 @@ if (TBB_WINDOWS_DRIVER)
+ endif()
+ 
+ if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
+-    if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++    if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+         set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg)
+     endif()
+     set(TBB_OPENMP_NO_LINK_FLAG TRUE)
diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
index aa3f0e7c26e2..4235949bb77b 100644
--- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
@@ -32,6 +32,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
 	# musl again, should be in.. 2022?
 	"${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch
+	# should be in.. 2022?
+	"${FILESDIR}"/${PN}-2021.5.0-x86-mwaitpkg.patch
+
+	"${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch
 )
 
 src_configure() {