From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B07B15ACFB for ; Fri, 28 Apr 2023 00:47:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADC40E07F0; Fri, 28 Apr 2023 00:47:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9312BE07F0 for ; Fri, 28 Apr 2023 00:47:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9D16340EB9 for ; Fri, 28 Apr 2023 00:47:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2EB2AA49 for ; Fri, 28 Apr 2023 00:47:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1682642813.a9037e17ac83d5013b3393c7b703809a99574bc4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/, dev-cpp/tbb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/tbb/files/tbb-2020.3-gcc13.patch dev-cpp/tbb/tbb-2020.3.ebuild X-VCS-Directories: dev-cpp/tbb/files/ dev-cpp/tbb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a9037e17ac83d5013b3393c7b703809a99574bc4 X-VCS-Branch: master Date: Fri, 28 Apr 2023 00:47:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 86fa5b0b-c4d1-4cb6-bc17-9339bb2131d6 X-Archives-Hash: 96808085fe2da985e52b2ac574e7e609 commit: a9037e17ac83d5013b3393c7b703809a99574bc4 Author: Sam James gentoo org> AuthorDate: Fri Apr 28 00:46:53 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Apr 28 00:46:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9037e17 dev-cpp/tbb: fix build w/ gcc 13 Closes: https://bugs.gentoo.org/899746 Signed-off-by: Sam James gentoo.org> dev-cpp/tbb/files/tbb-2020.3-gcc13.patch | 35 ++++++++++++++++++++++++++++++++ dev-cpp/tbb/tbb-2020.3.ebuild | 7 +++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dev-cpp/tbb/files/tbb-2020.3-gcc13.patch b/dev-cpp/tbb/files/tbb-2020.3-gcc13.patch new file mode 100644 index 000000000000..1c0803048ca7 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2020.3-gcc13.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/899746 +https://github.com/oneapi-src/oneTBB/pull/833 + +From c18342ba667d1f33f5e9a773aa86b091a9694b97 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 20 May 2022 07:50:00 +0100 +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(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 +--- a/include/tbb/task.h ++++ b/include/tbb/task.h +@@ -249,7 +249,7 @@ namespace internal { + #if __TBB_TASK_PRIORITY + //! Pointer to the next offloaded lower priority task. + /** Used to maintain a list of offloaded tasks inside the scheduler. **/ +- task* next_offloaded; ++ tbb::task* next_offloaded; + #endif + + #if __TBB_PREVIEW_RESUMABLE_TASKS + diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild index f784dbdaec54..9e6f7e2e6797 100644 --- a/dev-cpp/tbb/tbb-2020.3.ebuild +++ b/dev-cpp/tbb/tbb-2020.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,10 @@ S="${WORKDIR}/oneTBB-${MY_PV}" DOCS=( CHANGES README README.md doc/Release_Notes.txt ) -PATCHES=( "${FILESDIR}"/${PN}-2020.1-makefile-debug.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2020.1-makefile-debug.patch + "${FILESDIR}"/${PN}-2020.3-gcc13.patch +) src_prepare() { default