| 1 |
commit: 675d894c36bfd854d8f7624912d34e9dd6ca7177 |
| 2 |
Author: Alex Fan <alex.fan.q <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jan 20 05:02:17 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 12:30:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675d894c |
| 7 |
|
| 8 |
dev-cpp/tbb: fix undefined __TBB_machine_fetchadd4 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/827883 |
| 11 |
Signed-off-by: Alex Fan <alex.fan.q <AT> gmail.com> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/23878 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
...bb-2021.4.0-missing-TBB_machine_fetchadd4.patch | 23 ++++++++++++++++++++++ |
| 16 |
dev-cpp/tbb/tbb-2021.4.0.ebuild | 2 ++ |
| 17 |
dev-cpp/tbb/tbb-2021.5.0.ebuild | 2 ++ |
| 18 |
3 files changed, 27 insertions(+) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 000000000000..091cad5821e7 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch |
| 25 |
@@ -0,0 +1,23 @@ |
| 26 |
+https://github.com/oneapi-src/oneTBB/issues/186 |
| 27 |
+https://github.com/oneapi-src/oneTBB/pull/550 |
| 28 |
+https://bugs.gentoo.org/827883 |
| 29 |
+ |
| 30 |
+From: Felix Yan <felixonmars@×××××××××.org> |
| 31 |
+Date: Thu, 7 Oct 2021 14:16:16 +0800 |
| 32 |
+Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550) |
| 33 |
+ |
| 34 |
+Upstream-Status: Merged in commit later than 2021.5.0 |
| 35 |
+ |
| 36 |
+--- a/src/tbb/tools_api/ittnotify_config.h |
| 37 |
++++ b/src/tbb/tools_api/ittnotify_config.h |
| 38 |
+@@ -147,6 +147,10 @@ |
| 39 |
+ # define ITT_ARCH_IA32E 2 |
| 40 |
+ #endif /* ITT_ARCH_IA32E */ |
| 41 |
+ |
| 42 |
++#ifndef ITT_ARCH_IA64 |
| 43 |
++# define ITT_ARCH_IA64 3 |
| 44 |
++#endif /* ITT_ARCH_IA64 */ |
| 45 |
++ |
| 46 |
+ #ifndef ITT_ARCH_ARM |
| 47 |
+ # define ITT_ARCH_ARM 4 |
| 48 |
+ #endif /* ITT_ARCH_ARM */ |
| 49 |
|
| 50 |
diff --git a/dev-cpp/tbb/tbb-2021.4.0.ebuild b/dev-cpp/tbb/tbb-2021.4.0.ebuild |
| 51 |
index 930bcd958708..ff94b74527c2 100644 |
| 52 |
--- a/dev-cpp/tbb/tbb-2021.4.0.ebuild |
| 53 |
+++ b/dev-cpp/tbb/tbb-2021.4.0.ebuild |
| 54 |
@@ -24,6 +24,8 @@ BDEPEND="virtual/pkgconfig" |
| 55 |
|
| 56 |
PATCHES=( |
| 57 |
"${FILESDIR}"/${P}-lto.patch |
| 58 |
+ # bug 827883 |
| 59 |
+ "${FILESDIR}"/${P}-missing-TBB_machine_fetchadd4.patch |
| 60 |
) |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
|
| 64 |
diff --git a/dev-cpp/tbb/tbb-2021.5.0.ebuild b/dev-cpp/tbb/tbb-2021.5.0.ebuild |
| 65 |
index 1fa9bfc11894..6b2ff50c7c4a 100644 |
| 66 |
--- a/dev-cpp/tbb/tbb-2021.5.0.ebuild |
| 67 |
+++ b/dev-cpp/tbb/tbb-2021.5.0.ebuild |
| 68 |
@@ -26,6 +26,8 @@ PATCHES=( |
| 69 |
# should be in.. 2022? |
| 70 |
"${FILESDIR}"/${PN}-2021.4.0-lto.patch |
| 71 |
"${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch |
| 72 |
+ # bug 827883 |
| 73 |
+ "${FILESDIR}"/${PN}-2021.4.0-missing-TBB_machine_fetchadd4.patch |
| 74 |
# need to verify this is in master |
| 75 |
"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch |
| 76 |
) |
Archives