Merge branch 'master' of gitee.com:src-openeuler/tbb into master

This commit is contained in:
rv_spare 2021-04-14 14:20:24 +08:00 committed by Gitee
commit ad0a879442

View File

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