From nobody Tue Oct 12 14:08:26 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5FC4317F1616; Tue, 12 Oct 2021 14:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HTHZL21VRz4mW3; Tue, 12 Oct 2021 14:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2514615A63; Tue, 12 Oct 2021 14:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19CE8QMP016382; Tue, 12 Oct 2021 14:08:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19CE8Q87016381; Tue, 12 Oct 2021 14:08:26 GMT (envelope-from git) Date: Tue, 12 Oct 2021 14:08:26 GMT Message-Id: <202110121408.19CE8Q87016381@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 5d7ca4100448 - main - devel/onetbb: Fix build on 13-STABLE and 14-CURRENT (i386) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d7ca410044831cf4cbfb639fdead1feb9a69e3b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d7ca410044831cf4cbfb639fdead1feb9a69e3b commit 5d7ca410044831cf4cbfb639fdead1feb9a69e3b Author: Ganael LAPLANCHE AuthorDate: 2021-10-12 14:07:13 +0000 Commit: Ganael LAPLANCHE CommitDate: 2021-10-12 14:08:07 +0000 devel/onetbb: Fix build on 13-STABLE and 14-CURRENT (i386) --- devel/onetbb/files/patch-cmake-compilers-Clang.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/devel/onetbb/files/patch-cmake-compilers-Clang.cmake b/devel/onetbb/files/patch-cmake-compilers-Clang.cmake index bf6019201e2c..59fd4f11702b 100644 --- a/devel/onetbb/files/patch-cmake-compilers-Clang.cmake +++ b/devel/onetbb/files/patch-cmake-compilers-Clang.cmake @@ -1,4 +1,6 @@ -Fix amd64 build for 13-STABLE and 14-CURRENT (clang >= 12.0.1) +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 @@ -7,7 +9,7 @@ Fix amd64 build for 13-STABLE and 14-CURRENT (clang >= 12.0.1) # 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)") ++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|amd64|i.86)") set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$>:-mwaitpkg>) endif()