[gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/, dev-cpp/tbb/files/

["Sam James" <sam@gentoo.org>]

commit:     675d894c36bfd854d8f7624912d34e9dd6ca7177
Author:     Alex Fan <alex.fan.q <AT> gmail <DOT> com>
AuthorDate: Thu Jan 20 05:02:17 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 12:30:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675d894c

dev-cpp/tbb: fix undefined __TBB_machine_fetchadd4

Closes: https://bugs.gentoo.org/827883
Signed-off-by: Alex Fan <alex.fan.q <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23878
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...bb-2021.4.0-missing-TBB_machine_fetchadd4.patch | 23 ++++++++++++++++++++++
 dev-cpp/tbb/tbb-2021.4.0.ebuild                    |  2 ++
 dev-cpp/tbb/tbb-2021.5.0.ebuild                    |  2 ++
 3 files changed, 27 insertions(+)

diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch b/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch
new file mode 100644
index 000000000000..091cad5821e7
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch
@@ -0,0 +1,23 @@
+https://github.com/oneapi-src/oneTBB/issues/186
+https://github.com/oneapi-src/oneTBB/pull/550
+https://bugs.gentoo.org/827883
+
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Thu, 7 Oct 2021 14:16:16 +0800
+Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550)
+
+Upstream-Status: Merged in commit later than 2021.5.0
+
+--- a/src/tbb/tools_api/ittnotify_config.h
++++ b/src/tbb/tools_api/ittnotify_config.h
+@@ -147,6 +147,10 @@
+ #  define ITT_ARCH_IA32E 2
+ #endif /* ITT_ARCH_IA32E */
+ 
++#ifndef ITT_ARCH_IA64
++#  define ITT_ARCH_IA64 3
++#endif /* ITT_ARCH_IA64 */
++
+ #ifndef ITT_ARCH_ARM
+ #  define ITT_ARCH_ARM  4
+ #endif /* ITT_ARCH_ARM */

diff --git a/dev-cpp/tbb/tbb-2021.4.0.ebuild b/dev-cpp/tbb/tbb-2021.4.0.ebuild
index 930bcd958708..ff94b74527c2 100644
--- a/dev-cpp/tbb/tbb-2021.4.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.4.0.ebuild
@@ -24,6 +24,8 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-lto.patch
+	# bug 827883
+	"${FILESDIR}"/${P}-missing-TBB_machine_fetchadd4.patch
 )
 
 src_configure() {

diff --git a/dev-cpp/tbb/tbb-2021.5.0.ebuild b/dev-cpp/tbb/tbb-2021.5.0.ebuild
index 1fa9bfc11894..6b2ff50c7c4a 100644
--- a/dev-cpp/tbb/tbb-2021.5.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0.ebuild
@@ -26,6 +26,8 @@ PATCHES=(
 	# should be in.. 2022?
 	"${FILESDIR}"/${PN}-2021.4.0-lto.patch
 	"${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch
+	# bug 827883
+	"${FILESDIR}"/${PN}-2021.4.0-missing-TBB_machine_fetchadd4.patch
 	# need to verify this is in master
 	"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
 )