From nobody Sun Oct 10 15:13:22 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1471D17EA5DF; Sun, 10 Oct 2021 15:13:23 +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 4HS56B70SGz4xnJ; Sun, 10 Oct 2021 15:13:22 +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 D13F27F36; Sun, 10 Oct 2021 15:13:22 +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 19AFDMxG069336; Sun, 10 Oct 2021 15:13:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19AFDMpI069335; Sun, 10 Oct 2021 15:13:22 GMT (envelope-from git) Date: Sun, 10 Oct 2021 15:13:22 GMT Message-Id: <202110101513.19AFDMpI069335@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 036bda781b0b - main - devel/onetbb: Update to 2021.4.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 036bda781b0b170e823e3cacc14f25e2bd9c2b3a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=036bda781b0b170e823e3cacc14f25e2bd9c2b3a commit 036bda781b0b170e823e3cacc14f25e2bd9c2b3a Author: Ganael LAPLANCHE AuthorDate: 2021-10-10 15:11:27 +0000 Commit: Ganael LAPLANCHE CommitDate: 2021-10-10 15:11:27 +0000 devel/onetbb: Update to 2021.4.0 Release notes: https://software.intel.com/content/www/us/en/develop/articles/intel-oneapi-threading-building-blocks-release-notes.html --- cad/PrusaSlicer/Makefile | 1 + devel/onetbb/Makefile | 13 ++++++--- devel/onetbb/distinfo | 6 ++--- .../onetbb/files/patch-src_tbbmalloc_frontend.cpp | 30 --------------------- .../patch-test-common-utils_concurrency_limit.h | 31 +++++++++++++--------- ...patch-test-tbbmalloc-test_malloc_compliance.cpp | 13 --------- devel/onetbb/pkg-plist | 19 ++++++++----- graphics/blender-lts28/Makefile | 2 +- graphics/blender/Makefile | 2 +- graphics/embree/Makefile | 1 + graphics/oidn/Makefile | 2 +- graphics/openimageio/Makefile | 2 +- math/curv/Makefile | 1 + math/dune-alugrid/Makefile | 1 + math/dune-common/Makefile | 1 + math/dune-fem/Makefile | 1 + math/dune-geometry/Makefile | 1 + math/dune-grid-glue/Makefile | 1 + math/dune-grid/Makefile | 1 + math/dune-pdelab/Makefile | 1 + math/dune-polygongrid/Makefile | 1 + math/dune-uggrid/Makefile | 1 + math/dune-vtk/Makefile | 1 + math/heyoka/Makefile | 1 + math/obake/Makefile | 2 +- math/openturns/Makefile | 2 +- misc/ngraph/Makefile | 2 +- misc/openvdb/Makefile | 2 +- science/opensph/Makefile | 2 +- science/pagmo2/Makefile | 2 +- 30 files changed, 67 insertions(+), 79 deletions(-) diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index b153978d4f01..c1289ac3badc 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -1,6 +1,7 @@ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.3.3 +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= teodorsigaev@gmail.com diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile index 578bec315771..c24dba9c5909 100644 --- a/devel/onetbb/Makefile +++ b/devel/onetbb/Makefile @@ -1,7 +1,7 @@ # Created by: Arun Sharma PORTNAME= onetbb -PORTVERSION= 2021.3.0 +PORTVERSION= 2021.4.0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -16,8 +16,8 @@ USES= cmake compiler:c++11-lang tar:tgz CMAKE_ARGS+= -DTBB_STRICT:BOOL=FALSE \ -DCMAKE_INSTALL_DOCDIR:PATH="${DOCSDIR}" \ - -DCMAKE_HWLOC_2_4_LIBRARY_PATH:PATH="${LOCALBASE}/lib/libhwloc.so" \ - -DCMAKE_HWLOC_2_4_INCLUDE_PATH:PATH="${LOCALBASE}/include" + -DCMAKE_HWLOC_2_LIBRARY_PATH:PATH="${LOCALBASE}/lib/libhwloc.so" \ + -DCMAKE_HWLOC_2_INCLUDE_PATH:PATH="${LOCALBASE}/include" CONFLICTS= tbb-[0-9]* @@ -31,8 +31,15 @@ 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 +PCSUFX= 32 +.endif + .if ${ARCH} == powerpc || ${ARCH} == riscv64 EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_tbb_tools__api_ittnotify__config.h .endif diff --git a/devel/onetbb/distinfo b/devel/onetbb/distinfo index b362736545bd..ce939a2ff2f6 100644 --- a/devel/onetbb/distinfo +++ b/devel/onetbb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626043027 -SHA256 (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e -SIZE (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 1651329 +TIMESTAMP = 1633466066 +SHA256 (oneapi-src-oneTBB-v2021.4.0_GH0.tar.gz) = 021796c7845e155e616f5ecda16daa606ebb4c6f90b996e5c08aebab7a8d3de3 +SIZE (oneapi-src-oneTBB-v2021.4.0_GH0.tar.gz) = 2452533 diff --git a/devel/onetbb/files/patch-src_tbbmalloc_frontend.cpp b/devel/onetbb/files/patch-src_tbbmalloc_frontend.cpp deleted file mode 100644 index 314267054456..000000000000 --- a/devel/onetbb/files/patch-src_tbbmalloc_frontend.cpp +++ /dev/null @@ -1,30 +0,0 @@ -Backport fa944e19600500863507ed8e9b1f5a30037d9df6 - ---- src/tbbmalloc/frontend.cpp.orig 2021-06-30 08:19:55 UTC -+++ src/tbbmalloc/frontend.cpp -@@ -802,21 +802,15 @@ static inline unsigned int highestBitPos(unsigned int - return pos; - } - -- --#if __TBB_x86_32 || __aarch32__ - unsigned int getSmallObjectIndex(unsigned int size) - { -- return (size-1)>>3; --} --#elif __TBB_x86_64 || __aarch64__ --unsigned int getSmallObjectIndex(unsigned int size) --{ -- // For 64-bit malloc, 16 byte alignment is needed except for bin 0. - unsigned int result = (size-1)>>3; -- if (result) result |= 1; // 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes -+ if (sizeof(void*)==8) { -+ // For 64-bit malloc, 16 byte alignment is needed except for bin 0. -+ if (result) result |= 1; // 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes -+ } - return result; - } --#endif // __TBB_x86_32 || __aarch32__ - - /* - * Depending on indexRequest, for a given size return either the index into the bin diff --git a/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h b/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h index 78edd61fe7d8..945060970e53 100644 --- a/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h +++ b/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h @@ -1,16 +1,21 @@ -Backport edc39b844a483b69c39c64a136c4d62342884892 and 5c5d500d4fd502baed5176a19306e70c72d9c4e4 +Fix build on FreeBSD ---- test/common/utils_concurrency_limit.h.orig 2021-06-30 08:19:55 UTC +__unix__ is defined on FreeBSD and makes #elif __FreeBSD__ section skipped + +--- test/common/utils_concurrency_limit.h.orig 2021-10-04 09:50:18 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__) +@@ -37,12 +37,11 @@ + #endif + #include + #include +-#elif __FreeBSD__ +-#include ++#if __FreeBSD__ + #include +-#include + #include + #include ++#endif + #endif + #include - #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 deleted file mode 100644 index 0773770d4ab3..000000000000 --- a/devel/onetbb/files/patch-test-tbbmalloc-test_malloc_compliance.cpp +++ /dev/null @@ -1,13 +0,0 @@ -Backport b2b2a9d65b30b869962de8140a44f5b29a3072fd - ---- 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 && static_cast(limit)