From 7e3d6dcede5749fe6a1adef4e673a9dde7703b7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Feb 2024 11:45:20 +0000 Subject: gentoo auto-resync : 02:02:2024 - 11:45:20 --- dev-util/Manifest.gz | Bin 64330 -> 64321 bytes dev-util/nvidia-cuda-toolkit/Manifest | 2 - .../nvidia-cuda-toolkit-12.3.1.ebuild | 318 --------------------- dev-util/source-highlight/Manifest | 4 +- dev-util/source-highlight/metadata.xml | 3 + .../source-highlight-3.1.9-r2.ebuild | 4 +- 6 files changed, 7 insertions(+), 324 deletions(-) delete mode 100644 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.1.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 6295d1a34a6f..4c68e025df18 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest index 469ebd47740c..35b8a20d2be4 100644 --- a/dev-util/nvidia-cuda-toolkit/Manifest +++ b/dev-util/nvidia-cuda-toolkit/Manifest @@ -1,8 +1,6 @@ AUX cuda-config.in 407 BLAKE2B 5f7a0d50d774db58c180b767f00bead7c7dbf5f6b3b4a2f960dfc3b8450f7abf5c2b67c6620c5318f1331646dd2003d61c70a4c31359efd16ff418ecc9d0b446 SHA512 363903b999c43a47a48c52e8898c6044fadcc66d259338ee22863e859c2bc9873a2f1392aa83c9182486d3aa4eaeb5f164cf8ccf29cc74fd8ad56245f76a039a DIST cuda_11.8.0_520.61.05_linux.run 4336730777 BLAKE2B cfdb4a51c49ee504e56a4a95de4e477ef207b678527cbb633c1e83e667f1a62c0f67038befd0b10f7ae24cda9c8bc5c54293d06a05b2e45be6cf677e40f71f17 SHA512 e96e1389abed34b5093b3a1d4e6ae9f3d4f8406621b1475f378efae65868657efce22da03b5b4e0a548d9635e406b8690b18b17b186d03ecb3ca0703c5d5787a -DIST cuda_12.3.1_545.23.08_linux.run 4368526618 BLAKE2B 45034e9f85dfff1e7fc9997ddbe80d739c02d07c888c595363744e598160b594f9026c621a0275f52f9f6636f69353ff8838372d97ab528a009c30662d65708c SHA512 d3708abc3652d2959cabbc999222caa4a2791bf6ec2ac963f57792aa83727aebf48c0a2524c25b3a7237f7fa8b90fc8303679e8eaeb5874c8eefd907290ae595 DIST cuda_12.3.2_545.23.08_linux.run 4368514070 BLAKE2B bfb6239b7669636e2ef424921f5a1dd99409a0351ea7d3453fcec3d484e714d87639e733cfae913b0f222d7af8acb7bebae340ea8af53fb7ab320805abb7b230 SHA512 dce569e42955fc351a6b52b2876948029d5183bb000754f0cdcba754673a280acfd4c9e4d8cf61d572ed045de006e0bbb0e8ff32012e6cc336be9c05fd529340 EBUILD nvidia-cuda-toolkit-11.8.0-r4.ebuild 7972 BLAKE2B fbe811911b5b646f9a3ddb2bcd483f8ecdeb3f185e5d56ad1b4378276d3047d343efb20ac8f4fa186524254dc1917941161004811c131b17e90decaf31999b93 SHA512 a3f4511631efaaecbdf7489d04b4b8674db24ff6bf7ba61027dfb663da1eacd1db7f2bd2e21cb6b433f82f27f4f8900a9341d12371115c3e6d9f7ebcbd325fb2 -EBUILD nvidia-cuda-toolkit-12.3.1.ebuild 9379 BLAKE2B 7e30b69c3fabb8da6295d34661ad4ed3f6cb655b1d1988b77491126b1976c635a289650f5f1c8296b17c3fdad4eaaedcffc090535de5d41c1ac16fc83d7d27e4 SHA512 493c22dce36ae7003a66ce7d4cf58670a8bc7e97e92c9c96fbf01740020e26aac7e1eef87be99d3d24335ad92a9fedacd5c79aff8ecb27f927dd3d21e85836ea EBUILD nvidia-cuda-toolkit-12.3.2.ebuild 9379 BLAKE2B 1ec0cc7e10b9d1abda2afc89b14551b62b025aaa15c12756198bf085a5cd690cb09158ed73f3cab92e6e914daf024e38052bf3e006dd5e1f8b2394b430220850 SHA512 73d42738125ec3bf134d49ec727ae21fd150d19d2a086ca269cdf6e7d1dc0a13a6d46c6fe39446ee57ae4da35f685d4505ca8bc1b5fbbdb46599690d7d4aa2fb MISC metadata.xml 761 BLAKE2B a6ae653c6206cbc05349297499b6dde91bce6d543e10bd5ea915cfe9729dfa6f1eb954ae09c2e4d3997f51315ae090b38606c21b5099e750596ea66fdd93e817 SHA512 9133517d805201d25b651e48abed90394c88ef33a2571ab20b3b19d365f85a90478486c7c087c9150d7d9f6e4026873c5236c64ed649fd3bfc8f9b81479dcc59 diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.1.ebuild deleted file mode 100644 index 8007ff67523f..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.3.1.ebuild +++ /dev/null @@ -1,318 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit check-reqs toolchain-funcs unpacker - -DRIVER_PV="545.23.08" - -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 examples nsight profiler rdma vis-profiler sanitizer" -RESTRICT="bindist mirror" - -# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the -# actual required minimum driver version are different. -RDEPEND=" - =x11-drivers/nvidia-drivers-525.60.13 - examples? ( - media-libs/freeglut - media-libs/glu - ) - nsight? ( - dev-libs/libpfm - dev-libs/wayland - dev-qt/qtwayland:6 - || ( - dev-libs/openssl-compat:1.1.1 - dev-libs/openssl:0/1.1 - ) - media-libs/tiff-compat:4 - sys-libs/zlib - ) - rdma? ( sys-cluster/rdma-core ) - vis-profiler? ( - >=virtual/jre-1.8:* - )" -BDEPEND="nsight? ( dev-util/patchelf )" - -QA_PREBUILT="opt/cuda/*" -CHECKREQS_DISK_BUILD="15000M" - -pkg_setup() { - check-reqs_pkg_setup -} - -src_prepare() { - # ATTENTION: change requires revbump, see link below for supported GCC # versions - # https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements - local cuda_supported_gcc="8.5 9.5 10 11 12" - - 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,demo_suite,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,opencl} - builds/lib{cublas,cufft,cufile,curand,cusolver,cusparse,npp,nvjitlink,nvjpeg} - builds/nvidia_fs - $(usex profiler "builds/cuda_nvprof builds/cuda_cupti builds/cuda_profiler_api" "") - $(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 debugger && ldpathextradirs+=":${ecudadir}/extras/Debugger/lib64" - 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}/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/QdstrmImporter - ${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/TreeLauncherSubreaper - ${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper - ${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu - ) - - dobin builds/integration/nsight-compute/{ncu,ncu-ui} - eend $? - - # remove rdma libs (unless USE=rdma) - if ! use rdma; then - rm -r "${ED}"/${cudadir}/${ncu_dir}/host/target-linux-x64/CollectX || die - fi - - 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 - ${nsys_dir}/target-linux-x64/CudaGpuInfoDumper - ) - - # remove rdma libs (unless USE=rdma) - if ! use rdma; then - rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-x64/CollectX || die - fi - - dobin builds/integration/nsight-systems/{nsight-sys,nsys,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 - - # fix broken RPATHs - patchelf --set-rpath '$ORIGIN' "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{libarrow.so,libparquet.so.500.0.0} || die - patchelf --set-rpath '$ORIGIN' "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/{libarrow.so,libparquet.so.500.0.0} || die - - # 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/lib{crypto,ssl}.so* || die - rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.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 - - if use examples; then - local exes=( - extras/demo_suite/bandwidthTest - extras/demo_suite/busGrind - extras/demo_suite/deviceQuery - extras/demo_suite/nbody - extras/demo_suite/oceanFFT - extras/demo_suite/randomFog - extras/demo_suite/vectorAdd - ) - - # set executable bit on demo_suite binaries - for f in "${exes[@]}"; do - fperms +x ${cudadir}/${f} - done - else - rm -r "${ED}"/${cudadir}/extras/demo_suite || die - fi - - # remove rdma libs (unless USE=rdma) - if ! use rdma; then - rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die - fi - - # Add include and lib symlinks - dosym targets/x86_64-linux/include ${cudadir}/include - dosym targets/x86_64-linux/lib ${cudadir}/lib64 - - # Remove bad symlinks - rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die - rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/lib64 || die - - 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 -} - -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 -} diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest index 63f6d3f14e67..531ca16fc6a5 100644 --- a/dev-util/source-highlight/Manifest +++ b/dev-util/source-highlight/Manifest @@ -2,5 +2,5 @@ AUX source-highlight-3.1.9-test-clang-p1.patch 998 BLAKE2B 7867aff751170990c4834 AUX source-highlight-3.1.9-test-clang-p2.patch 1413 BLAKE2B f66b090bb5004cf4ee344868479b1a1999339d71799e6e6150104f99c0a8ea5ffebe836b8d185ecb52416aaed6da80e24c5870910274ce381cfab6ab3276035c SHA512 a6573d376753dda6e8f64dd9b81c4e8f209ea5cb3dee1dc9a495db6b671d88840baa2fd9c128085cb62d9acbc41e1f88d3a9e6a319b76199755b43008d7ab0de DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195 EBUILD source-highlight-3.1.9-r1.ebuild 1476 BLAKE2B 3e58b200d93c08decbaf5da28a760977189860c8967df8ebf349e79ecc0adbb7db506eed49efa361c8861954d6975fe58193a7aa878c787012b61be95e71320e SHA512 262e274d0266f9272e125e6f74074c201e379278a96439653261084fd7195c98e5491fbfa0a1c3d796281e70771c0f04ccd082417d934537137302c4084800c7 -EBUILD source-highlight-3.1.9-r2.ebuild 1820 BLAKE2B f0f3eecc97c929f299444525be120a6b15f59a62866e4a287a12ef8ac1e7dd2a7bb2d5d1ae46423951152381163d5fb698ed4047203bf8732d76b7a2864671a2 SHA512 7f5ea4384b1feac3475cf6b42f7056de60d1535c65734c53dae6b297f0f1ca2ac855f140aaec3afd9584c635055cadbc7db812d6cf0d9050d4752dccc102763a -MISC metadata.xml 268 BLAKE2B 8482f168e8ebdc914b137d3b41df6840c3478b8898d5278c5d43742538d0edb403505d66583f44b142b094f8735777d79637b69b6fcb3b7cd7026e415eb48e58 SHA512 433cd6a955f0104f3767d50ab08e08e79c8ca4276a56c2cd284692472cf5f19918d1ff22539eedf0232224193c15d6c84198c95647ed390f2b520d05211de721 +EBUILD source-highlight-3.1.9-r2.ebuild 1816 BLAKE2B 1359730b8418435f62a0b66341755f4f9be190346696cd2c49cdd9e062aabad7f110c56744ce3c613f8ed46227ae3c5d57c7a9e13218cdc5cf046f83f8ecec62 SHA512 3e248142c2a9dc2dd01f7d4a81a74ee9b5b600d444d1780d1929685bdb0b82322e2367b3c07b25fe81d10ddda8e1139158a7e5aca82c96fe1778a21399bacc09 +MISC metadata.xml 351 BLAKE2B a4103383ac6ac5c6ed7cc8e7676069e9c07024a67a18b918640eb4916a5b8a97ea420562191c373c50df7e894792ad6b649bef0a69f400fc4a5b2eeb8dea9fd2 SHA512 a90448ff9f048e710be707a78ac64b973addeba03ad30c109cc5e6a04f3106e503be8521f5356f00f7d2f4f05f2b47dffde245838a92d9454310103c1c67c117 diff --git a/dev-util/source-highlight/metadata.xml b/dev-util/source-highlight/metadata.xml index 811124770299..ba02d833e96e 100644 --- a/dev-util/source-highlight/metadata.xml +++ b/dev-util/source-highlight/metadata.xml @@ -5,4 +5,7 @@ toolchain@gentoo.org Gentoo Toolchain Project + + src-highlite + diff --git a/dev-util/source-highlight/source-highlight-3.1.9-r2.ebuild b/dev-util/source-highlight/source-highlight-3.1.9-r2.ebuild index cb29e05a42f8..f15cac496e2b 100644 --- a/dev-util/source-highlight/source-highlight-3.1.9-r2.ebuild +++ b/dev-util/source-highlight/source-highlight-3.1.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,8 +10,8 @@ HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html" SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz" LICENSE="GPL-3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" SLOT="0" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc static-libs test" RESTRICT="!test? ( test )" -- cgit v1.2.3