From owner-dev-commits-ports-main@freebsd.org Wed Jun 30 20:38:21 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BB11364C3F6; Wed, 30 Jun 2021 20:38:21 +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 4GFY8F4H0fz3tFq; Wed, 30 Jun 2021 20:38:21 +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 51CC4138CA; Wed, 30 Jun 2021 20:38:21 +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 15UKcLop038762; Wed, 30 Jun 2021 20:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15UKcLkq038761; Wed, 30 Jun 2021 20:38:21 GMT (envelope-from git) Date: Wed, 30 Jun 2021 20:38:21 GMT Message-Id: <202106302038.15UKcLkq038761@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 122b7f18900d - main - devel/onetbb: fix build on powerpc MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 122b7f18900dabd78759760b67f3573763ea9afe Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2021 20:38:21 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=122b7f18900dabd78759760b67f3573763ea9afe commit 122b7f18900dabd78759760b67f3573763ea9afe Author: Piotr Kubaj AuthorDate: 2021-06-30 20:37:54 +0000 Commit: Piotr Kubaj CommitDate: 2021-06-30 20:37:54 +0000 devel/onetbb: fix build on powerpc /wrkdirs/usr/ports/devel/onetbb/work/oneTBB-2021.2.0/src/tbb/tools_api/ittnotify_config.h:338:12: error: use of undeclared identifier '__TBB_machine_fetchadd4' return __TBB_machine_fetchadd4(ptr, 1) + 1L; Patch taken from https://github.com/oneapi-src/oneTBB/issues/186. --- devel/onetbb/Makefile | 4 ++++ .../files/extra-patch-src_tbb_tools__api_ittnotify__config.h | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile index 5cda501074da..f98ec6f87bdd 100644 --- a/devel/onetbb/Makefile +++ b/devel/onetbb/Makefile @@ -39,6 +39,10 @@ OPTIONS_DEFINE= DOCS .include +.if ${ARCH} == powerpc +EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_tbb_tools__api_ittnotify__config.h +.endif + post-install: ${INSTALL_DATA} ${WRKDIR}/onetbb.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig diff --git a/devel/onetbb/files/extra-patch-src_tbb_tools__api_ittnotify__config.h b/devel/onetbb/files/extra-patch-src_tbb_tools__api_ittnotify__config.h new file mode 100644 index 000000000000..17105704d4cf --- /dev/null +++ b/devel/onetbb/files/extra-patch-src_tbb_tools__api_ittnotify__config.h @@ -0,0 +1,11 @@ +--- src/tbb/tools_api/ittnotify_config.h.orig 2021-06-30 18:42:09 UTC ++++ src/tbb/tools_api/ittnotify_config.h +@@ -335,7 +335,7 @@ ITT_INLINE long + __itt_interlocked_increment(volatile long* ptr) ITT_INLINE_ATTRIBUTE; + ITT_INLINE long __itt_interlocked_increment(volatile long* ptr) + { +- return __TBB_machine_fetchadd4(ptr, 1) + 1L; ++ return __atomic_fetch_add(ptr, 1L, __ATOMIC_SEQ_CST) + 1L; + } + #endif /* ITT_SIMPLE_INIT */ +