diff --git a/tbb.spec b/tbb.spec index 15cdf88..c5285b4 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,6 +1,6 @@ Name: tbb Version: 2020.3 -Release: 2 +Release: 3 Summary: Threading Building Blocks lets you easily write parallel C++ programs License: ASL 2.0 URL: http://threadingbuildingblocks.org/ @@ -54,8 +54,8 @@ sed -i '/^#!/d' python/tbb/{pool,test}.py %build %make_build tbb_build_prefix=obj stdver=c++14 \ - CXXFLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD" \ - LDFLAGS="$RPM_LD_FLAGS -lpthread" + CXXFLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD -fstack-protector-strong" \ + LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong" %define pcsource {%{SOURCE6} %{SOURCE7} %{SOURCE8}} for pcfile in %{pcsource}; do base=$(basename ${pcfile}) @@ -66,12 +66,12 @@ done . build/obj_release/tbbvars.sh pushd python %make_build -C rml stdver=c++14 \ - CPLUS_FLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD" \ -%ifarch riscv64 - LDFLAGS="$RPM_LD_FLAGS -lpthread -latomic" -%else - LDFLAGS="$RPM_LD_FLAGS -lpthread" -%endif + CPLUS_FLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD -fstack-protector-strong" \ + %ifarch riscv64 + LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong -latomic" + %else + LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong" + %endif cp -p rml/libirml.so* . %py3_build popd @@ -147,9 +147,12 @@ rm %{buildroot}%{_libdir}/cmake/tbb/README.rst %{python3_sitearch}/__pycache__/TBB* %changelog -* Wed Nov 11 2020 yangyanchao - 2020.3-2 +* Wed Apr 14 2021 yangyanchao - 2020.3-3 - Link to libatomic in riscv +* Sat Mar 20 2021 shenyangyang - 2020.3-2 +- Add -fstack-protector-strong for so file + * Fri Jul 24 2020 shixuantong - 2020.3-1 - update to 2020.3-1