packages/tbb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:1ae5fc5a82d79c22ba4665334a51f5a2c4a4c0f1
Branches Tags
packages:main
...
compare: packages:e9cb7892cd86ff4850ef1437fa59041d421b0c25
Branches Tags
packages:main

12 Commits
1ae5fc5a82 ... e9cb7892cd

Author SHA1 Message Date
openeuler-ci-bot
e9cb7892cd
!22 Replace openEuler with vendor 
From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
 2022-11-18 01:21:32 +00:00
lyn1001
c0f9d0432d Replace openEuler with vendor 2022-11-17 18:43:20 +08:00
openeuler-ci-bot
f9f31a25be
!18 tbb版本回退 
Merge pull request !18 from 吴磊磊/openEuler-22.03-LTS-Next
 2022-01-24 06:30:12 +00:00
wu-leilei
9826c84880 back 2022-01-24 11:17:57 +08:00
openeuler-ci-bot
cb4f11e7ab
!17 tbb升级至2021.4.0 
Merge pull request !17 from 吴磊磊/openEuler-22.03-LTS-Next
 2022-01-19 11:29:35 +00:00
wu-leilei
d2b28bf8b5 package update 2022-01-19 17:49:01 +08:00
openeuler-ci-bot
21d685da40 !11 Master：Add multiple threads to make test 
From: @hugel
Reviewed-by: @small_leek
Signed-off-by: @small_leek
 2021-07-02 08:03:09 +00:00
Hugel
9a4f4c221f Add multiple threads to make test 2021-07-02 09:42:45 +08:00
openeuler-ci-bot
d606180937 !8 Add support for RISC-V 
From: @riscv-spare
Reviewed-by: @xiezhipeng1,@orange-snn
Signed-off-by: @xiezhipeng1,@orange-snn
 2021-06-30 03:16:30 +00:00
rv_spare
ad0a879442 Merge branch 'master' of gitee.com:src-openeuler/tbb into master 2021-04-14 14:20:24 +08:00
openeuler-ci-bot
31caf8b544 !9 tbb:Add -fstack-protector-strong for so file 
From: @openeuler-basic
Reviewed-by: @si-gui,@small_leek
Signed-off-by: @small_leek
 2021-03-20 14:11:57 +08:00
Yangyang Shen
5ef76820db Add -fstack-protector-strong for so file 2021-03-20 12:16:51 +08:00
1 changed files with 23 additions and 12 deletions
Show Stats Expand all files Collapse all files

35
tbb.spec
View File

@ -1,6 +1,8 @@
%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
Name: tbb Name: tbb
Version: 2020.3 Version: 2020.3
Release: 2 Release: 5
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/
@ -46,7 +48,7 @@ TBB module of Python 3
%prep %prep
%autosetup -n oneTBB-%{version} -p1 %autosetup -n oneTBB-%{version} -p1
sed -i 's/"`hostname -s`" ("`uname -m`"/openEulerbuild (%{_arch}/' \ sed -i 's/"`hostname -s`" ("`uname -m`"/%{vendor}build (%{_arch}/' \
build/version_info_linux.sh build/version_info_linux.sh
sed -i 's/-mrtm//' build/linux.gcc.inc sed -i 's/-mrtm//' build/linux.gcc.inc
sed -i 's,env python,python3,' python/TBB.py python/tbb/__*.py sed -i 's,env python,python3,' python/TBB.py python/tbb/__*.py
@ -54,8 +56,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 +68,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
@ -79,7 +81,7 @@ popd
make doxygen make doxygen
%check %check
make test tbb_build_prefix=obj stdver=c++14 CXXFLAGS="$RPM_OPT_FLAGS" make test %{?_smp_mflags} tbb_build_prefix=obj stdver=c++14 CXXFLAGS="$RPM_OPT_FLAGS"
%install %install
mkdir -p %{buildroot}/%{_libdir} mkdir -p %{buildroot}/%{_libdir}
@ -147,9 +149,18 @@ 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 * Thu Nov 17 2022 liyanan <liyanan32@h-partners.com> - 2020.3-5
- Replace openEuler with vendor
* Fri Jul 2 2021 Hugel <genqihu1@huawei.com> - 2020.3-4
- Add multiple threads to make test
* 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