From nobody Thu Jan 06 11:09:23 2022 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 3648B193389E; Thu, 6 Jan 2022 11:09:24 +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 4JV3X36cPtz3p3m; Thu, 6 Jan 2022 11:09:23 +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 C365C1EACD; Thu, 6 Jan 2022 11:09:23 +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 206B9Nxv012276; Thu, 6 Jan 2022 11:09:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206B9N6U012275; Thu, 6 Jan 2022 11:09:23 GMT (envelope-from git) Date: Thu, 6 Jan 2022 11:09:23 GMT Message-Id: <202201061109.206B9N6U012275@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: 3795217cddca - main - devel/onetbb: Fix build on 13-STABLE and 14-CURRENT 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: 3795217cddcafe46ed5592be3fc7ea3b9d0a54f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641467363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPLP0jbIN8mwjy+F0vc9JAB6ZVgD3EQop+PR8hnnZx0=; b=YtJ2QN4BS4AxhIYxlLrinrCJ/4D+fKaVw7vYKUnEcxZcgxiYf3AsiyejDwCGo63Av65Z4R 7ZZc+NoBV92CpPLeT5g2LMOlTsF4gUuT+8dv7pj79YhKINJqIqit0CY9iIGg478Wh27koq ksqhmmo+iLta+TnYhNB4Dzxq8miluJi3K5mHGc3R+nxEUI842KQt9Y286UqxIyF38z8l44 cDCdZAXX+s3c3Dc6h4VOvnkt+IhmSw7ghb8S6218OcVoh2TkfQCPhR7i7+ZLaFPR7WXyiz k4UqYTt9bVZ8CN8hu7uMSAwKPeo5Qw14fy0O/o738vAgofncbuj9aSxhdZPBFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641467363; a=rsa-sha256; cv=none; b=W5MNA1UpuU7QRwurLXnxO1DvXPBFwS6NnKbf6McSeVGbWuJqY+D92BDhfa5lNG/qyCY2k9 +dIooTssb016t8C4fTiqREHjlaWK3MDEBR0IpEJT72XoO+h7lsC/P1ZfNQ1k9J02rn+x6P y28KQrIe9fZ/lwzm8DZBeeugJ0+2wTcBrQZ9TSvLYI3TJxip/eY78Jc5IbljwFZzvIj0Vw eRc2sNChSwjYgqaCrN1CGDxuIbUvRRIEYYtjsseZ1rMlbphe+aB6Fu21IsmkZgT5ODW9m2 lwinr5zqYWalSplaUxxUFn+QwoG+s/2OBMWZ37Bxml1Rmv4gvq4C7sYvBq5u0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=3795217cddcafe46ed5592be3fc7ea3b9d0a54f2 commit 3795217cddcafe46ed5592be3fc7ea3b9d0a54f2 Author: Ganael LAPLANCHE AuthorDate: 2022-01-06 11:07:13 +0000 Commit: Ganael LAPLANCHE 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 $<$>:-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() +