Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Oct 2021 14:34:04 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: be58a139c545 - main - devel/onetbb: Fix amd64 build for 13-STABLE and 14-CURRENT
Message-ID:  <202110111434.19BEY4bs035674@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=be58a139c5451153fe809c4c23e3184809786200

commit be58a139c5451153fe809c4c23e3184809786200
Author:     Ganael LAPLANCHE <martymac@FreeBSD.org>
AuthorDate: 2021-10-11 14:31:14 +0000
Commit:     Ganael LAPLANCHE <martymac@FreeBSD.org>
CommitDate: 2021-10-11 14:31:14 +0000

    devel/onetbb: Fix amd64 build for 13-STABLE and 14-CURRENT
    
    PR:             259051
    Reported by:    transitive@gmail.com
---
 devel/onetbb/files/patch-cmake-compilers-Clang.cmake | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/devel/onetbb/files/patch-cmake-compilers-Clang.cmake b/devel/onetbb/files/patch-cmake-compilers-Clang.cmake
new file mode 100644
index 000000000000..bf6019201e2c
--- /dev/null
+++ b/devel/onetbb/files/patch-cmake-compilers-Clang.cmake
@@ -0,0 +1,13 @@
+Fix amd64 build for 13-STABLE and 14-CURRENT (clang >= 12.0.1)
+
+--- 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)")
+     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
+ endif()
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110111434.19BEY4bs035674>