commit: 86f35948f693e7f8a819f875dedeec6f38fa7e3d Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com> AuthorDate: Thu Jan 9 18:22:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 10 00:29:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86f35948
sci-libs/rocThrust: fix compilation with libc++ _VSTD macro was removed from libcxx. Backport one line from commit: https://github.com/ROCm/rocThrust/commit/bc24ef2613e282d57d96dcf4263e2fa2cab171e4 Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40075 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch | 13 +++++++++++++ sci-libs/rocThrust/rocThrust-6.3.0.ebuild | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch b/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch new file mode 100644 index 000000000000..2db69a71bd20 --- /dev/null +++ b/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch @@ -0,0 +1,13 @@ +_VSTD macro was removed from libcxx +Upstream commit: https://github.com/ROCm/rocThrust/commit/bc24ef2613e282d57d96dcf4263e2fa2cab171e4 +--- a/thrust/type_traits/is_contiguous_iterator.h ++++ b/thrust/type_traits/is_contiguous_iterator.h +@@ -139,7 +139,7 @@ struct is_libcxx_wrap_iter : false_type {}; + #if defined(_LIBCPP_VERSION) + template <typename Iterator> + struct is_libcxx_wrap_iter< +- _VSTD::__wrap_iter<Iterator> ++ std::__wrap_iter<Iterator> + > : true_type {}; + #endif + diff --git a/sci-libs/rocThrust/rocThrust-6.3.0.ebuild b/sci-libs/rocThrust/rocThrust-6.3.0.ebuild index 08376716982d..7850be793886 100644 --- a/sci-libs/rocThrust/rocThrust-6.3.0.ebuild +++ b/sci-libs/rocThrust/rocThrust-6.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,7 +40,10 @@ BDEPEND=" test? ( app-arch/unzip ) " -PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-4.0-operator_new.patch" + "${FILESDIR}/${PN}-6.3.0-fix-libcxx.patch" +) src_configure() { rocm_use_hipcc
