From f44b7eaebbe52408f73377865bc1578f1f5fa065 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 24 Jan 2025 21:57:47 +0800 Subject: [PATCH] fix build with new cmake macro --- tbb.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tbb.spec b/tbb.spec index fc526fb..94a90e8 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,6 +1,6 @@ Name: tbb Version: 2021.11.0 -Release: 3 +Release: 4 Summary: Threading Building Blocks lets you easily write parallel C++ programs License: Apache-2.0 URL: http://threadingbuildingblocks.org/ @@ -69,7 +69,7 @@ sed -e "s|\('https://docs\.python\.org/': \)None|\1'%{_docdir}/python3-docs/html %build export TBBROOT=$PWD -export PYTHONPATH=$(sed "s,%{_prefix},$PWD/%{_vpath_builddir}/python/build," <<< %{python3_sitearch}) +export PYTHONPATH=$(sed "s,%{_prefix},$PWD/%{__cmake_builddir}/python/build," <<< %{python3_sitearch}) %cmake \ -DCMAKE_CXX_STANDARD=17 \ -DTBB4PY_BUILD:BOOL=ON \ @@ -80,7 +80,7 @@ export PYTHONPATH=$(sed "s,%{_prefix},$PWD/%{_vpath_builddir}/python/build," <<< %cmake_build unset PYTHONPATH -export LD_LIBRARY_PATH=$(ls -1d $PWD/*relwithdebinfo) +export LD_LIBRARY_PATH=$(ls -1d $PWD/%{__cmake_builddir}/*relwithdebinfo) %ifarch riscv64 export LDFLAGS="-L $LD_LIBRARY_PATH %{build_ldflags} -latomic" %else @@ -145,6 +145,9 @@ rm -fr %{buildroot}%{_datadir}/doc %{python3_sitearch}/__pycache__/TBB* %changelog +* Fri Jan 24 2025 Funda Wang - 2021.11.0-4 +- fix build with new cmake macro + * Mon Nov 11 2024 Funda Wang - 2021.11.0-3 - adopt to new cmake macro - fix build with sphinx 8 -- Gitee