diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile index 1df4ea2a757b..452adf84091a 100644 --- a/devel/onetbb/Makefile +++ b/devel/onetbb/Makefile @@ -1,50 +1,46 @@ PORTNAME= onetbb PORTVERSION= 2021.6.0 DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= martymac@FreeBSD.org COMMENT= Library that provides thread building blocks WWW= https://software.intel.com/oneapi/onetbb LICENSE= APACHE20 LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 USES= cmake compiler:c++11-lang tar:tgz CMAKE_ARGS+= -DTBB_STRICT:BOOL=FALSE \ -DCMAKE_INSTALL_DOCDIR:PATH="${DOCSDIR}" \ -DCMAKE_HWLOC_2_LIBRARY_PATH:PATH="${LOCALBASE}/lib/libhwloc.so" \ -DCMAKE_HWLOC_2_INCLUDE_PATH:PATH="${LOCALBASE}/include" CONFLICTS= tbb USE_GITHUB= yes GH_ACCOUNT= oneapi-src GH_PROJECT= oneTBB USE_LDCONFIG= yes PORTDOCS= README.md OPTIONS_DEFINE= DOCS # Pkgconfig: tbb.pc (on 64bit arch) vs tbb32.pc PLIST_SUB= PCSUFX="${PCSUFX}" .include .if ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH:Marmv?} PCSUFX= 32 .endif -.if ${ARCH} == riscv64 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_tbb_tools__api_ittnotify__config.h -.endif - .if ${ARCH} == powerpc64 CMAKE_ARGS+= -DTBB_ENABLE_IPO:BOOL=OFF .endif .include 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 deleted file mode 100644 index 17105704d4cf..000000000000 --- a/devel/onetbb/files/extra-patch-src_tbb_tools__api_ittnotify__config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 */ -