aboutsummaryrefslogtreecommitdiff
path: root/devel/onetbb
diff options
context:
space:
mode:
authorGanael LAPLANCHE <martymac@FreeBSD.org>2021-04-14 10:08:05 +0000
committerGanael LAPLANCHE <martymac@FreeBSD.org>2021-04-14 10:08:05 +0000
commit9ee84848094757a07a41aefc97967e6ae1a43039 (patch)
treea7020d5bb92b4bc8dfd71e340871902d3d6ca8b6 /devel/onetbb
parent5faecf6d8ffe6c47b27ffd690083e2877569889e (diff)
downloadports-9ee84848094757a07a41aefc97967e6ae1a43039.tar.gz
ports-9ee84848094757a07a41aefc97967e6ae1a43039.zip
devel/onetbb: Update to 2021.2.0 and bump dependencies
Diffstat (limited to 'devel/onetbb')
-rw-r--r--devel/onetbb/Makefile11
-rw-r--r--devel/onetbb/distinfo6
-rw-r--r--devel/onetbb/files/patch-src-tbbbind-CMakeLists.txt11
-rw-r--r--devel/onetbb/pkg-plist12
4 files changed, 18 insertions, 22 deletions
diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile
index fe9f09c88155..5cda501074da 100644
--- a/devel/onetbb/Makefile
+++ b/devel/onetbb/Makefile
@@ -1,7 +1,7 @@
# Created by: Arun Sharma <arun@sharma-home.net>
PORTNAME= onetbb
-PORTVERSION= 2021.1.1
+PORTVERSION= 2021.2.0
DISTVERSIONPREFIX= v
CATEGORIES= devel
@@ -14,7 +14,10 @@ LIB_DEPENDS= libhwloc.so.15:devel/hwloc2
USES= cmake compiler:c++11-lang tar:tgz
-CMAKE_ARGS+= -DTBB_STRICT:BOOL=FALSE
+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"
CONFLICTS= tbb-[0-9]*
@@ -30,6 +33,10 @@ SUB_LIST= prefix="${PREFIX}" \
USE_LDCONFIG= yes
+PORTDOCS= README.md
+
+OPTIONS_DEFINE= DOCS
+
.include <bsd.port.pre.mk>
post-install:
diff --git a/devel/onetbb/distinfo b/devel/onetbb/distinfo
index b70c4947aeee..d59b54391657 100644
--- a/devel/onetbb/distinfo
+++ b/devel/onetbb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608578552
-SHA256 (oneapi-src-oneTBB-v2021.1.1_GH0.tar.gz) = b182c73caaaabc44ddc5ad13113aca7e453af73c1690e4061f71dfe4935d74e8
-SIZE (oneapi-src-oneTBB-v2021.1.1_GH0.tar.gz) = 1062960
+TIMESTAMP = 1617819323
+SHA256 (oneapi-src-oneTBB-v2021.2.0_GH0.tar.gz) = cee20b0a71d977416f3e3b4ec643ee4f38cedeb2a9ff015303431dd9d8d79854
+SIZE (oneapi-src-oneTBB-v2021.2.0_GH0.tar.gz) = 1606919
diff --git a/devel/onetbb/files/patch-src-tbbbind-CMakeLists.txt b/devel/onetbb/files/patch-src-tbbbind-CMakeLists.txt
deleted file mode 100644
index 58c11a42c43a..000000000000
--- a/devel/onetbb/files/patch-src-tbbbind-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Disable legacy hwloc lookup
-
---- src/tbbbind/CMakeLists.txt.orig 2020-12-08 11:00:57 UTC
-+++ src/tbbbind/CMakeLists.txt
-@@ -82,5 +82,5 @@ macro(tbbbind_build TBBBIND_NAME HWLOC_VERSION)
- endmacro()
-
- message(STATUS "Trying to find HWLOC (versions 2 and 1.11) to build TBBBind library")
--tbbbind_build(tbbbind 1.11)
-+#tbbbind_build(tbbbind 1.11)
- tbbbind_build(tbbbind_2_0 2)
diff --git a/devel/onetbb/pkg-plist b/devel/onetbb/pkg-plist
index 642e39c2a4a9..2f1601193448 100644
--- a/devel/onetbb/pkg-plist
+++ b/devel/onetbb/pkg-plist
@@ -133,14 +133,14 @@ lib/cmake/TBB/TBBTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/TBB/TBBTargets.cmake
lib/libtbb.so
lib/libtbb.so.12
-lib/libtbb.so.12.1
-lib/libtbbbind_2_0.so
-lib/libtbbbind_2_0.so.3
-lib/libtbbbind_2_0.so.3.1
+lib/libtbb.so.12.2
+lib/libtbbbind_2_4.so
+lib/libtbbbind_2_4.so.3
+lib/libtbbbind_2_4.so.3.2
lib/libtbbmalloc.so
lib/libtbbmalloc.so.2
-lib/libtbbmalloc.so.2.1
+lib/libtbbmalloc.so.2.2
lib/libtbbmalloc_proxy.so
lib/libtbbmalloc_proxy.so.2
-lib/libtbbmalloc_proxy.so.2.1
+lib/libtbbmalloc_proxy.so.2.2
libdata/pkgconfig/onetbb.pc