| 1 |
commit: ecf1ec7d75750a8a84659a3b1e6ecd977027d1ca |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 11 01:18:40 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 11 01:18:40 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf1ec7d |
| 7 |
|
| 8 |
dev-cpp/tbb: backport x86 build fix |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/842762 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch | 43 +++++++++++++++++++++++ |
| 14 |
dev-cpp/tbb/tbb-2021.5.0-r1.ebuild | 2 ++ |
| 15 |
2 files changed, 45 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..83f119a9acd3 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch |
| 22 |
@@ -0,0 +1,43 @@ |
| 23 |
+https://github.com/oneapi-src/oneTBB/pull/609 |
| 24 |
+https://github.com/oneapi-src/oneTBB/issues/370 |
| 25 |
+https://bugs.gentoo.org/842762 |
| 26 |
+ |
| 27 |
+From 542a27fa1cfafaf76772e793549d9f4d288d03a9 Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Ilya Isaev <ilya.isaev@×××××.com> |
| 29 |
+Date: Fri, 8 Oct 2021 10:18:16 +0300 |
| 30 |
+Subject: [PATCH] Detect 32 bit x86 systems while adding -mwaitpkg option |
| 31 |
+ |
| 32 |
+Signed-off-by: Ilya Isaev <ilya.isaev@×××××.com> |
| 33 |
+--- a/cmake/compilers/Clang.cmake |
| 34 |
++++ b/cmake/compilers/Clang.cmake |
| 35 |
+@@ -44,7 +44,7 @@ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag) |
| 36 |
+ endif() |
| 37 |
+ |
| 38 |
+ # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors |
| 39 |
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)") |
| 40 |
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)") |
| 41 |
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>) |
| 42 |
+ endif() |
| 43 |
+ |
| 44 |
+--- a/cmake/compilers/GNU.cmake |
| 45 |
++++ b/cmake/compilers/GNU.cmake |
| 46 |
+@@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER) |
| 47 |
+ endif() |
| 48 |
+ |
| 49 |
+ # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors |
| 50 |
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)") |
| 51 |
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)") |
| 52 |
+ 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>) |
| 53 |
+ endif() |
| 54 |
+ |
| 55 |
+--- a/cmake/compilers/MSVC.cmake |
| 56 |
++++ b/cmake/compilers/MSVC.cmake |
| 57 |
+@@ -72,7 +72,7 @@ if (TBB_WINDOWS_DRIVER) |
| 58 |
+ endif() |
| 59 |
+ |
| 60 |
+ if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)") |
| 61 |
+- if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)") |
| 62 |
++ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)") |
| 63 |
+ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg) |
| 64 |
+ endif() |
| 65 |
+ set(TBB_OPENMP_NO_LINK_FLAG TRUE) |
| 66 |
|
| 67 |
diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild |
| 68 |
index 8c4c5a5883a4..4235949bb77b 100644 |
| 69 |
--- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild |
| 70 |
+++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild |
| 71 |
@@ -32,6 +32,8 @@ PATCHES=( |
| 72 |
"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch |
| 73 |
# musl again, should be in.. 2022? |
| 74 |
"${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch |
| 75 |
+ # should be in.. 2022? |
| 76 |
+ "${FILESDIR}"/${PN}-2021.5.0-x86-mwaitpkg.patch |
| 77 |
|
| 78 |
"${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch |
| 79 |
) |
Archives