gentoo auto-resync : 19:10:2022 - 01:57:29

2 files changed, 273 insertions, 0 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 5ff9da8870ec..9448c39f210d 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -4,9 +4,11 @@ DIST cuda_11.6.0_510.39.01_linux.run 3488951771 BLAKE2B f66d8b7779dc8e1e06ef5b83
 DIST cuda_11.6.1_510.47.03_linux.run 3529826023 BLAKE2B 93acd3a2984e89b1458d11051f4927e7bd2ac20bccce9166a2a4efcf16cf01a1ccbb6fa8be2f7a82ef1b5a403e4814c1e24aca493dd246c3a3c16e9107fbc1cc SHA512 75c8f28bcd3de638f780b4d8c5e80cea3023fb0e57b4075bd6905071da273e9d09281d947d660f2e4ab6d71f47c12cc021f12656fd8fbf56d11cf7e520e90a9e
 DIST cuda_11.6.2_510.47.03_linux.run 3462542823 BLAKE2B 8160591bc491a8d18bf9810c248a1e1966f82f6170fe4f98915fd51e984e594da390aab2eddee8a02ee245428c9db3ca4dbf6871d71a54823c06b5ba16769c4d SHA512 8afec50a2697074ee25eca59d5061041eb517bf324e20c21d7595f7000b445b9baeb8902b50fd2dcee16861502a7789b1c81994e1cba312426eea24f1252f21f
 DIST cuda_11.7.0_515.43.04_linux.run 3490450898 BLAKE2B f5984a3ae67a116f7944d8e1c2b3b0a25b41aa5081bff869dd30ea2213cc96d23459dffdfd84ec145d5a860bd683d81d212f331939d7b39f9d9b5f17c838f13c SHA512 070c9a4b3bb11503d99212cf483ead88ae182e7da7eabd7390a0211b57ea550fb8a806ed3c009b8bae654529a7dc6c11dd35c0d59066f6f4eebe064c94d4e071
+DIST cuda_11.8.0_520.61.05_linux.run 4336730777 BLAKE2B cfdb4a51c49ee504e56a4a95de4e477ef207b678527cbb633c1e83e667f1a62c0f67038befd0b10f7ae24cda9c8bc5c54293d06a05b2e45be6cf677e40f71f17 SHA512 e96e1389abed34b5093b3a1d4e6ae9f3d4f8406621b1475f378efae65868657efce22da03b5b4e0a548d9635e406b8690b18b17b186d03ecb3ca0703c5d5787a
 EBUILD nvidia-cuda-toolkit-11.5.1-r1.ebuild 7595 BLAKE2B efbc0f8747cfb846820311457f82d13ecfde0c42d68908ef9a9de5cdae905fddb67382d96c1845098005041f93240d1b6152e91db3c9b3cbcd3c2914b5d2a858 SHA512 168ff4effb724474068ab66ca03a0963f3bc3827396279356569de11c6b3d5e973935a9117738e55f2c447d9d15f702cb5fd1a737c0be8ae52d937d77c2d18fa
 EBUILD nvidia-cuda-toolkit-11.6.0.ebuild 7885 BLAKE2B 738dddb098d327bc4bcfdb464ef6599f5dd499f9afebe9540137f07ed19f445214039d7a7a584914644db56d1adc3e2d0da1358b344f462e266db10b87fbf3b0 SHA512 be71bac77074319782dff9f9a52ec093228f3079950c7aca3c05dc33e32ca3dfce4fb45a6bfdfb025f62ebf6ed872af95fa7a8b4d11c42726682e09f8d013f5e
 EBUILD nvidia-cuda-toolkit-11.6.1.ebuild 7885 BLAKE2B cde8e87114871685e4891be06633065dc181c1ede3c7690a6d8cfe5537f518147862b426d01187c9265c452628b3db340aa1d7bcc3a63507c3d576aa79005ea7 SHA512 aff120e1c3140cb353aa37366d58c9a08185ab4ca603f4161ff33253d1e5fd065ec1a8e9d73490ca8fa2eff87464c1a15a35944b012c93c5d8560f46de1d1b57
 EBUILD nvidia-cuda-toolkit-11.6.2.ebuild 7885 BLAKE2B cde8e87114871685e4891be06633065dc181c1ede3c7690a6d8cfe5537f518147862b426d01187c9265c452628b3db340aa1d7bcc3a63507c3d576aa79005ea7 SHA512 aff120e1c3140cb353aa37366d58c9a08185ab4ca603f4161ff33253d1e5fd065ec1a8e9d73490ca8fa2eff87464c1a15a35944b012c93c5d8560f46de1d1b57
 EBUILD nvidia-cuda-toolkit-11.7.0-r2.ebuild 7901 BLAKE2B e17c9639dde2e4f3d237a993589a35b2b73ccb881c67a494552dcafc8531286b2f18c6c191453779cd79b2a9c9a93eff611dc359d70156cc9fd32d8f8b21c97c SHA512 146327a76cb8d01808f4537db3bc77ec24cfb5b91c442e33451c7b8fdaad9939a5a2023b30a52eee9052bcc0750dffde1e30b200b2cd66712c403c4e0c58c519
