commit:     b1681708730772abc04b24bfc8ec084da69a9f6f
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Feb 23 21:56:28 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 21:58:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1681708

dev-util/nvidia-cuda-toolkit: 12.8.0-r1 revert install path to /opt/cuda

Original ebuild mirrored the upstream behaviour of installing into
/opt/cuda-12.8.0. This collides with an installed dev-libs/cudnn. So revert it
until cudnn has been updated.

Closes: https://bugs.gentoo.org/950207
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...lkit-12.8.0.ebuild => nvidia-cuda-toolkit-12.8.0-r1.ebuild} | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.0.ebuild 
b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.0-r1.ebuild
similarity index 98%
rename from dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.0.ebuild
rename to dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.0-r1.ebuild
index 0d731b90adfa..f4e593b9052d 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.0.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.0-r1.ebuild
@@ -59,7 +59,8 @@ BDEPEND="
        ')
 "
 
-CUDA_PATH="/opt/cuda-${PV}"
+# CUDA_PATH="/opt/cuda-${PV}" #950207
+CUDA_PATH="/opt/cuda"
 QA_PREBUILT="${CUDA_PATH#/}/*"
 
 PATCHES=(
@@ -318,9 +319,10 @@ src_install() {
        fperms +x "${CUDA_PATH}/bin/cuda-config"
        # }}}
 
-       if [[ "${SLOT}" != "${PV}" ]]; then
-               dosym "${CUDA_PATH}" "${CUDA_PATH%"-${PV}"}"
-       fi
+       # skip til cudnn has been changed #950207
+       # if [[ "${SLOT}" != "${PV}" ]]; then
+       #       dosym "${CUDA_PATH}" "${CUDA_PATH%"-${PV}"}"
+       # fi
 
        fowners -R root:root "${CUDA_PATH}"
 }

Reply via email to