From 6ab90338712591f7d3007b8f1126e20e1fec92cc Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 18:21:00 +0100 Subject: [PATCH] automatic version update by autodist [release 2021.6.0-1mamba;Thu Sep 22 2022] --- tbb.spec | 72 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/tbb.spec b/tbb.spec index 8c8ee15..36795bb 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,14 +1,14 @@ %define pkg_version %(echo %version | tr -d .) Name: tbb -Version: 2020.3 +Version: 2021.6.0 Release: 1mamba Summary: The Threading Building Blocks library abstracts low-level threading details Group: Development/Tools Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://www.threadingbuildingblocks.org/ +URL: https://github.com/oneapi-src/oneTBB Source0: https://github.com/intel/tbb.git/v%{version}/tbb-%{version}.tar.bz2 #Source0: https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb%{pkg_version}oss_src.tgz Source1: http://www.threadingbuildingblocks.org/uploads/81/91/Latest%20Open%20Source%20Documentation/Getting_Started.pdf @@ -19,13 +19,12 @@ Patch1: tbb-2.2-mfence.patch License: GPL with exceptions ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: ldconfig BuildRequires: libgcc +BuildRequires: libhwloc-devel BuildRequires: libstdc++6-devel ## AUTOBUILDREQ-END BuildRequires: net-tools BuildRequires: util-linux-ng -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Threading Building Blocks (TBB) is a C++ runtime library that abstracts the low-level threading details necessary for optimal multi-core performance. It uses common C++ templates and coding style to eliminate tedious threading implementation work. @@ -36,7 +35,7 @@ Group: System/Libraries Summary: The Threading Building Blocks C++ headers and shared development libraries Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Provides: %{name} -Obsoletes: %{name} +Obsoletes: %{name} < 2021.5.0 %description -n lib%{name} Threading Building Blocks (TBB) is a C++ runtime library that abstracts the low-level threading details necessary for optimal multi-core performance. It uses common C++ templates and coding style to eliminate tedious threading implementation work. @@ -48,7 +47,7 @@ Group: Development/Libraries Summary: The Threading Building Blocks C++ headers and shared development libraries Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Provides: %{name}-devel -Obsoletes: %{name}-devel +Obsoletes: %{name}-devel < 2021.5.0 %description -n lib%{name}-devel The Threading Building Blocks library abstracts low-level threading details. @@ -66,29 +65,25 @@ This package contains the Threading Building Blocks (TBB) documentation. %prep %setup -q +#-D -T #%patch0 -p1 #%patch1 -p1 %build -%make CXXFLAGS="$RPM_OPT_FLAGS" tbb_build_prefix=obj +#:<< _EOF +%cmake -d build \ + -DCMAKE_STRIP=/bin/true \ + -DCMAKE_CXX_FLAGS="%{optflags} -Wno-uninitialized -Wno-array-bounds -Wno-use-after-free -Wno-address" -cp -p "%{SOURCE1}" "%{SOURCE2}" "%{SOURCE3}" . +#% make CXXFLAGS="$RPM_OPT_FLAGS" tbb_build_prefix=obj +#cp -p "%{SOURCE1}" "%{SOURCE2}" "%{SOURCE3}" . + +%make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -mkdir -p %{buildroot}%{_libdir} - -#,malloc_proxy -pushd build/obj_release -for file in libtbb{,malloc}; do - install -pm 755 ${file}.so.2 %{buildroot}%{_libdir} - ln -s $file.so.2 %{buildroot}%{_libdir}/$file.so -done -popd - -mkdir -p %{buildroot}%{_includedir} -cp -a include/tbb %{buildroot}%{_includedir} +%makeinstall -C build %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -100,31 +95,38 @@ cp -a include/tbb %{buildroot}%{_includedir} %defattr(-,root,root) %{_libdir}/libtbb.so.* %{_libdir}/libtbbmalloc.so.* -#%{_libdir}/libtbbmalloc_proxy.so.* -%doc LICENSE +%{_libdir}/libtbbbind_2_5.so.* +%{_libdir}/libtbbmalloc_proxy.so.* +%doc LICENSE.txt %files -n lib%{name}-devel %defattr(-,root,root) %dir %{_includedir}/tbb -%{_includedir}/tbb/index.html %{_includedir}/tbb/*.h -%dir %{_includedir}/tbb/compat -%{_includedir}/tbb/compat/* -%dir %{_includedir}/tbb/internal -%{_includedir}/tbb/internal/*.h -%dir %{_includedir}/tbb/machine -%{_includedir}/tbb/machine/*.h +%{_includedir}/oneapi/tbb.h +%dir %{_includedir}/oneapi/tbb +%{_includedir}/oneapi/tbb/* %{_libdir}/libtbb.so %{_libdir}/libtbbmalloc.so -#%{_libdir}/libtbbmalloc_proxy.so -%doc doc/Release_Notes.txt -%doc CHANGES README +%{_libdir}/libtbbbind_2_5.so +%{_libdir}/libtbbmalloc_proxy.so +%{_libdir}/pkgconfig/tbb*.pc +%dir %{_libdir}/cmake/TBB +%{_libdir}/cmake/TBB/TBB*.cmake +%{_datadir}/doc/TBB/README.md +%doc README.md -%files doc -%defattr(-,root,root) -%doc Getting_Started.pdf Reference.pdf Tutorial.pdf +#%files doc +#%defattr(-,root,root) +#%doc Getting_Started.pdf Reference.pdf Tutorial.pdf %changelog +* Thu Sep 22 2022 Automatic Build System 2021.6.0-1mamba +- automatic version update by autodist + +* Fri Jan 07 2022 Automatic Build System 2021.5.0-1mamba +- automatic version update by autodist + * Wed Sep 09 2020 Silvan Calarco 2020.3-1mamba - update to 2020.3