[arch-commits] Commit in cuda/trunk (PKGBUILD)

[Konstantin Gizdov]

    Date: Monday, March 1, 2021 @ 10:47:45
  Author: kgizdov
Revision: 876381

upgpkg: cuda 11.2.1-3: let makepkg resolve lib versions; move samples to cuda-tools; fix EULA and some optdepts

Modified:
  cuda/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-01 10:44:00 UTC (rev 876380)
+++ PKGBUILD	2021-03-01 10:47:45 UTC (rev 876381)
@@ -4,7 +4,7 @@
 pkgbase=cuda
 pkgver=11.2.1
 _driverver=460.32.03
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone"
@@ -11,8 +11,6 @@
 license=('custom:NVIDIA')
 depends=('gcc-libs'  'gcc' 'opencl-nvidia' 'nvidia-utils' 'python')
 replaces=('cuda-toolkit' 'cuda-sdk')
-provides=('cuda-toolkit' 'cuda-sdk' "libcudart.so=$pkgver" "libcublas.so=$pkgver" "libcusolver.so=$pkgver" "libcusparse.so=$pkgver")
-optdepends=('gdb: for cuda-gdb')
 options=(!strip staticlibs)
 install=cuda.install
 source=(http://developer.download.nvidia.com/compute/cuda/${pkgver}/local_installers/cuda_${pkgver}_${_driverver}_linux.run
@@ -124,7 +122,7 @@
   cp "${srcdir}"/*.pc "${_prepdir}"/usr/lib/pkgconfig
 
   mkdir -p "${_prepdir}/usr/share/licenses/${pkgname}"
-  ln -s /opt/cuda/doc/pdf/EULA.pdf "${_prepdir}/usr/share/licenses/${pkgname}/EULA.pdf"
+  ln -s /opt/cuda/EULA.txt "${_prepdir}/usr/share/licenses/${pkgname}/EULA.txt"
 
   # Allow newer compilers to work. This is not officially supported in the Arch package but
   # if users want to try, let them try.
@@ -141,6 +139,9 @@
 
 package_cuda() {
   replaces+=('cuda-static')
+  provides=('cuda-sdk' 'libcudart.so' 'libcublas.so' 'libcusolver.so' 'libcusparse.so')
+  optdepends=('gdb: for cuda-gdb'
+              'glu: required for some profiling tools in CUPTI')
 
   local _prepdir="${srcdir}/prep"
 
@@ -147,12 +148,16 @@
   cd "${_prepdir}"
   cp -al * "${pkgdir}"
 
-  rm -r "${pkgdir}"/opt/cuda/{bin/nvvp,bin/computeprof,libnvvp,nsight*}
+  rm -r "${pkgdir}"/opt/cuda/{bin/nvvp,bin/computeprof,libnvvp,nsight*,samples}
 }
 
 package_cuda-tools() {
   pkgdesc="NVIDIA's GPU programming toolkit (extra tools: nvvp, nsight)"
   depends=('cuda' 'java-runtime=8' 'nss')
+  optdepends=('glu: required for some CUDA samples'
+              'freeglut: required for some CUDA samples'
+              'perl: required by some NVVP plugins')
+  provides=('cuda-toolkit')
 
   local _prepdir="${srcdir}/prep"
 
@@ -160,7 +165,7 @@
   mv "${_prepdir}"/opt/cuda/nsight* "${pkgdir}/opt/cuda"
   mv "${_prepdir}"/opt/cuda/bin/nvvp "${pkgdir}/opt/cuda/bin/nvvp"
   mv "${_prepdir}"/opt/cuda/bin/computeprof "${pkgdir}/opt/cuda/bin/computeprof"
-  mv "${_prepdir}"/opt/cuda/libnvvp "${pkgdir}/opt/cuda"
+  mv "${_prepdir}"/opt/cuda/{libnvvp,samples} "${pkgdir}/opt/cuda"
 }
 
 # vim:set ts=2 sw=2 et: