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 F0403158083 for ; Mon, 9 Sep 2024 18:20:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7980E2A14; Mon, 9 Sep 2024 18:20:44 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE092E2A14 for ; Mon, 9 Sep 2024 18:20:44 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E275F343021 for ; Mon, 9 Sep 2024 18:20:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71BBC1F53 for ; Mon, 9 Sep 2024 18:20:40 +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: <1725905720.58ee8b5d08feb2cf8e7257f4033a19ba1cd2312e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/roctracer/roctracer-6.1.1-r1.ebuild dev-util/roctracer/roctracer-6.1.1.ebuild X-VCS-Directories: dev-util/roctracer/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 58ee8b5d08feb2cf8e7257f4033a19ba1cd2312e X-VCS-Branch: master Date: Mon, 9 Sep 2024 18:20:40 +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: 92a8c15b-43f6-47bb-8854-b985fbcecedd X-Archives-Hash: ee90d66844b3de057dea3ac58b3cef02 commit: 58ee8b5d08feb2cf8e7257f4033a19ba1cd2312e Author: Sv. Lockal gmail com> AuthorDate: Sat Jul 20 17:54:22 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Sep 9 18:15:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ee8b5d dev-util/roctracer: strip unsupported flags for potentially switched compiler Also fix libc++ in hipcc (clang-18) has no . Also remove unused cmake flag. Bug: https://bugs.gentoo.org/936099 Closes: https://bugs.gentoo.org/854111 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Sam James gentoo.org> .../{roctracer-6.1.1.ebuild => roctracer-6.1.1-r1.ebuild} | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dev-util/roctracer/roctracer-6.1.1.ebuild b/dev-util/roctracer/roctracer-6.1.1-r1.ebuild similarity index 82% rename from dev-util/roctracer/roctracer-6.1.1.ebuild rename to dev-util/roctracer/roctracer-6.1.1-r1.ebuild index 61a5b02149f2..5ac47938ee4d 100644 --- a/dev-util/roctracer/roctracer-6.1.1.ebuild +++ b/dev-util/roctracer/roctracer-6.1.1-r1.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..13} ) LLVM_COMPAT=( 18 ) ROCM_VERSION=${PV} -inherit cmake prefix python-any-r1 rocm llvm-r1 +inherit cmake flag-o-matic llvm-r1 prefix python-any-r1 rocm toolchain-funcs DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's" HOMEPAGE="https://github.com/ROCm/roctracer" @@ -64,9 +64,21 @@ src_prepare() { # bug #892732 sed -i -e 's/-Werror//' CMakeLists.txt || die + + # libc++ may have no experimental/filesystem + sed -e 's|experimental/||' -e 's|experimental::||' \ + -i plugin/file/file.cpp src/hip_stats/hip_stats.cpp \ + src/roctracer/loader.h src/tracer_tool/tracer_tool.cpp || die } src_configure() { + rocm_use_hipcc + + if [[ $(tc-get-cxx-stdlib) == "libc++" ]] ; then + # https://releases.llvm.org/9.0.0/projects/libcxx/docs/UsingLibcxx.html#using-filesystem + append-libs "-lc++fs" + fi + local mycmakeargs=( -DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake/hip" -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF @@ -75,7 +87,6 @@ src_configure() { ) use test && mycmakeargs+=( -DHIP_ROOT_DIR="${EPREFIX}/usr" - -DHIP_CLANG_INSTALL_DIR="$(get_llvm_prefix)/bin" -DGPU_TARGETS="$(get_amdgpu_flags)" )