commit 5316515109eb79d0f1548d100eeacf34060b25fb
Author: Jan Palus <[email protected]>
Date: Wed Oct 19 10:31:20 2022 +0200
up to 2021.6.0
tbb-x86_32bit.patch | 11 -----------
tbb.spec | 10 ++++------
2 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/tbb.spec b/tbb.spec
index 552c2f6..2e8f020 100644
--- a/tbb.spec
+++ b/tbb.spec
@@ -10,13 +10,13 @@
Summary: The Threading Building Blocks library abstracts low-level
threading details
Summary(pl.UTF-8): Threading Building Blocks - biblioteka abstrahująca
niskopoziomowe szczegóły obsługi wątków
Name: tbb
-Version: %{major}.%{minor}.%{micro}
-Release: 2
+Version: 2021.6.0
+Release: 1
License: Apache v2.0
Group: Development/Tools
# Source0Download: https://github.com/oneapi-src/oneTBB/releases
Source0:
https://github.com/01org/tbb/archive/v%{version}/oneTBB-%{version}.tar.gz
-# Source0-md5: 5e5f2ee22a0d19c0abbe7478f1c7ccf6
+# Source0-md5: f0fc961e3c3851b52db61c2d262e6b95
Source1:
http://www.threadingbuildingblocks.org/uploads/81/91/Latest%20Open%20Source%20Documentation/Design_Patterns.pdf
# Source1-md5: 46062fef922d39abfd464bc06e02cdd8
Source2:
http://www.threadingbuildingblocks.org/uploads/81/91/Latest%20Open%20Source%20Documentation/Getting_Started.pdf
@@ -26,8 +26,7 @@ Source3:
http://www.threadingbuildingblocks.org/uploads/81/91/Latest%20Open%20So
Source4:
http://www.threadingbuildingblocks.org/uploads/81/91/Latest%20Open%20Source%20Documentation/Tutorial.pdf
# Source4-md5: 5bbdd1050c5dac5c1b782a6a98db0c46
URL: http://www.threadingbuildingblocks.org/
-Patch0: %{name}-x86_32bit.patch
-Patch1: retry-pthread-create-eagain.patch
+Patch0: retry-pthread-create-eagain.patch
BuildRequires: cmake >= 3.1
BuildRequires: hwloc-devel
%{?with_libatomic:BuildRequires: libatomic-devel}
@@ -100,7 +99,6 @@ Building Blocks (TBB).
%prep
%setup -q -n oneTBB-%{version}
%patch0 -p1
-%patch1 -p1
cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
diff --git a/tbb-x86_32bit.patch b/tbb-x86_32bit.patch
deleted file mode 100644
index a2dc714..0000000
--- a/tbb-x86_32bit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- oneTBB-2021.4.0/cmake/compilers/GNU.cmake.orig 2021-10-04
11:50:18.000000000 +0200
-+++ oneTBB-2021.4.0/cmake/compilers/GNU.cmake 2021-12-16 18:34:30.653386405
+0100
-@@ -36,7 +36,7 @@
- endif()
-
- # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and
WAITPKG instructions support (-mwaitpkg) on relevant processors
--if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
-+if (CMAKE_SYSTEM_PROCESSOR MATCHES "((x|i6)86|AMD64)")
- set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm
$<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
- endif()
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tbb.git/commitdiff/5316515109eb79d0f1548d100eeacf34060b25fb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
