Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Jun 2021 20:38:21 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 122b7f18900d - main - devel/onetbb: fix build on powerpc
Message-ID:  <202106302038.15UKcLkq038761@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=122b7f18900dabd78759760b67f3573763ea9afe

commit 122b7f18900dabd78759760b67f3573763ea9afe
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-06-30 20:37:54 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
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 <bsd.port.pre.mk>
 
+.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 */
+ 



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