commit: 335d7ba7bbdce92aef318111cc24a0f111e34eaa Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com> AuthorDate: Sun Jun 22 15:12:56 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jul 5 07:14:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335d7ba7
sci-libs/rocThrust: don't install tests; install cmake files in a better place Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42691 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/rocThrust-6.4.1-no-tests-install.patch | 22 ++++++++++++++++++++++ ...rust-6.4.1.ebuild => rocThrust-6.4.1-r1.ebuild} | 8 ++++++++ 2 files changed, 30 insertions(+) diff --git a/sci-libs/rocThrust/files/rocThrust-6.4.1-no-tests-install.patch b/sci-libs/rocThrust/files/rocThrust-6.4.1-no-tests-install.patch new file mode 100644 index 000000000000..f94ab3ca473d --- /dev/null +++ b/sci-libs/rocThrust/files/rocThrust-6.4.1-no-tests-install.patch @@ -0,0 +1,22 @@ +Disable installation of test files. +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -106,7 +106,6 @@ function(add_rocthrust_test TEST) + LABELS "hip" + ) + endif() +- rocm_install(TARGETS ${TEST_TARGET} COMPONENT tests) + if (WIN32 AND NOT DEFINED DLLS_COPIED) + set(DLLS_COPIED "YES") + set(DLLS_COPIED ${DLLS_COPIED} PARENT_SCOPE) +@@ -266,10 +265,3 @@ if(BUILD_HIPSTDPAR_TEST) + endif() + endif() + endif() +- +-rocm_install( +- FILES "${INSTALL_TEST_FILE}" +- DESTINATION "${CMAKE_INSTALL_BINDIR}/${PROJECT_NAME}" +- COMPONENT tests +- RENAME "CTestTestfile.cmake" +-) diff --git a/sci-libs/rocThrust/rocThrust-6.4.1.ebuild b/sci-libs/rocThrust/rocThrust-6.4.1-r1.ebuild similarity index 87% rename from sci-libs/rocThrust/rocThrust-6.4.1.ebuild rename to sci-libs/rocThrust/rocThrust-6.4.1-r1.ebuild index 455846e00552..19b0c8aeca94 100644 --- a/sci-libs/rocThrust/rocThrust-6.4.1.ebuild +++ b/sci-libs/rocThrust/rocThrust-6.4.1-r1.ebuild @@ -43,8 +43,16 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" "${FILESDIR}/${PN}-6.4.1-fix-libcxx.patch" + "${FILESDIR}/${PN}-6.4.1-no-tests-install.patch" ) +src_prepare() { + sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" \ + -i cmake/ROCMExportTargetsHeaderOnly.cmake || die + + cmake_src_prepare +} + src_configure() { rocm_use_hipcc
