tbb.spec

@@ -1,8 +1,6 @@
-%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
-
 Name:           tbb
 Version:        2020.3
-Release:        5
+Release:        2
 Summary:        Threading Building Blocks lets you easily write parallel C++ programs
 License:        ASL 2.0
 URL:            http://threadingbuildingblocks.org/
@@ -48,7 +46,7 @@ TBB module of Python 3
 %prep
 %autosetup -n oneTBB-%{version} -p1
 
-sed -i 's/"`hostname -s`" ("`uname -m`"/%{vendor}build (%{_arch}/' \
+sed -i 's/"`hostname -s`" ("`uname -m`"/openEulerbuild (%{_arch}/' \
     build/version_info_linux.sh
 sed -i 's/-mrtm//' build/linux.gcc.inc
 sed -i 's,env python,python3,' python/TBB.py python/tbb/__*.py
@@ -56,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 -fstack-protector-strong" \
-	LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong"
+	CXXFLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD" \
+	LDFLAGS="$RPM_LD_FLAGS -lpthread"
 %define pcsource {%{SOURCE6} %{SOURCE7} %{SOURCE8}}
 for pcfile in %{pcsource}; do
     base=$(basename ${pcfile})
@@ -68,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 -fstack-protector-strong" \
-  %ifarch riscv64
-  LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong -latomic"
-  %else
-  LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong"
-  %endif
+  CPLUS_FLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD" \
+%ifarch riscv64
+  LDFLAGS="$RPM_LD_FLAGS -lpthread -latomic"
+%else
+  LDFLAGS="$RPM_LD_FLAGS -lpthread"
+%endif
 cp -p rml/libirml.so* .
 %py3_build
 popd
@@ -81,7 +79,7 @@ popd
 make doxygen
 
 %check
-make test %{?_smp_mflags} tbb_build_prefix=obj stdver=c++14 CXXFLAGS="$RPM_OPT_FLAGS"
+make test tbb_build_prefix=obj stdver=c++14 CXXFLAGS="$RPM_OPT_FLAGS"
 
 %install
 mkdir -p %{buildroot}/%{_libdir}
@@ -149,18 +147,9 @@ rm %{buildroot}%{_libdir}/cmake/tbb/README.rst
 %{python3_sitearch}/__pycache__/TBB*
 
 %changelog
-* 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
+* Wed  Nov 11 2020 yangyanchao <yangyanchao6@huawei.com> - 2020.3-2
 - 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
 - update to 2020.3-1