From nobody Fri Oct 15 10:45:39 2021 X-Original-To: dev-commits-ports-main@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 5D568180F17A; Fri, 15 Oct 2021 10:45:40 +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 4HW2x020H9z3QFx; Fri, 15 Oct 2021 10:45:40 +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 115E524F77; Fri, 15 Oct 2021 10:45:40 +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 19FAjdtF033716; Fri, 15 Oct 2021 10:45:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19FAjdUV033715; Fri, 15 Oct 2021 10:45:39 GMT (envelope-from git) Date: Fri, 15 Oct 2021 10:45:39 GMT Message-Id: <202110151045.19FAjdUV033715@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: b48234c57a70 - main - devel/onetbb: Rework last patch to mark upstream integration List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: b48234c57a70425542de9b306a4f2b1afc72f727 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=b48234c57a70425542de9b306a4f2b1afc72f727 commit b48234c57a70425542de9b306a4f2b1afc72f727 Author: Ganael LAPLANCHE AuthorDate: 2021-10-15 10:44:53 +0000 Commit: Ganael LAPLANCHE 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 $<$>:-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 $<$>:-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 $<$>,$>>:-mwaitpkg>) + endif() +