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 760AA158087 for ; Thu, 20 Jan 2022 12:36:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4D02E0788; Thu, 20 Jan 2022 12:36:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 86412E077A for ; Thu, 20 Jan 2022 12:36:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E171C343364 for ; Thu, 20 Jan 2022 12:36:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50A14275 for ; Thu, 20 Jan 2022 12:36:04 +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: <1642681858.675d894c36bfd854d8f7624912d34e9dd6ca7177.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-2021.4.0-missing-TBB_machine_fetchadd4.patch dev-cpp/tbb/tbb-2021.4.0.ebuild dev-cpp/tbb/tbb-2021.5.0.ebuild X-VCS-Directories: dev-cpp/tbb/ dev-cpp/tbb/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 675d894c36bfd854d8f7624912d34e9dd6ca7177 X-VCS-Branch: master Date: Thu, 20 Jan 2022 12:36:04 +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: 42501019-4e3a-4b37-97c3-96a310349cfb X-Archives-Hash: 1e60c37f5ca403aab34ef031b82e84aa commit: 675d894c36bfd854d8f7624912d34e9dd6ca7177 Author: Alex Fan gmail com> AuthorDate: Thu Jan 20 05:02:17 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 20 12:30:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675d894c dev-cpp/tbb: fix undefined __TBB_machine_fetchadd4 Closes: https://bugs.gentoo.org/827883 Signed-off-by: Alex Fan gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23878 Signed-off-by: Sam James gentoo.org> ...bb-2021.4.0-missing-TBB_machine_fetchadd4.patch | 23 ++++++++++++++++++++++ dev-cpp/tbb/tbb-2021.4.0.ebuild | 2 ++ dev-cpp/tbb/tbb-2021.5.0.ebuild | 2 ++ 3 files changed, 27 insertions(+) diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch b/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch new file mode 100644 index 000000000000..091cad5821e7 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch @@ -0,0 +1,23 @@ +https://github.com/oneapi-src/oneTBB/issues/186 +https://github.com/oneapi-src/oneTBB/pull/550 +https://bugs.gentoo.org/827883 + +From: Felix Yan +Date: Thu, 7 Oct 2021 14:16:16 +0800 +Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550) + +Upstream-Status: Merged in commit later than 2021.5.0 + +--- a/src/tbb/tools_api/ittnotify_config.h ++++ b/src/tbb/tools_api/ittnotify_config.h +@@ -147,6 +147,10 @@ + # define ITT_ARCH_IA32E 2 + #endif /* ITT_ARCH_IA32E */ + ++#ifndef ITT_ARCH_IA64 ++# define ITT_ARCH_IA64 3 ++#endif /* ITT_ARCH_IA64 */ ++ + #ifndef ITT_ARCH_ARM + # define ITT_ARCH_ARM 4 + #endif /* ITT_ARCH_ARM */ diff --git a/dev-cpp/tbb/tbb-2021.4.0.ebuild b/dev-cpp/tbb/tbb-2021.4.0.ebuild index 930bcd958708..ff94b74527c2 100644 --- a/dev-cpp/tbb/tbb-2021.4.0.ebuild +++ b/dev-cpp/tbb/tbb-2021.4.0.ebuild @@ -24,6 +24,8 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-lto.patch + # bug 827883 + "${FILESDIR}"/${P}-missing-TBB_machine_fetchadd4.patch ) src_configure() { diff --git a/dev-cpp/tbb/tbb-2021.5.0.ebuild b/dev-cpp/tbb/tbb-2021.5.0.ebuild index 1fa9bfc11894..6b2ff50c7c4a 100644 --- a/dev-cpp/tbb/tbb-2021.5.0.ebuild +++ b/dev-cpp/tbb/tbb-2021.5.0.ebuild @@ -26,6 +26,8 @@ PATCHES=( # should be in.. 2022? "${FILESDIR}"/${PN}-2021.4.0-lto.patch "${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch + # bug 827883 + "${FILESDIR}"/${PN}-2021.4.0-missing-TBB_machine_fetchadd4.patch # need to verify this is in master "${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch )