Date: Fri, 15 Oct 2021 10:45:39 GMT From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b48234c57a70 - main - devel/onetbb: Rework last patch to mark upstream integration Message-ID: <202110151045.19FAjdUV033715@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=b48234c57a70425542de9b306a4f2b1afc72f727 commit b48234c57a70425542de9b306a4f2b1afc72f727 Author: Ganael LAPLANCHE <martymac@FreeBSD.org> AuthorDate: 2021-10-15 10:44:53 +0000 Commit: Ganael LAPLANCHE <martymac@FreeBSD.org> CommitDate: 2021-10-15 10:45:30 +0000 devel/onetbb: Rework last patch to mark upstream integration --- .../onetbb/files/patch-cmake-compilers-Clang.cmake | 15 ------------- 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() +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110151045.19FAjdUV033715>