commit: 58ee8b5d08feb2cf8e7257f4033a19ba1cd2312e Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com> AuthorDate: Sat Jul 20 17:54:22 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <experimental/filesystem>. Also remove unused cmake flag. Bug: https://bugs.gentoo.org/936099 Closes: https://bugs.gentoo.org/854111 Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com> Signed-off-by: Sam James <sam <AT> 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)" )
