diff options
| author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2021-10-15 10:44:53 +0000 |
|---|---|---|
| committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2021-10-15 10:45:30 +0000 |
| commit | b48234c57a70425542de9b306a4f2b1afc72f727 (patch) | |
| tree | 2b6685a7f7e94463042b97d57ec3ecc8b9eda9ca | |
| parent | 82e2969c5b1396e9d36ecd39956fe42ca1a98669 (diff) | |
| download | ports-b48234c57a70425542de9b306a4f2b1afc72f727.tar.gz ports-b48234c57a70425542de9b306a4f2b1afc72f727.zip | |
devel/onetbb: Rework last patch to mark upstream integration
| -rw-r--r-- | devel/onetbb/files/patch-cmake-compilers-Clang.cmake | 15 | ||||
| -rw-r--r-- | devel/onetbb/files/patch-cmake-compilers-xxx.cmake | 26 |
2 files changed, 26 insertions, 15 deletions
diff --git a/devel/onetbb/files/patch-cmake-compilers-Clang.cmake b/devel/onetbb/files/patch-cmake-compilers-Clang.cmake deleted file mode 100644 index 59fd4f11702b..000000000000 --- a/devel/onetbb/files/patch-cmake-compilers-Clang.cmake +++ /dev/null @@ -1,15 +0,0 @@ -Fix build on 13-STABLE and 14-CURRENT - -See: https://github.com/oneapi-src/oneTBB/pull/614 - ---- cmake/compilers/Clang.cmake.orig 2021-10-04 09:50:18 UTC -+++ 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|amd64|i.86)") - set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>) - endif() - diff --git a/devel/onetbb/files/patch-cmake-compilers-xxx.cmake b/devel/onetbb/files/patch-cmake-compilers-xxx.cmake new file mode 100644 index 000000000000..f40a5530967e --- /dev/null +++ b/devel/onetbb/files/patch-cmake-compilers-xxx.cmake @@ -0,0 +1,26 @@ +Fix build with clang >= 12 or gcc >= 11 + +Backport from upstream, commit c4a42feb5333488360617a9b58f90e479659b744 + +--- cmake/compilers/Clang.cmake.orig 2021-10-04 09:50:18 UTC ++++ 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 "(AMD64|amd64|i.86|x86)") + set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>) + endif() + +--- cmake/compilers/GNU.cmake.orig 2021-10-04 09:50:18 UTC ++++ cmake/compilers/GNU.cmake +@@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_ + 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 "(AMD64|amd64|i.86|x86)") + 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() + |