public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocThrust/files/, sci-libs/rocThrust/
Date: Fri, 10 Jan 2025 00:31:57 +0000 (UTC)	[thread overview]
Message-ID: <1736468960.86f35948f693e7f8a819f875dedeec6f38fa7e3d.sam@gentoo> (raw)

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


             reply	other threads:[~2025-01-10  0:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-10  0:31 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-12-19 14:00 [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocThrust/files/, sci-libs/rocThrust/ Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1736468960.86f35948f693e7f8a819f875dedeec6f38fa7e3d.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox