rpms/tbb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Replace patch with upstream one and adjust spec comments

Browse Source 
This doesn't change the %release because there's no change to the
package content, just the non-source parts of the spec file and patch.
This commit is contained in:
Jonathan Wakely 2023-02-16 11:00:10 +00:00
parent 202a13e1ca
commit cbe19ef373
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tbb-2020-task-namespace.patch
View File

@ -1,14 +1,29 @@
From 83460cd9c2df678bd05efbbbe5cd2c9f733ece2b Mon Sep 17 00:00:00 2001 From c18342ba667d1f33f5e9a773aa86b091a9694b97 Mon Sep 17 00:00:00 2001
From: Thomas W Rodgers <rodgert@twrodgers.com> From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 16 Jan 2023 17:20:37 -0800 Date: Fri, 20 May 2022 07:50:00 +0100
Subject: [PATCH] Fix FTBS with newer GCC Subject: [PATCH] tbb_2020: fix build on gcc-13
On gcc-13 build started failing due to 'task' identifier collision as:
../../include/tbb/task.h:300:20: error: declaration of 'tbb::task& tbb::internal::task_prefix::task()' changes meaning of 'task' [-fpermissive]
300 | tbb::task& task() {return *reinterpret_cast<tbb::task*>(this+1);}
| ^~~~
../../include/tbb/task.h:252:9: note: used here to mean 'class tbb::task'
252 | task* next_offloaded;
| ^~~~
../../include/tbb/task.h:43:7: note: declared here
43 | class task;
| ^~~~
The change adds explicit qualifier to class name to avoid ambiguity with method name.
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
--- ---
include/tbb/task.h | 2 +- include/tbb/task.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/tbb/task.h b/include/tbb/task.h diff --git a/include/tbb/task.h b/include/tbb/task.h
index 5e137c6..b5fb1ac 100644 index 5e137c6999..b5fb1ac35e 100644
--- a/include/tbb/task.h --- a/include/tbb/task.h
+++ b/include/tbb/task.h +++ b/include/tbb/task.h
@@ -249,7 +249,7 @@ namespace internal { @@ -249,7 +249,7 @@ namespace internal {
@ -20,6 +35,3 @@ index 5e137c6..b5fb1ac 100644
#endif #endif
#if __TBB_PREVIEW_RESUMABLE_TASKS #if __TBB_PREVIEW_RESUMABLE_TASKS
--
2.39.0

3
tbb.spec
View File

@ -31,7 +31,8 @@ Patch3: tbb-2019-test-task-scheduler-init.patch
# exported symbols # exported symbols
Patch4: tbb-mark-empty_task-execute-with-gnu-used.patch Patch4: tbb-mark-empty_task-execute-with-gnu-used.patch
# Fix "error: declaration of 'tbb::task& tbb::internal::task_prefix::task()' changes meaning of 'task' [-fpermissive]" # https://bugzilla.redhat.com/show_bug.cgi?id=2161412
# https://github.com/oneapi-src/oneTBB/pull/833
Patch5: tbb-2020-task-namespace.patch Patch5: tbb-2020-task-namespace.patch
BuildRequires: cmake BuildRequires: cmake