git: 3795217cddca - main - devel/onetbb: Fix build on 13-STABLE and 14-CURRENT
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 06 Jan 2022 11:09:23 UTC
The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=3795217cddcafe46ed5592be3fc7ea3b9d0a54f2 commit 3795217cddcafe46ed5592be3fc7ea3b9d0a54f2 Author: Ganael LAPLANCHE <martymac@FreeBSD.org> AuthorDate: 2022-01-06 11:07:13 +0000 Commit: Ganael LAPLANCHE <martymac@FreeBSD.org> CommitDate: 2022-01-06 11:09:12 +0000 devel/onetbb: Fix build on 13-STABLE and 14-CURRENT by reviving a patch not yet included in release and erroneously removed in previous update. Reported by: alexvpetrov@gmail.com (via ports@) --- devel/onetbb/files/patch-cmake-compilers-xxx.cmake | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) 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() +