diff --git a/manifest/armv7l/t/tbb.filelist b/manifest/armv7l/t/tbb.filelist index adf49929b..2d7e092ab 100644 --- a/manifest/armv7l/t/tbb.filelist +++ b/manifest/armv7l/t/tbb.filelist @@ -1,5 +1,6 @@ -# Total size: 2057946 +# Total size: 2036149 /usr/local/include/oneapi/tbb.h +/usr/local/include/oneapi/tbb/blocked_nd_range.h /usr/local/include/oneapi/tbb/blocked_range.h /usr/local/include/oneapi/tbb/blocked_range2d.h /usr/local/include/oneapi/tbb/blocked_range3d.h @@ -20,6 +21,7 @@ /usr/local/include/oneapi/tbb/detail/_aligned_space.h /usr/local/include/oneapi/tbb/detail/_allocator_traits.h /usr/local/include/oneapi/tbb/detail/_assert.h +/usr/local/include/oneapi/tbb/detail/_attach.h /usr/local/include/oneapi/tbb/detail/_concurrent_queue_base.h /usr/local/include/oneapi/tbb/detail/_concurrent_skip_list.h /usr/local/include/oneapi/tbb/detail/_concurrent_unordered_base.h @@ -91,6 +93,7 @@ /usr/local/include/oneapi/tbb/tbbmalloc_proxy.h /usr/local/include/oneapi/tbb/tick_count.h /usr/local/include/oneapi/tbb/version.h +/usr/local/include/tbb/blocked_nd_range.h /usr/local/include/tbb/blocked_range.h /usr/local/include/tbb/blocked_range2d.h /usr/local/include/tbb/blocked_range3d.h @@ -113,6 +116,7 @@ /usr/local/include/tbb/global_control.h /usr/local/include/tbb/info.h /usr/local/include/tbb/memory_pool.h +/usr/local/include/tbb/mutex.h /usr/local/include/tbb/null_mutex.h /usr/local/include/tbb/null_rw_mutex.h /usr/local/include/tbb/parallel_for.h @@ -126,6 +130,7 @@ /usr/local/include/tbb/profiling.h /usr/local/include/tbb/queuing_mutex.h /usr/local/include/tbb/queuing_rw_mutex.h +/usr/local/include/tbb/rw_mutex.h /usr/local/include/tbb/scalable_allocator.h /usr/local/include/tbb/spin_mutex.h /usr/local/include/tbb/spin_rw_mutex.h @@ -146,29 +151,32 @@ /usr/local/lib/libirml.so.1 /usr/local/lib/libtbb.so /usr/local/lib/libtbb.so.12 -/usr/local/lib/libtbb.so.12.5 +/usr/local/lib/libtbb.so.12.17 /usr/local/lib/libtbbbind_2_5.so /usr/local/lib/libtbbbind_2_5.so.3 -/usr/local/lib/libtbbbind_2_5.so.3.5 +/usr/local/lib/libtbbbind_2_5.so.3.17 /usr/local/lib/libtbbmalloc.so /usr/local/lib/libtbbmalloc.so.2 -/usr/local/lib/libtbbmalloc.so.2.5 +/usr/local/lib/libtbbmalloc.so.2.17 /usr/local/lib/libtbbmalloc_proxy.so /usr/local/lib/libtbbmalloc_proxy.so.2 -/usr/local/lib/libtbbmalloc_proxy.so.2.5 +/usr/local/lib/libtbbmalloc_proxy.so.2.17 /usr/local/lib/pkgconfig/tbb32.pc -/usr/local/lib/python3.10/site-packages/TBB-0.2-py3.10.egg-info -/usr/local/lib/python3.10/site-packages/TBB.py -/usr/local/lib/python3.10/site-packages/__pycache__/TBB.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/__init__.py -/usr/local/lib/python3.10/site-packages/tbb/__main__.py -/usr/local/lib/python3.10/site-packages/tbb/__pycache__/__init__.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/__pycache__/__main__.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/__pycache__/api.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/__pycache__/pool.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/__pycache__/test.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/_api.cpython-310-arm-linux-gnueabihf.so -/usr/local/lib/python3.10/site-packages/tbb/api.py -/usr/local/lib/python3.10/site-packages/tbb/pool.py -/usr/local/lib/python3.10/site-packages/tbb/test.py +/usr/local/lib/python3.13/site-packages/TBB-0.2-py3.13.egg-info/PKG-INFO +/usr/local/lib/python3.13/site-packages/TBB-0.2-py3.13.egg-info/SOURCES.txt +/usr/local/lib/python3.13/site-packages/TBB-0.2-py3.13.egg-info/dependency_links.txt +/usr/local/lib/python3.13/site-packages/TBB-0.2-py3.13.egg-info/top_level.txt +/usr/local/lib/python3.13/site-packages/TBB.py +/usr/local/lib/python3.13/site-packages/__pycache__/TBB.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/__init__.py +/usr/local/lib/python3.13/site-packages/tbb/__main__.py +/usr/local/lib/python3.13/site-packages/tbb/__pycache__/__init__.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/__pycache__/__main__.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/__pycache__/api.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/__pycache__/pool.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/__pycache__/test.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/_api.cpython-313-arm-linux-gnueabihf.so +/usr/local/lib/python3.13/site-packages/tbb/api.py +/usr/local/lib/python3.13/site-packages/tbb/pool.py +/usr/local/lib/python3.13/site-packages/tbb/test.py /usr/local/share/doc/TBB/README.md diff --git a/manifest/i686/t/tbb.filelist b/manifest/i686/t/tbb.filelist index 0b69fa4c6..47f35624c 100644 --- a/manifest/i686/t/tbb.filelist +++ b/manifest/i686/t/tbb.filelist @@ -1,5 +1,6 @@ -# Total size: 2068670 +# Total size: 2122609 /usr/local/include/oneapi/tbb.h +/usr/local/include/oneapi/tbb/blocked_nd_range.h /usr/local/include/oneapi/tbb/blocked_range.h /usr/local/include/oneapi/tbb/blocked_range2d.h /usr/local/include/oneapi/tbb/blocked_range3d.h @@ -20,6 +21,7 @@ /usr/local/include/oneapi/tbb/detail/_aligned_space.h /usr/local/include/oneapi/tbb/detail/_allocator_traits.h /usr/local/include/oneapi/tbb/detail/_assert.h +/usr/local/include/oneapi/tbb/detail/_attach.h /usr/local/include/oneapi/tbb/detail/_concurrent_queue_base.h /usr/local/include/oneapi/tbb/detail/_concurrent_skip_list.h /usr/local/include/oneapi/tbb/detail/_concurrent_unordered_base.h @@ -91,6 +93,7 @@ /usr/local/include/oneapi/tbb/tbbmalloc_proxy.h /usr/local/include/oneapi/tbb/tick_count.h /usr/local/include/oneapi/tbb/version.h +/usr/local/include/tbb/blocked_nd_range.h /usr/local/include/tbb/blocked_range.h /usr/local/include/tbb/blocked_range2d.h /usr/local/include/tbb/blocked_range3d.h @@ -113,6 +116,7 @@ /usr/local/include/tbb/global_control.h /usr/local/include/tbb/info.h /usr/local/include/tbb/memory_pool.h +/usr/local/include/tbb/mutex.h /usr/local/include/tbb/null_mutex.h /usr/local/include/tbb/null_rw_mutex.h /usr/local/include/tbb/parallel_for.h @@ -126,6 +130,7 @@ /usr/local/include/tbb/profiling.h /usr/local/include/tbb/queuing_mutex.h /usr/local/include/tbb/queuing_rw_mutex.h +/usr/local/include/tbb/rw_mutex.h /usr/local/include/tbb/scalable_allocator.h /usr/local/include/tbb/spin_mutex.h /usr/local/include/tbb/spin_rw_mutex.h @@ -146,29 +151,32 @@ /usr/local/lib/libirml.so.1 /usr/local/lib/libtbb.so /usr/local/lib/libtbb.so.12 -/usr/local/lib/libtbb.so.12.5 +/usr/local/lib/libtbb.so.12.17 /usr/local/lib/libtbbbind_2_5.so /usr/local/lib/libtbbbind_2_5.so.3 -/usr/local/lib/libtbbbind_2_5.so.3.5 +/usr/local/lib/libtbbbind_2_5.so.3.17 /usr/local/lib/libtbbmalloc.so /usr/local/lib/libtbbmalloc.so.2 -/usr/local/lib/libtbbmalloc.so.2.5 +/usr/local/lib/libtbbmalloc.so.2.17 /usr/local/lib/libtbbmalloc_proxy.so /usr/local/lib/libtbbmalloc_proxy.so.2 -/usr/local/lib/libtbbmalloc_proxy.so.2.5 +/usr/local/lib/libtbbmalloc_proxy.so.2.17 /usr/local/lib/pkgconfig/tbb32.pc -/usr/local/lib/python3.10/site-packages/TBB-0.2-py3.10.egg-info -/usr/local/lib/python3.10/site-packages/TBB.py -/usr/local/lib/python3.10/site-packages/__pycache__/TBB.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/__init__.py -/usr/local/lib/python3.10/site-packages/tbb/__main__.py -/usr/local/lib/python3.10/site-packages/tbb/__pycache__/__init__.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/__pycache__/__main__.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/__pycache__/api.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/__pycache__/pool.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/__pycache__/test.cpython-310.pyc -/usr/local/lib/python3.10/site-packages/tbb/_api.cpython-310-i386-linux-gnu.so -/usr/local/lib/python3.10/site-packages/tbb/api.py -/usr/local/lib/python3.10/site-packages/tbb/pool.py -/usr/local/lib/python3.10/site-packages/tbb/test.py +/usr/local/lib/python3.13/site-packages/TBB-0.2-py3.13.egg-info/PKG-INFO +/usr/local/lib/python3.13/site-packages/TBB-0.2-py3.13.egg-info/SOURCES.txt +/usr/local/lib/python3.13/site-packages/TBB-0.2-py3.13.egg-info/dependency_links.txt +/usr/local/lib/python3.13/site-packages/TBB-0.2-py3.13.egg-info/top_level.txt +/usr/local/lib/python3.13/site-packages/TBB.py +/usr/local/lib/python3.13/site-packages/__pycache__/TBB.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/__init__.py +/usr/local/lib/python3.13/site-packages/tbb/__main__.py +/usr/local/lib/python3.13/site-packages/tbb/__pycache__/__init__.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/__pycache__/__main__.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/__pycache__/api.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/__pycache__/pool.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/__pycache__/test.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/tbb/_api.cpython-313-i386-linux-gnu.so +/usr/local/lib/python3.13/site-packages/tbb/api.py +/usr/local/lib/python3.13/site-packages/tbb/pool.py +/usr/local/lib/python3.13/site-packages/tbb/test.py /usr/local/share/doc/TBB/README.md diff --git a/manifest/x86_64/t/tbb.filelist b/manifest/x86_64/t/tbb.filelist index a2741de37..8a60a9e1c 100644 --- a/manifest/x86_64/t/tbb.filelist +++ b/manifest/x86_64/t/tbb.filelist @@ -1,5 +1,6 @@ -# Total size: 2126348 +# Total size: 2166695 /usr/local/include/oneapi/tbb.h +/usr/local/include/oneapi/tbb/blocked_nd_range.h /usr/local/include/oneapi/tbb/blocked_range.h /usr/local/include/oneapi/tbb/blocked_range2d.h /usr/local/include/oneapi/tbb/blocked_range3d.h @@ -20,6 +21,7 @@ /usr/local/include/oneapi/tbb/detail/_aligned_space.h /usr/local/include/oneapi/tbb/detail/_allocator_traits.h /usr/local/include/oneapi/tbb/detail/_assert.h +/usr/local/include/oneapi/tbb/detail/_attach.h /usr/local/include/oneapi/tbb/detail/_concurrent_queue_base.h /usr/local/include/oneapi/tbb/detail/_concurrent_skip_list.h /usr/local/include/oneapi/tbb/detail/_concurrent_unordered_base.h @@ -91,6 +93,7 @@ /usr/local/include/oneapi/tbb/tbbmalloc_proxy.h /usr/local/include/oneapi/tbb/tick_count.h /usr/local/include/oneapi/tbb/version.h +/usr/local/include/tbb/blocked_nd_range.h /usr/local/include/tbb/blocked_range.h /usr/local/include/tbb/blocked_range2d.h /usr/local/include/tbb/blocked_range3d.h @@ -113,6 +116,7 @@ /usr/local/include/tbb/global_control.h /usr/local/include/tbb/info.h /usr/local/include/tbb/memory_pool.h +/usr/local/include/tbb/mutex.h /usr/local/include/tbb/null_mutex.h /usr/local/include/tbb/null_rw_mutex.h /usr/local/include/tbb/parallel_for.h @@ -126,6 +130,7 @@ /usr/local/include/tbb/profiling.h /usr/local/include/tbb/queuing_mutex.h /usr/local/include/tbb/queuing_rw_mutex.h +/usr/local/include/tbb/rw_mutex.h /usr/local/include/tbb/scalable_allocator.h /usr/local/include/tbb/spin_mutex.h /usr/local/include/tbb/spin_rw_mutex.h @@ -146,29 +151,32 @@ /usr/local/lib64/libirml.so.1 /usr/local/lib64/libtbb.so /usr/local/lib64/libtbb.so.12 -/usr/local/lib64/libtbb.so.12.5 +/usr/local/lib64/libtbb.so.12.17 /usr/local/lib64/libtbbbind_2_5.so /usr/local/lib64/libtbbbind_2_5.so.3 -/usr/local/lib64/libtbbbind_2_5.so.3.5 +/usr/local/lib64/libtbbbind_2_5.so.3.17 /usr/local/lib64/libtbbmalloc.so /usr/local/lib64/libtbbmalloc.so.2 -/usr/local/lib64/libtbbmalloc.so.2.5 +/usr/local/lib64/libtbbmalloc.so.2.17 /usr/local/lib64/libtbbmalloc_proxy.so /usr/local/lib64/libtbbmalloc_proxy.so.2 -/usr/local/lib64/libtbbmalloc_proxy.so.2.5 +/usr/local/lib64/libtbbmalloc_proxy.so.2.17 /usr/local/lib64/pkgconfig/tbb.pc -/usr/local/lib64/python3.10/site-packages/TBB-0.2-py3.10.egg-info -/usr/local/lib64/python3.10/site-packages/TBB.py -/usr/local/lib64/python3.10/site-packages/__pycache__/TBB.cpython-310.pyc -/usr/local/lib64/python3.10/site-packages/tbb/__init__.py -/usr/local/lib64/python3.10/site-packages/tbb/__main__.py -/usr/local/lib64/python3.10/site-packages/tbb/__pycache__/__init__.cpython-310.pyc -/usr/local/lib64/python3.10/site-packages/tbb/__pycache__/__main__.cpython-310.pyc -/usr/local/lib64/python3.10/site-packages/tbb/__pycache__/api.cpython-310.pyc -/usr/local/lib64/python3.10/site-packages/tbb/__pycache__/pool.cpython-310.pyc -/usr/local/lib64/python3.10/site-packages/tbb/__pycache__/test.cpython-310.pyc -/usr/local/lib64/python3.10/site-packages/tbb/_api.cpython-310-x86_64-linux-gnu.so -/usr/local/lib64/python3.10/site-packages/tbb/api.py -/usr/local/lib64/python3.10/site-packages/tbb/pool.py -/usr/local/lib64/python3.10/site-packages/tbb/test.py +/usr/local/lib64/python3.13/site-packages/TBB-0.2-py3.13.egg-info/PKG-INFO +/usr/local/lib64/python3.13/site-packages/TBB-0.2-py3.13.egg-info/SOURCES.txt +/usr/local/lib64/python3.13/site-packages/TBB-0.2-py3.13.egg-info/dependency_links.txt +/usr/local/lib64/python3.13/site-packages/TBB-0.2-py3.13.egg-info/top_level.txt +/usr/local/lib64/python3.13/site-packages/TBB.py +/usr/local/lib64/python3.13/site-packages/__pycache__/TBB.cpython-313.pyc +/usr/local/lib64/python3.13/site-packages/tbb/__init__.py +/usr/local/lib64/python3.13/site-packages/tbb/__main__.py +/usr/local/lib64/python3.13/site-packages/tbb/__pycache__/__init__.cpython-313.pyc +/usr/local/lib64/python3.13/site-packages/tbb/__pycache__/__main__.cpython-313.pyc +/usr/local/lib64/python3.13/site-packages/tbb/__pycache__/api.cpython-313.pyc +/usr/local/lib64/python3.13/site-packages/tbb/__pycache__/pool.cpython-313.pyc +/usr/local/lib64/python3.13/site-packages/tbb/__pycache__/test.cpython-313.pyc +/usr/local/lib64/python3.13/site-packages/tbb/_api.cpython-313-x86_64-linux-gnu.so +/usr/local/lib64/python3.13/site-packages/tbb/api.py +/usr/local/lib64/python3.13/site-packages/tbb/pool.py +/usr/local/lib64/python3.13/site-packages/tbb/test.py /usr/local/share/doc/TBB/README.md diff --git a/packages/tbb.rb b/packages/tbb.rb index 51c939d87..6cf7fa685 100644 --- a/packages/tbb.rb +++ b/packages/tbb.rb @@ -1,46 +1,26 @@ -# Adapted from Arch Linux tbb PKGBUILD at: -# https://github.com/archlinux/svntogit-packages/raw/packages/tbb/trunk/PKGBUILD +require 'buildsystems/cmake' -require 'package' - -class Tbb < Package +class Tbb < CMake description 'High level abstract threading library' homepage 'https://github.com/oneapi-src/oneTBB' - version '2021.5.0' + version '2022.3.0' license 'Apache-2.0' compatibility 'all' source_url 'https://github.com/oneapi-src/oneTBB.git' git_hashtag "v#{version}" - binary_compression 'tpxz' + binary_compression 'tar.zst' binary_sha256({ - aarch64: 'f4e39ecbe901b49bc1923cc10b136b5fd01f5c73148d5d15a4dc78455ad80a07', - armv7l: 'f4e39ecbe901b49bc1923cc10b136b5fd01f5c73148d5d15a4dc78455ad80a07', - i686: '7c3f26b5adca0413f399967769810420a00472f96189b98d9f474545da1f8086', - x86_64: 'e74dd3ba705401c6aba67c459a3522712c56aaacb0768312ddaeb5e5a257f04b' + aarch64: '9a2453136b00c543298f959a58393e981f12f0bf26857a1244b8e74a0325b438', + armv7l: '9a2453136b00c543298f959a58393e981f12f0bf26857a1244b8e74a0325b438', + i686: '7334111f25246a231f2529bdfef298fd405eac6f90847e626ae11116816ade3e', + x86_64: 'afcd9c317b60065c885d90c2ec2558a5314dad85ca1574e3934d7aba3bff6cd0' }) + depends_on 'gcc_lib' # R + depends_on 'glibc' # R depends_on 'hwloc' depends_on 'swig' => :build - def self.build - @tbb_cmake_options = if ARCH == 'i686' - CREW_CMAKE_OPTIONS.gsub("_FLAGS='-O2", - "_FLAGS='-O2 -mwaitpkg") - else - CREW_CMAKE_OPTIONS - end - FileUtils.mkdir('builddir') - Dir.chdir('builddir') do - system "cmake #{@tbb_cmake_options} \ - -DTBB4PY_BUILD=ON \ - -DTBB_TEST=OFF \ - ../ -G Ninja" - end - system 'samu -C builddir python_build all' - end - - def self.install - system "DESTDIR=#{CREW_DEST_DIR} samu -C builddir install" - end + cmake_options '-DTBB4PY_BUILD=ON -DTBB_TEST=OFF' end