diff options
Diffstat (limited to 'devel/onetbb')
| -rw-r--r-- | devel/onetbb/Makefile | 29 | ||||
| -rw-r--r-- | devel/onetbb/distinfo | 6 | ||||
| -rw-r--r-- | devel/onetbb/files/patch-cmake_compilers_Clang.cmake | 11 | ||||
| -rw-r--r-- | devel/onetbb/pkg-plist | 12 |
4 files changed, 33 insertions, 25 deletions
diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile index 31d66ef1ab35..abc17cb386e8 100644 --- a/devel/onetbb/Makefile +++ b/devel/onetbb/Makefile @@ -1,5 +1,5 @@ PORTNAME= onetbb -PORTVERSION= 2022.1.0 +PORTVERSION= 2022.2.0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -9,14 +9,16 @@ WWW= https://software.intel.com/oneapi/onetbb LICENSE= APACHE20 -LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 +LIB_DEPENDS= libhwloc.so:devel/hwloc2 -USES= cmake compiler:c++11-lang pathfix tar:tgz +USES= cmake compiler:c++11-lang localbase pathfix pkgconfig tar:tgz +USE_GITHUB= yes +GH_ACCOUNT= uxlfoundation +GH_PROJECT= oneTBB +USE_LDCONFIG= yes -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" +CMAKE_ARGS+= -DCMAKE_INSTALL_DOCDIR:PATH="${DOCSDIR}" \ + -DTBB_STRICT:BOOL=FALSE # Many symbols in the linker version scripts are undefined because link time # optimization (-flto=thin) removes them. Suppress errors with lld >= 17 due to @@ -25,19 +27,14 @@ LDFLAGS+= -Wl,--undefined-version CONFLICTS= tbb -USE_GITHUB= yes -GH_ACCOUNT= uxlfoundation -GH_PROJECT= oneTBB - -USE_LDCONFIG= yes +# Pkgconfig: tbb.pc (on 64bit arch) vs tbb32.pc +PLIST_SUB= DBGSUFX="${DBGSUFX}" \ + PCSUFX="${PCSUFX}" PORTDOCS= README.md OPTIONS_DEFINE= DOCS -# Pkgconfig: tbb.pc (on 64bit arch) vs tbb32.pc -PLIST_SUB= PCSUFX="${PCSUFX}" DBGSUFX="${DBGSUFX}" - .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -45,6 +42,6 @@ DBGSUFX= _debug .endif .if ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH:Marmv?} -PCSUFX= 32 +PCSUFX= 32 .endif .include <bsd.port.post.mk> diff --git a/devel/onetbb/distinfo b/devel/onetbb/distinfo index 362d3c7895a8..65718a1dcb16 100644 --- a/devel/onetbb/distinfo +++ b/devel/onetbb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743446651 -SHA256 (uxlfoundation-oneTBB-v2022.1.0_GH0.tar.gz) = ed067603ece0dc832d2881ba5c516625ac2522c665d95f767ef6304e34f961b5 -SIZE (uxlfoundation-oneTBB-v2022.1.0_GH0.tar.gz) = 3434602 +TIMESTAMP = 1751298824 +SHA256 (uxlfoundation-oneTBB-v2022.2.0_GH0.tar.gz) = f0f78001c8c8edb4bddc3d4c5ee7428d56ae313254158ad1eec49eced57f6a5b +SIZE (uxlfoundation-oneTBB-v2022.2.0_GH0.tar.gz) = 4244148 diff --git a/devel/onetbb/files/patch-cmake_compilers_Clang.cmake b/devel/onetbb/files/patch-cmake_compilers_Clang.cmake new file mode 100644 index 000000000000..d0b891075a28 --- /dev/null +++ b/devel/onetbb/files/patch-cmake_compilers_Clang.cmake @@ -0,0 +1,11 @@ +--- cmake/compilers/Clang.cmake.orig 2025-07-17 17:44:20 UTC ++++ cmake/compilers/Clang.cmake +@@ -65,7 +65,7 @@ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAG + # Clang flags to prevent compiler from optimizing out security checks + set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security -fPIC $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:-fstack-protector-strong>) + +-if (NOT APPLE AND NOT ANDROID_PLATFORM AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") ++if (NOT APPLE AND NOT ANDROID_PLATFORM AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc") + set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} -fstack-clash-protection $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:-fcf-protection=full>) + endif() + diff --git a/devel/onetbb/pkg-plist b/devel/onetbb/pkg-plist index 867e4b68becd..81bea3c7ad02 100644 --- a/devel/onetbb/pkg-plist +++ b/devel/onetbb/pkg-plist @@ -148,14 +148,14 @@ lib/cmake/TBB/TBBTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/TBB/TBBTargets.cmake lib/libtbb%%DBGSUFX%%.so lib/libtbb%%DBGSUFX%%.so.12 -lib/libtbb%%DBGSUFX%%.so.12.15 -lib/libtbbbind_2_0%%DBGSUFX%%.so -lib/libtbbbind_2_0%%DBGSUFX%%.so.3 -lib/libtbbbind_2_0%%DBGSUFX%%.so.3.15 +lib/libtbb%%DBGSUFX%%.so.12.16 +lib/libtbbbind_2_5%%DBGSUFX%%.so +lib/libtbbbind_2_5%%DBGSUFX%%.so.3 +lib/libtbbbind_2_5%%DBGSUFX%%.so.3.16 lib/libtbbmalloc%%DBGSUFX%%.so lib/libtbbmalloc%%DBGSUFX%%.so.2 -lib/libtbbmalloc%%DBGSUFX%%.so.2.15 +lib/libtbbmalloc%%DBGSUFX%%.so.2.16 lib/libtbbmalloc_proxy%%DBGSUFX%%.so lib/libtbbmalloc_proxy%%DBGSUFX%%.so.2 -lib/libtbbmalloc_proxy%%DBGSUFX%%.so.2.15 +lib/libtbbmalloc_proxy%%DBGSUFX%%.so.2.16 libdata/pkgconfig/tbb%%PCSUFX%%.pc |