+EBUILD nvidia-cuda-toolkit-11.8.0.ebuild 7901 BLAKE2B 4c3ca921d6f3639fe653195b78e023b9a3aac60b00faeeaa9301d857a9a5ef29223d6619d53a2a658e9e066e47654519767906ab0875408baf5850d8f2d174c0 SHA512 c67fe216257a308a11d03b9439cabb681e607185020549956a8037d7342fe2514369be11c52d75137bf95da6fcb1bb66c98cefba426f519d4b6bf00a9ae1173c
 MISC metadata.xml 671 BLAKE2B 20d0b15061270bdb0604e9e76e8913c9d304c51a05102f92b2ef64cddb1b369705a742aefca28f4d36976bb633d0a2cf090bf3d307ea579121578d29c41264e1 SHA512 09fe8a1c60ca7924e433c5aca460d6a757c9962371b3f2a3c42c2ff1b0dd819f1704dd5943bd31a3e74337ad0f14aa4d7836912a435396c15e4f0daaed33800e
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0.ebuild
new file mode 100644
index 000000000000..b36b219bb292
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs toolchain-funcs unpacker
+
+DRIVER_PV="520.61.05"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
+# actual required minimum driver version are different. Lowering the
+# bound helps Kepler sm_35 and sm_37 users.
+# https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#cuda-major-component-versions
+RDEPEND="
+	<sys-devel/gcc-12_pre[cxx]
+	>=x11-drivers/nvidia-drivers-450.80.02
+	nsight? (
+		dev-libs/libpfm
+		dev-libs/wayland
+		|| (
+			dev-libs/openssl-compat:1.1.1
+			=dev-libs/openssl-1.1.1*
+		)
+		sys-libs/zlib
+	)
+	vis-profiler? (
+		>=virtual/jre-1.8:*
+	)"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump
+	local cuda_supported_gcc="8.5 9.4 9.5 10.3 10.4 11.1 11.2 11.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cccl,cudart,cuobjdump,cuxxfilt,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx}
+		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend $?
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend $?
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend $?
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend $?
+	fi
+
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend $?
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/ncu
+			${ncu_dir}/ncu-ui
+			${ncu_dir}/nv-nsight-cu
+			${ncu_dir}/nv-nsight-cu-cli
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		eend $?
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+		)
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend $?
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+
+		# unbundle libstdc++
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die
+
+		# unbundle openssl
+		rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libssl.so* || die
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libssl.so* || die
+
+		# unbundle libz
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libz.so* || die
+
+		# unbundle libpfm
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle mesa
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+	# TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}