dev-util/nvidia-cuda-toolkit-10.1.105: Fix installation location of executables

Fixes failures when invoking nvcc. link.stub and prelink.stub need to be
in crt subdirectory otherwise nvcc fails to find them.
Also extras/demo_suite were not executable.

Thanks to Jan Vesely and Nathaniel R. Lewis, this fix was derived from
patches from them.

Closes: https://github.com/gentoo/gentoo/pull/11735
Closes: https://bugs.gentoo.org/684392
Signed-off-by: Jason Zaman <perfinion@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

1 files changed, 12 insertions, 7 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild
index 7030ff9fe1de..aeec8c41cba1 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild
@@ -90,15 +90,20 @@ src_install() {
 		eend
 	done
 
-	dodir ${cudadir} || die
-	# Install binaries separately to amke sure the X permission is set
-	into ${cudadir} || die
-	dobin $(find bin nvvm/bin -type f) || die
-	find bin nvvm/bin -type f -delete || die
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install binaries separately to make sure the X permission is set
+	local bindirs=( bin nvvm/bin extras/demo_suite )
+	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
+		exeinto ${cudadir}/${i%/*}
+		doexe ${i}
+		rm ${i} || die
+	done
 
 	# Install the rest
-	insinto ${cudadir} || die
-	doins -r * || die
+	insinto ${cudadir}
+	doins -r *
 
 	cat > "${T}"/99cuda <<- EOF || die
 		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")