From bc0d2aa1b89915227b00b086766bb917cfaf329a Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 2 Jul 2025 13:27:34 +0800 Subject: [PATCH 1/4] 2022.2.0 --- tbb-2022.0.0.tar.gz => tbb-2022.2.0.tar.gz | 4 ++-- tbb.spec | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) rename tbb-2022.0.0.tar.gz => tbb-2022.2.0.tar.gz (32%) diff --git a/tbb-2022.0.0.tar.gz b/tbb-2022.2.0.tar.gz similarity index 32% rename from tbb-2022.0.0.tar.gz rename to tbb-2022.2.0.tar.gz index 0f16396..3f88a4c 100644 --- a/tbb-2022.0.0.tar.gz +++ b/tbb-2022.2.0.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8e89c9c345415b17b30a2db3095ba9d47647611662073f7fbf54ad48b7f3c2a -size 2654343 +oid sha256:f0f78001c8c8edb4bddc3d4c5ee7428d56ae313254158ad1eec49eced57f6a5b +size 4244148 diff --git a/tbb.spec b/tbb.spec index de014d4..11ec814 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,6 +1,6 @@ Name: tbb -Version: 2022.0.0 -Release: 2 +Version: 2022.2.0 +Release: 1 Summary: Threading Building Blocks lets you easily write parallel C++ programs License: Apache-2.0 URL: http://threadingbuildingblocks.org/ @@ -63,7 +63,7 @@ for fil in $(grep -Frl %{_bindir}/env python); do done sed -e "s|'\(https://docs\.python\.org\)/': None|'python': ('\1/3', '%{_docdir}/python3-docs/html/objects.inv')|" \ - -i doc/conf.py doc/GSG/conf.py doc/main/conf.py + -i doc/conf.py %build export TBBROOT=$PWD @@ -71,9 +71,7 @@ export PYTHONPATH=$(sed "s,%{_prefix},$PWD/%{__cmake_builddir}/python/build," << %cmake \ -DCMAKE_CXX_STANDARD=17 \ -DTBB4PY_BUILD:BOOL=ON \ - -DTBB_STRICT:BOOL=OFF \ - -DCMAKE_HWLOC_2_4_LIBRARY_PATH=%{_libdir}/libhwloc.so \ - -DCMAKE_HWLOC_2_4_INCLUDE_PATH=%{_includedir}/hwloc \ + -DTBB_STRICT:BOOL=OFF %cmake_build @@ -145,6 +143,9 @@ rm -fr %{buildroot}%{_datadir}/doc %{python3_sitearch}/__pycache__/TBB* %changelog +* Wed Jul 02 2025 Funda Wang - 2022.2.0-1 +- update to 2022.2.0 + * Mon Jun 23 2025 wangkai <13474090681@163.com> - 2022.0.0-2 - Fix package path error -- Gitee From 1180c71fcc293476e4ed190d33aa60a1c4345fff Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 4 Jul 2025 16:29:18 +0800 Subject: [PATCH 2/4] fix doc build --- tbb.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tbb.spec b/tbb.spec index 11ec814..8b33739 100644 --- a/tbb.spec +++ b/tbb.spec @@ -12,7 +12,7 @@ Patch0: tbb-2021-Werror.patch Patch9000: bugfix-tbb-fix-__TBB_machine_fetchadd4-was-not-declared-on-.patch -BuildRequires: gcc-c++ swig python3-devel hwloc hwloc-devel cmake python3-pip +BuildRequires: gcc-c++ swig python3-devel hwloc hwloc-devel cmake python3-pip ninja-build BuildRequires: python3-setuptools python3-sphinx python3-sphinx_rtd_theme python3-wheel %description @@ -68,7 +68,7 @@ sed -e "s|'\(https://docs\.python\.org\)/': None|'python': ('\1/3', '%{_docdir}/ %build export TBBROOT=$PWD export PYTHONPATH=$(sed "s,%{_prefix},$PWD/%{__cmake_builddir}/python/build," <<< %{python3_sitearch}) -%cmake \ +%cmake -G Ninja \ -DCMAKE_CXX_STANDARD=17 \ -DTBB4PY_BUILD:BOOL=ON \ -DTBB_STRICT:BOOL=OFF @@ -86,9 +86,9 @@ cd python %pyproject_build cd - -export BUILD_TYPE=oneapi -sphinx-build doc/GSG getting-started -sphinx-build doc/main html +pushd doc +make html +popd %install %cmake_install @@ -134,7 +134,7 @@ rm -fr %{buildroot}%{_datadir}/doc %{_libdir}/*.so %files help -%doc getting-started html +%doc build/html %files -n python3-tbb %doc python/README.md -- Gitee From 35e78eb9dbaf9f41e2c4a3a504fb6cac62903b64 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 4 Jul 2025 16:42:26 +0800 Subject: [PATCH 3/4] update --- tbb.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbb.spec b/tbb.spec index 8b33739..747bd21 100644 --- a/tbb.spec +++ b/tbb.spec @@ -13,7 +13,7 @@ Patch0: tbb-2021-Werror.patch Patch9000: bugfix-tbb-fix-__TBB_machine_fetchadd4-was-not-declared-on-.patch BuildRequires: gcc-c++ swig python3-devel hwloc hwloc-devel cmake python3-pip ninja-build -BuildRequires: python3-setuptools python3-sphinx python3-sphinx_rtd_theme python3-wheel +BuildRequires: python3-setuptools python3-sphinx python3-sphinx_rtd_theme python-sphinx-design python3-wheel %description Threading Building Blocks (TBB) lets you easily write parallel C++ programs that -- Gitee From 5d4ee8b9bd3c48a343805bda37af86ae254decd7 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 4 Jul 2025 16:50:46 +0800 Subject: [PATCH 4/4] update --- tbb.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbb.spec b/tbb.spec index 747bd21..1bf0134 100644 --- a/tbb.spec +++ b/tbb.spec @@ -13,7 +13,7 @@ Patch0: tbb-2021-Werror.patch Patch9000: bugfix-tbb-fix-__TBB_machine_fetchadd4-was-not-declared-on-.patch BuildRequires: gcc-c++ swig python3-devel hwloc hwloc-devel cmake python3-pip ninja-build -BuildRequires: python3-setuptools python3-sphinx python3-sphinx_rtd_theme python-sphinx-design python3-wheel +BuildRequires: python3-setuptools python3-sphinx python3-sphinx_rtd_theme python3-sphinx-design python3-wheel %description Threading Building Blocks (TBB) lets you easily write parallel C++ programs that -- Gitee