CVS commit: pkgsrc/parallel/threadingbuildingblocks

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 16 17:09:50 UTC 2022

Modified Files:
        pkgsrc/parallel/threadingbuildingblocks: Makefile distinfo
Added Files:
        pkgsrc/parallel/threadingbuildingblocks/patches:
            patch-test_tbb_test__composite__node.cpp

Log Message:
threadingbuildingblocks: Portability fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/parallel/threadingbuildingblocks/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/parallel/threadingbuildingblocks/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/parallel/threadingbuildingblocks/patches/patch-test_tbb_test__composite__node.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/threadingbuildingblocks/Makefile
diff -u pkgsrc/parallel/threadingbuildingblocks/Makefile:1.11 pkgsrc/parallel/threadingbuildingblocks/Makefile:1.12
--- pkgsrc/parallel/threadingbuildingblocks/Makefile:1.11       Fri Sep 10 12:08:51 2021
+++ pkgsrc/parallel/threadingbuildingblocks/Makefile    Mon May 16 17:09:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/09/10 12:08:51 nia Exp $
+# $NetBSD: Makefile,v 1.12 2022/05/16 17:09:50 jperkin Exp $
 
 DISTNAME=      oneTBB-2021.3.0
 PKGNAME=       ${DISTNAME:S/oneTBB-/threadingbuildingblocks-/}
@@ -17,6 +17,10 @@ USE_LANGUAGES=       c c++11
 CMAKE_ARGS+=   -DTBB_STRICT=OFF
 TEST_TARGET=   test
 
+BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/src/tbb/def/lin64-tbb.def
+BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/src/tbbmalloc/def/lin64-tbbmalloc.def
+BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/src/tbbmalloc_proxy/def/lin64-proxy.def
+
 .include "../../mk/atomic64.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/parallel/threadingbuildingblocks/distinfo
diff -u pkgsrc/parallel/threadingbuildingblocks/distinfo:1.10 pkgsrc/parallel/threadingbuildingblocks/distinfo:1.11
--- pkgsrc/parallel/threadingbuildingblocks/distinfo:1.10       Tue Oct 26 11:10:38 2021
+++ pkgsrc/parallel/threadingbuildingblocks/distinfo    Mon May 16 17:09:50 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:10:38 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/05/16 17:09:50 jperkin Exp $
 
 BLAKE2s (oneTBB-2021.3.0.tar.gz) = d6d10b35108642bfba06cd85a1d6628affb59aac7951d97f6e7a9b387b1aa172
 SHA512 (oneTBB-2021.3.0.tar.gz) = 969bc8d1dcf50bd12f70633d0319e46308eb1667cdc6f0503b373a35dcb2fe6b2adf59c26bd3c8e2a99a8d2d8b9f64088db5a43e784218b163b3661d12908c0e
 Size (oneTBB-2021.3.0.tar.gz) = 1651329 bytes
 SHA1 (patch-cmake_compilers_Clang.cmake) = e61f17d9df4dd06b2c42a6e450fdc3a452b10516
 SHA1 (patch-cmake_compilers_GNU.cmake) = c52042af12a3f90822a70ba6ec0e943deeb24eb7
+SHA1 (patch-test_tbb_test__composite__node.cpp) = 1c48644e8cbee6622e2cf4a91901db217cee2ff3

Added files:

Index: pkgsrc/parallel/threadingbuildingblocks/patches/patch-test_tbb_test__composite__node.cpp
diff -u /dev/null pkgsrc/parallel/threadingbuildingblocks/patches/patch-test_tbb_test__composite__node.cpp:1.1
--- /dev/null   Mon May 16 17:09:50 2022
+++ pkgsrc/parallel/threadingbuildingblocks/patches/patch-test_tbb_test__composite__node.cpp    Mon May 16 17:09:50 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-test_tbb_test__composite__node.cpp,v 1.1 2022/05/16 17:09:50 jperkin Exp $
+
+Avoid ambiguous function call.
+
+--- test/tbb/test_composite_node.cpp.orig      2021-06-30 08:19:55.000000000 +0000
++++ test/tbb/test_composite_node.cpp
+@@ -30,6 +30,7 @@
+ #include <cmath>
+ #include <vector>
+ 
++using std::pow;
+ 
+ //! \file test_composite_node.cpp
+ //! \brief Test for [flow_graph.composite_node] specification