From 0da9b8bd43709541d0a7eba2d5e3dcc11b420650 Mon Sep 17 00:00:00 2001 From: Ganael LAPLANCHE Date: Fri, 9 Jul 2021 13:05:19 +0200 Subject: devel/onetbb: Update to 2021.3.0 Release notes: https://software.intel.com/content/www/us/en/develop/articles/intel-oneapi-threading-building-blocks-release-notes.html --- devel/onetbb/Makefile | 11 +---------- devel/onetbb/distinfo | 6 +++--- devel/onetbb/files/onetbb.pc.in | 10 ---------- devel/onetbb/files/patch-test-common-memory_usage.h | 12 ------------ .../files/patch-test-common-utils_concurrency_limit.h | 16 ++++++++++++++++ .../patch-test-tbbmalloc-test_malloc_compliance.cpp | 6 +++--- devel/onetbb/pkg-plist | 15 ++++++++++----- 7 files changed, 33 insertions(+), 43 deletions(-) delete mode 100644 devel/onetbb/files/onetbb.pc.in delete mode 100644 devel/onetbb/files/patch-test-common-memory_usage.h create mode 100644 devel/onetbb/files/patch-test-common-utils_concurrency_limit.h (limited to 'devel/onetbb') diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile index 92c35b3cfe62..578bec315771 100644 --- a/devel/onetbb/Makefile +++ b/devel/onetbb/Makefile @@ -1,7 +1,7 @@ # Created by: Arun Sharma PORTNAME= onetbb -PORTVERSION= 2021.2.0 +PORTVERSION= 2021.3.0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -25,12 +25,6 @@ USE_GITHUB= yes GH_ACCOUNT= oneapi-src GH_PROJECT= oneTBB -SUB_FILES= onetbb.pc -SUB_LIST= prefix="${PREFIX}" \ - name="${PORTNAME}" \ - description="${COMMENT}" \ - version="${PORTVERSION}" - USE_LDCONFIG= yes PORTDOCS= README.md @@ -43,7 +37,4 @@ OPTIONS_DEFINE= DOCS EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_tbb_tools__api_ittnotify__config.h .endif -post-install: - ${INSTALL_DATA} ${WRKDIR}/onetbb.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig - .include diff --git a/devel/onetbb/distinfo b/devel/onetbb/distinfo index d59b54391657..8ac070e78dbe 100644 --- a/devel/onetbb/distinfo +++ b/devel/onetbb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617819323 -SHA256 (oneapi-src-oneTBB-v2021.2.0_GH0.tar.gz) = cee20b0a71d977416f3e3b4ec643ee4f38cedeb2a9ff015303431dd9d8d79854 -SIZE (oneapi-src-oneTBB-v2021.2.0_GH0.tar.gz) = 1606919 +TIMESTAMP = 1625085505 +SHA256 (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e +SIZE (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 1651329 diff --git a/devel/onetbb/files/onetbb.pc.in b/devel/onetbb/files/onetbb.pc.in deleted file mode 100644 index 3a229fe83b6c..000000000000 --- a/devel/onetbb/files/onetbb.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=%%prefix%% -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: %%name%% -Description: %%description%% -Version: %%version%% -Libs: -L${libdir} -ltbb -Cflags: -I${includedir} diff --git a/devel/onetbb/files/patch-test-common-memory_usage.h b/devel/onetbb/files/patch-test-common-memory_usage.h deleted file mode 100644 index c1813d83c17a..000000000000 --- a/devel/onetbb/files/patch-test-common-memory_usage.h +++ /dev/null @@ -1,12 +0,0 @@ ---- test/common/memory_usage.h.orig 2020-12-08 11:00:57 UTC -+++ test/common/memory_usage.h -@@ -119,7 +119,8 @@ namespace utils { - ASSERT(status == KERN_SUCCESS, NULL); - return info.virtual_size - shared_size; - #else -- return 0; -+ // Use stat var to work around unused parameter error -+ return stat == currentUsage ? 0 : 0; - #endif - } - diff --git a/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h b/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h new file mode 100644 index 000000000000..78edd61fe7d8 --- /dev/null +++ b/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h @@ -0,0 +1,16 @@ +Backport edc39b844a483b69c39c64a136c4d62342884892 and 5c5d500d4fd502baed5176a19306e70c72d9c4e4 + +--- test/common/utils_concurrency_limit.h.orig 2021-06-30 08:19:55 UTC ++++ test/common/utils_concurrency_limit.h +@@ -166,9 +166,10 @@ int limit_number_of_threads( int max_threads ) { + + #endif // __TBB_TEST_SKIP_AFFINITY + +-#define OS_AFFINITY_SYSCALL_PRESENT ((__linux__ && !__ANDROID__) || (__FreeBSD_version >= 701000)) ++#define OS_AFFINITY_SYSCALL_PRESENT (__linux__ && !__ANDROID__) + + #if OS_AFFINITY_SYSCALL_PRESENT ++ + void get_thread_affinity_mask(std::size_t& ncpus, std::vector& free_indexes) { + cpu_set_t* mask = nullptr; + ncpus = sizeof(cpu_set_t) * CHAR_BIT; diff --git a/devel/onetbb/files/patch-test-tbbmalloc-test_malloc_compliance.cpp b/devel/onetbb/files/patch-test-tbbmalloc-test_malloc_compliance.cpp index 893228604321..0773770d4ab3 100644 --- a/devel/onetbb/files/patch-test-tbbmalloc-test_malloc_compliance.cpp +++ b/devel/onetbb/files/patch-test-tbbmalloc-test_malloc_compliance.cpp @@ -1,13 +1,13 @@ -error: comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'rlim_t' (aka 'long') +Backport b2b2a9d65b30b869962de8140a44f5b29a3072fd ---- test/tbbmalloc/test_malloc_compliance.cpp.orig 2020-12-08 11:00:57 UTC +--- test/tbbmalloc/test_malloc_compliance.cpp.orig 2021-06-30 08:19:55 UTC +++ test/tbbmalloc/test_malloc_compliance.cpp @@ -91,7 +91,7 @@ void limitMem( size_t limit ) } if (rlim.rlim_max==(rlim_t)RLIM_INFINITY) rlim.rlim_cur = (limit > 0) ? limit*MByte : rlim.rlim_max; - else rlim.rlim_cur = (limit > 0 && limit 0 && limit<(size_t)rlim.rlim_max) ? limit*MByte : rlim.rlim_max; ++ else rlim.rlim_cur = (limit > 0 && static_cast(limit)