commit: ce3510b8450f6a1f39ea6d46aad95de0ce672654 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Thu May 22 11:51:57 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu May 22 16:07:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce3510b8
dev-util/nvidia-cuda-toolkit: use get_libdir We only install on arm64/amd64 so they are both 64bit, but this matches expected behaviour. Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42202 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3-r1.ebuild | 4 ++-- dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1-r1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3-r1.ebuild index 72c7a0492e9f..7dfaafc412a8 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3-r1.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3-r1.ebuild @@ -288,7 +288,7 @@ src_install() { # Add include and lib symlinks dosym -r "${CUDA_PATH}/targets/${narch}-linux/include" "${CUDA_PATH}/include" - dosym -r "${CUDA_PATH}/targets/${narch}-linux/lib" "${CUDA_PATH}/lib64" + dosym -r "${CUDA_PATH}/targets/${narch}-linux/lib" "${CUDA_PATH}/$(get_libdir)" find "${ED}/${CUDA_PATH}" -empty -delete || die @@ -301,7 +301,7 @@ src_install() { newenvd - "99cuda${revord}" <<-EOF PATH=${EPREFIX}${CUDA_PATH}/bin${pathextradirs} PKG_CONFIG_PATH=${EPREFIX}${CUDA_PATH}/pkgconfig - LDPATH=${EPREFIX}${CUDA_PATH}/lib64:${EPREFIX}${CUDA_PATH}/nvvm/lib64${ldpathextradirs} + LDPATH=${EPREFIX}${CUDA_PATH}/$(get_libdir):${EPREFIX}${CUDA_PATH}/nvvm/lib64${ldpathextradirs} EOF # CUDA prepackages libraries, don't revdep-build on them diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1-r1.ebuild index 512a336bc30f..b0e71bf298df 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1-r1.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1-r1.ebuild @@ -288,7 +288,7 @@ src_install() { # Add include and lib symlinks dosym -r "${CUDA_PATH}/targets/${narch}-linux/include" "${CUDA_PATH}/include" - dosym -r "${CUDA_PATH}/targets/${narch}-linux/lib" "${CUDA_PATH}/lib64" + dosym -r "${CUDA_PATH}/targets/${narch}-linux/lib" "${CUDA_PATH}/$(get_libdir)" find "${ED}/${CUDA_PATH}" -empty -delete || die @@ -301,7 +301,7 @@ src_install() { newenvd - "99cuda${revord}" <<-EOF PATH=${EPREFIX}${CUDA_PATH}/bin${pathextradirs} PKG_CONFIG_PATH=${EPREFIX}${CUDA_PATH}/pkgconfig - LDPATH=${EPREFIX}${CUDA_PATH}/lib64:${EPREFIX}${CUDA_PATH}/nvvm/lib64${ldpathextradirs} + LDPATH=${EPREFIX}${CUDA_PATH}/$(get_libdir):${EPREFIX}${CUDA_PATH}/nvvm/lib64${ldpathextradirs} EOF # CUDA prepackages libraries, don't revdep-build on them
