From f5d2f681ac7c68d913f59c7bf6e8aadafedd2def Mon Sep 17 00:00:00 2001 From: psykose Date: Sun, 9 Oct 2022 16:40:12 +0000 Subject: [PATCH] community/libtbb: upgrade to 2021.7.0 --- community/libtbb/APKBUILD | 6 ++++-- community/libtbb/musl-test.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 community/libtbb/musl-test.patch diff --git a/community/libtbb/APKBUILD b/community/libtbb/APKBUILD index f68687c1739..71f0e313fe2 100644 --- a/community/libtbb/APKBUILD +++ b/community/libtbb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: David Huffman # Maintainer: psykose pkgname=libtbb -pkgver=2021.6.0 +pkgver=2021.7.0 pkgrel=0 pkgdesc="oneAPI Threading Building Blocks" url="https://github.com/oneapi-src/oneTBB" @@ -21,6 +21,7 @@ subpackages="py3-tbb:_py3 $pkgname-dev $pkgname-doc" source="tbb-$pkgver.tar.gz::https://github.com/oneapi-src/oneTBB/archive/v$pkgver.tar.gz fix-underlinking.patch fix-pthread-create.patch + musl-test.patch tbb.pc tbbmalloc.pc tbbmalloc_proxy.pc @@ -92,9 +93,10 @@ _py3() { } sha512sums=" -c28bd4045e3269d0d9c24dbf360f849d26eaa15e34fa9dd3f5feae0f3440ff74ab1d05154b95549a135e7d9e97fd9a7ff4b4e468b13265e0477bb58f47e856b6 tbb-2021.6.0.tar.gz +d314e3d88b85c96607a9eda15e3d808bf361eb562a534c59101929236e90c187883e7718e5435b5e7f01f4ee652c9765af95f5f173368b83997e4666b7403a49 tbb-2021.7.0.tar.gz 22a07bf83184ec4edfe33038c328f61446701f7fe1e1998f4e92d564c8ea09d1a2cd99fc4b959b9f6b9e5507febb9696ebd153d5654f2e59a996f0c29bdf304c fix-underlinking.patch 8f8f7f8d08c570af2339d19114b1679ffceee7b0d9b8c22ed12ee3c2ab858684e4cbb498bf7e31966db6b57b5685d46fab312f95972a6e501f6a5781137e799e fix-pthread-create.patch +23dfbf6a7862f0552de1663b12527f6a032679bd332b50bac18c15129e4199aa011ba5c065c9ec29c8af4688966413698a62aca3cf951fba35759184b28e53e3 musl-test.patch b7849e84c5f4d868ad19dc4a2433492facd1f75fe6e5cb0afc334e8f07bb4657d318ee1bc53f7890bfb8a87c7233bba85b61aba2aec9ea3dc24652a4bdec4dde tbb.pc 25b0bfe2067f287064f81dc434ac70336ad42fdd7fa91cded2e467f3939000480e1012675dc4e435a1712cf9b968cb565f213dfffb3f69ad46929aec237b9a02 tbbmalloc.pc 5952862755736fb85982281b3953183ed9d4657497a7f6bae1ef66bd1e2265882773764f07e46679b2aa750f80f47cc2a019024822ab5fa272b718c539ef3462 tbbmalloc_proxy.pc diff --git a/community/libtbb/musl-test.patch b/community/libtbb/musl-test.patch new file mode 100644 index 00000000000..26774d7ec63 --- /dev/null +++ b/community/libtbb/musl-test.patch @@ -0,0 +1,13 @@ +this is ifdef'd behind glibc, but the test isn't +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index f15679e..b2dbfca 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -493,7 +493,6 @@ if (TARGET TBB::tbb) + tbb_add_test(SUBDIR conformance NAME conformance_enumerable_thread_specific DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR conformance NAME conformance_combinable DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR conformance NAME conformance_concurrent_queue DEPENDENCIES TBB::tbb) +- tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR conformance NAME conformance_version DEPENDENCIES TBB::tbb) + # functional nodes conformance + tbb_add_test(SUBDIR conformance NAME conformance_function_node DEPENDENCIES TBB::tbb)