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

2020-12-28 Thread Sven-Hendrik Haase via arch-commits
Date: Tuesday, December 29, 2020 @ 07:41:37
  Author: svenstaro
Revision: 796418

upgpkg: cuda 11.2.0-2: Split up package (FS#69021)

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   83 ++---
 1 file changed, 58 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-29 02:12:12 UTC (rev 796417)
+++ PKGBUILD2020-12-29 07:41:37 UTC (rev 796418)
@@ -1,18 +1,18 @@
 # Maintainer: Sven-Hendrik Haase 
 # Maintainer: Konstantin Gizdov 
-pkgname=cuda
+pkgname=(cuda cuda-tools cuda-static)
+pkgbase=cuda
 pkgver=11.2.0
 _driverver=460.27.04
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
 license=('custom:NVIDIA')
-depends=('gcc-libs'  'gcc' 'opencl-nvidia' 'nvidia-utils')
+depends=('gcc-libs'  'gcc' 'opencl-nvidia' 'nvidia-utils' 'python')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
-optdepends=('gdb: for cuda-gdb'
-'java-runtime=8: for nsight and nvvp')
+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
@@ -62,50 +62,83 @@
   done
 }
 
-package() {
+build() {
+  local _prepdir="${srcdir}/prep"
+
   cd "${srcdir}/builds"
 
   rm -r NVIDIA*.run bin
-  mkdir -p "${pkgdir}/opt/cuda/extras"
-  mv cuda_samples "${pkgdir}/opt/cuda/samples"
-  mv integration nsight_compute nsight_systems EULA.txt "${pkgdir}/opt/cuda"
-  mv cuda_sanitizer_api/compute-sanitizer 
"${pkgdir}/opt/cuda/extras/compute-sanitizer"
+  mkdir -p "${_prepdir}/opt/cuda/extras"
+  mv cuda_samples "${_prepdir}/opt/cuda/samples"
+  mv integration nsight_compute nsight_systems EULA.txt "${_prepdir}/opt/cuda"
+  mv cuda_sanitizer_api/compute-sanitizer 
"${_prepdir}/opt/cuda/extras/compute-sanitizer"
   rmdir cuda_sanitizer_api
   for lib in *; do
-cp -r $lib/* "${pkgdir}/opt/cuda/"
+cp -r $lib/* "${_prepdir}/opt/cuda/"
   done
 
+  # Delete some unnecessary files
+  rm -r 
"${_prepdir}"/opt/cuda/{bin/cuda-uninstaller,samples/bin/cuda-uninstaller}
+
   # Define compilers for CUDA to use.
   # This allows us to use older versions of GCC if we have to.
-  ln -s /usr/bin/gcc "${pkgdir}/opt/cuda/bin/gcc"
-  ln -s /usr/bin/g++ "${pkgdir}/opt/cuda/bin/g++"
+  ln -s /usr/bin/gcc "${_prepdir}/opt/cuda/bin/gcc"
+  ln -s /usr/bin/g++ "${_prepdir}/opt/cuda/bin/g++"
 
   # Install profile and ld.so.config files
-  install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
-  install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"
+  install -Dm755 "${srcdir}/cuda.sh" "${_prepdir}/etc/profile.d/cuda.sh"
+  install -Dm644 "${srcdir}/cuda.conf" "${_prepdir}/etc/ld.so.conf.d/cuda.conf"
 
   # Install pkgconfig files
-  mkdir -p "$pkgdir"/usr/lib/pkgconfig
-  cp "${srcdir}"/*.pc "${pkgdir}"/usr/lib/pkgconfig
+  mkdir -p "$_prepdir"/usr/lib/pkgconfig
+  cp "${srcdir}"/*.pc "${_prepdir}"/usr/lib/pkgconfig
 
-  mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-  ln -s /opt/cuda/doc/pdf/EULA.pdf 
"${pkgdir}/usr/share/licenses/${pkgname}/EULA.pdf"
+  mkdir -p "${_prepdir}/usr/share/licenses/${pkgname}"
+  ln -s /opt/cuda/doc/pdf/EULA.pdf 
"${_prepdir}/usr/share/licenses/${pkgname}/EULA.pdf"
 
   # Allow newer compilers to work. This is not officially supported in the 
Arch package but
   # if users want to try, let them try.
   # See 
https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
   # for official requirements
-  sed -i "/.*unsupported GNU version.*/d" 
"${pkgdir}"/opt/cuda/targets/x86_64-linux/include/crt/host_config.h
-  sed -i "/.*unsupported clang version.*/d" 
"${pkgdir}"/opt/cuda/targets/x86_64-linux/include/crt/host_config.h
+  sed -i "/.*unsupported GNU version.*/d" 
"${_prepdir}"/opt/cuda/targets/x86_64-linux/include/crt/host_config.h
+  sed -i "/.*unsupported clang version.*/d" 
"${_prepdir}"/opt/cuda/targets/x86_64-linux/include/crt/host_config.h
 
   # Fix Makefile paths to CUDA
-  for f in $(find "$pkgdir"/opt/cuda -name Makefile); do
+  for f in $(find "$_prepdir"/opt/cuda -name Makefile); do
 sed -i "s|/usr/local/cuda|/opt/cuda|g" "$f"
   done
+}
 
-  # NVIDIA has trouble with counting and numbering 
-  # as well as the elusive concept of a SONAME so...
-  ln -s /opt/cuda/targets/x86_64-linux/lib/libcudart.so.11.1.74 
"${pkgdir}/opt/cuda/targets/x86_64-linux/lib/libcudart.so.11.1"
+package_cuda() {
+  local _prepdir="${srcdir}/prep"
+
+  cd "${_prepdir}"
+  cp -al * "${pkgdir}"
+
+  rm -r 
"${pkgdir}"/opt/cuda/{bin/nvvp,bin/computeprof,libnvvp,nsight*,targets/x86_64-linux/lib/*.a}
 }
 
+package_cuda-tools() {
+  pkgdesc="NVIDIA's GPU programming toolkit (extra tools: nvvp, nsight)"
+  depends=('cuda' 'java-runtime=8' 'nss')
+
+  local _prepdi

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

2020-12-16 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, December 16, 2020 @ 09:08:33
  Author: svenstaro
Revision: 776402

upgpkg: cuda 11.2.0-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-16 09:07:39 UTC (rev 776401)
+++ PKGBUILD2020-12-16 09:08:33 UTC (rev 776402)
@@ -1,9 +1,8 @@
 # Maintainer: Sven-Hendrik Haase 
 # Maintainer: Konstantin Gizdov 
 pkgname=cuda
-pkgver=11.1.1
-_driverver=455.32.00
-_reqdriverver=455.32
+pkgver=11.2.0
+_driverver=460.27.04
 pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
@@ -21,7 +20,7 @@
 cuda.conf
 cuda-findgllib_mk.diff
 *.pc)
-sha512sums=('3da629e6f63548d06050a77d6ad2dbf314db33b2bf4e7d1659f039b3d9ad2ad3f87a6e506ec54db9ca2d21ac7b5ec576748082684bbab3b6642c03d2793d73a9'
+sha512sums=('0aa7390490b93be7f359327a8fe364a44b538e742c7ccd560e9bbb40ed8613539c37fcb4aa71a2fbfa0bfdb0416ab43bbdcc09cd0c81db3f1a07b37318d6b2b3'
 
'79aa6fbeff13a2bcef5791c2288d4b072dfe7b17593261ee79302dc6c77ae368e73f5cac9ce38893fc0068e4895f5cde475faf507fac058fb697c8da3198587f'
 
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b'


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

2020-11-03 Thread Sven-Hendrik Haase via arch-commits
Date: Tuesday, November 3, 2020 @ 10:52:15
  Author: svenstaro
Revision: 741159

upgpkg: cuda 11.1.1-1

Modified:
  cuda/trunk/PKGBUILD
  cuda/trunk/cuda.sh

--+
 PKGBUILD |   12 ++--
 cuda.sh  |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-03 10:42:58 UTC (rev 741158)
+++ PKGBUILD2020-11-03 10:52:15 UTC (rev 741159)
@@ -1,10 +1,10 @@
 # Maintainer: Sven-Hendrik Haase 
 # Maintainer: Konstantin Gizdov 
 pkgname=cuda
-pkgver=11.1.0
-_driverver=455.23.05
-_reqdriverver=455.23
-pkgrel=2
+pkgver=11.1.1
+_driverver=455.32.00
+_reqdriverver=455.32
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
@@ -21,8 +21,8 @@
 cuda.conf
 cuda-findgllib_mk.diff
 *.pc)
-sha512sums=('b5d64f20dbb51f12c558be4a724c18ddcd6d18670036efb63d19bb8009300463b8051dd1a2d2d7768bf3076681954ea690af399651da832ba00867a3f4a9acdf'
-
'b3691913027b8390161c7412d87a905712d90434cc82027a52f203f8ae3dda755738f734f8190277471e4541d685b524568ad03af58d4b7ebad346eee11c10e4'
+sha512sums=('3da629e6f63548d06050a77d6ad2dbf314db33b2bf4e7d1659f039b3d9ad2ad3f87a6e506ec54db9ca2d21ac7b5ec576748082684bbab3b6642c03d2793d73a9'
+
'79aa6fbeff13a2bcef5791c2288d4b072dfe7b17593261ee79302dc6c77ae368e73f5cac9ce38893fc0068e4895f5cde475faf507fac058fb697c8da3198587f'
 
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b'
 
'a4b3b03682801a98a1d8c1d14c084fd35efd384d92d497e230e3a28e0bd97b1fa48a93ccb2150f892f0b4154ca4ea2d66f5484a6a59b5c9b49963de42ecf1736'

Modified: cuda.sh
===
--- cuda.sh 2020-11-03 10:42:58 UTC (rev 741158)
+++ cuda.sh 2020-11-03 10:52:15 UTC (rev 741159)
@@ -1,2 +1,2 @@
 export CUDA_PATH=/opt/cuda
-export PATH=$PATH:/opt/cuda/bin
+export 
PATH=$PATH:/opt/cuda/bin:/opt/cuda/integration/nsight-compute:/opt/cuda/integration/nsight-systems


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

2020-09-29 Thread Konstantin Gizdov via arch-commits
Date: Tuesday, September 29, 2020 @ 09:37:05
  Author: kgizdov
Revision: 713712

add a symlink for libcudart with broken SONAME

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-29 09:28:19 UTC (rev 713711)
+++ PKGBUILD2020-09-29 09:37:05 UTC (rev 713712)
@@ -4,7 +4,7 @@
 pkgver=11.1.0
 _driverver=455.23.05
 _reqdriverver=455.23
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
@@ -103,6 +103,10 @@
   for f in $(find "$pkgdir"/opt/cuda -name Makefile); do
 sed -i "s|/usr/local/cuda|/opt/cuda|g" "$f"
   done
+
+  # NVIDIA has trouble with counting and numbering 
+  # as well as the elusive concept of a SONAME so...
+  ln -s /opt/cuda/targets/x86_64-linux/lib/libcudart.so.11.1.74 
"${pkgdir}/opt/cuda/targets/x86_64-linux/lib/libcudart.so.11.1"
 }
 
 # vim:set ts=2 sw=2 et:


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

2020-09-28 Thread Konstantin Gizdov via arch-commits
Date: Monday, September 28, 2020 @ 12:59:55
  Author: kgizdov
Revision: 712986

upgpkg: cuda 11.1.0-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-28 12:59:40 UTC (rev 712985)
+++ PKGBUILD2020-09-28 12:59:55 UTC (rev 712986)
@@ -1,14 +1,15 @@
 # Maintainer: Sven-Hendrik Haase 
 # Maintainer: Konstantin Gizdov 
 pkgname=cuda
-pkgver=11.0.3
-_driverver=450.51.06
+pkgver=11.1.0
+_driverver=455.23.05
+_reqdriverver=455.23
 pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
 license=('custom:NVIDIA')
-depends=('gcc9-libs'  'gcc9' 'opencl-nvidia' "nvidia-utils>=${_driverver}")
+depends=('gcc-libs'  'gcc' 'opencl-nvidia' 'nvidia-utils')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'
@@ -20,7 +21,7 @@
 cuda.conf
 cuda-findgllib_mk.diff
 *.pc)
-sha512sums=('e7014c868c0bf40c000b1fd14d156265773a399782937cc85a2b09cd62abddcacdc20b412e1cc91c3877d01563cf054b1e021f047b32cfff4ab516e7167382dd'
+sha512sums=('b5d64f20dbb51f12c558be4a724c18ddcd6d18670036efb63d19bb8009300463b8051dd1a2d2d7768bf3076681954ea690af399651da832ba00867a3f4a9acdf'
 
'b3691913027b8390161c7412d87a905712d90434cc82027a52f203f8ae3dda755738f734f8190277471e4541d685b524568ad03af58d4b7ebad346eee11c10e4'
 
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b'
@@ -69,7 +70,7 @@
   mkdir -p "${pkgdir}/opt/cuda/extras"
   mv cuda_samples "${pkgdir}/opt/cuda/samples"
   mv integration nsight_compute nsight_systems EULA.txt "${pkgdir}/opt/cuda"
-  mv cuda_sanitizer_api/Sanitizer "${pkgdir}/opt/cuda/extras/Sanitizer"
+  mv cuda_sanitizer_api/compute-sanitizer 
"${pkgdir}/opt/cuda/extras/compute-sanitizer"
   rmdir cuda_sanitizer_api
   for lib in *; do
 cp -r $lib/* "${pkgdir}/opt/cuda/"
@@ -77,8 +78,8 @@
 
   # Define compilers for CUDA to use.
   # This allows us to use older versions of GCC if we have to.
-  ln -s /usr/bin/gcc-9 "${pkgdir}/opt/cuda/bin/gcc"
-  ln -s /usr/bin/g++-9 "${pkgdir}/opt/cuda/bin/g++"
+  ln -s /usr/bin/gcc "${pkgdir}/opt/cuda/bin/gcc"
+  ln -s /usr/bin/g++ "${pkgdir}/opt/cuda/bin/g++"
 
   # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
@@ -105,4 +106,3 @@
 }
 
 # vim:set ts=2 sw=2 et:
-


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

2020-09-02 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, September 2, 2020 @ 08:07:50
  Author: svenstaro
Revision: 696263

upgpkg: cuda 11.0.3-1

Modified:
  cuda/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-09-02 03:53:39 UTC (rev 696262)
+++ PKGBUILD2020-09-02 08:07:50 UTC (rev 696263)
@@ -1,8 +1,8 @@
 # Maintainer: Sven-Hendrik Haase 
 # Maintainer: Konstantin Gizdov 
 pkgname=cuda
-pkgver=11.0.2
-_driverver=450.51.05
+pkgver=11.0.3
+_driverver=450.51.06
 pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
@@ -20,7 +20,7 @@
 cuda.conf
 cuda-findgllib_mk.diff
 *.pc)
-sha512sums=('b20853fe7106c50b05419879172cbbfc3bb3deb381acbd8db3e6363e9963d4c944002da77014787cce3fe5151064c70436311892b6335579aa5b765cc6191d16'
+sha512sums=('e7014c868c0bf40c000b1fd14d156265773a399782937cc85a2b09cd62abddcacdc20b412e1cc91c3877d01563cf054b1e021f047b32cfff4ab516e7167382dd'
 
'b3691913027b8390161c7412d87a905712d90434cc82027a52f203f8ae3dda755738f734f8190277471e4541d685b524568ad03af58d4b7ebad346eee11c10e4'
 
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b'


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

2020-07-12 Thread Sven-Hendrik Haase via arch-commits
Date: Monday, July 13, 2020 @ 05:58:30
  Author: svenstaro
Revision: 663402

Require nvidia-utils in correct version (FS#67186)

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-13 05:52:23 UTC (rev 663401)
+++ PKGBUILD2020-07-13 05:58:30 UTC (rev 663402)
@@ -8,7 +8,7 @@
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
 license=('custom:NVIDIA')
-depends=('gcc9-libs'  'gcc9' 'opencl-nvidia' 'nvidia-utils')
+depends=('gcc9-libs'  'gcc9' 'opencl-nvidia' "nvidia-utils>=${_driverver}")
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'


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

2020-07-08 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, July 8, 2020 @ 19:09:12
  Author: svenstaro
Revision: 661759

upgpkg: cuda 11.0.2-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-08 18:35:56 UTC (rev 661758)
+++ PKGBUILD2020-07-08 19:09:12 UTC (rev 661759)
@@ -1,8 +1,8 @@
 # Maintainer: Sven-Hendrik Haase 
 # Maintainer: Konstantin Gizdov 
 pkgname=cuda
-pkgver=11.0.1
-_driverver=450.36.06
+pkgver=11.0.2
+_driverver=450.51.05
 pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
@@ -15,12 +15,12 @@
 'java-runtime=8: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(http://developer.download.nvidia.com/compute/cuda/11.0.1/local_installers/cuda_${pkgver}_${_driverver}_linux.run
+source=(http://developer.download.nvidia.com/compute/cuda/${pkgver}/local_installers/cuda_${pkgver}_${_driverver}_linux.run
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff
 *.pc)
-sha512sums=('91228fd065a3f93ef0b56f158bb372bb4c4f7b0d6b691939a325eed660a19bf748042b58d49b77da9501e5f23b3d2d572aeda988574e9f54e03d3bcf0da25a01'
+sha512sums=('b20853fe7106c50b05419879172cbbfc3bb3deb381acbd8db3e6363e9963d4c944002da77014787cce3fe5151064c70436311892b6335579aa5b765cc6191d16'
 
'b3691913027b8390161c7412d87a905712d90434cc82027a52f203f8ae3dda755738f734f8190277471e4541d685b524568ad03af58d4b7ebad346eee11c10e4'
 
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b'


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

2020-06-14 Thread Sven-Hendrik Haase via arch-commits
Date: Monday, June 15, 2020 @ 03:42:00
  Author: svenstaro
Revision: 644764

upgpkg: cuda 11.0.1-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   55 +++
 1 file changed, 19 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-15 03:32:16 UTC (rev 644763)
+++ PKGBUILD2020-06-15 03:42:00 UTC (rev 644764)
@@ -1,14 +1,14 @@
 # Maintainer: Sven-Hendrik Haase 
 # Maintainer: Konstantin Gizdov 
 pkgname=cuda
-pkgver=10.2.89
-_driverver=440.33.01
-pkgrel=5
+pkgver=11.0.1
+_driverver=450.36.06
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
 license=('custom:NVIDIA')
-depends=('gcc8-libs'  'gcc8' 'opencl-nvidia' 'nvidia-utils')
+depends=('gcc9-libs'  'gcc9' 'opencl-nvidia' 'nvidia-utils')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'
@@ -15,12 +15,12 @@
 'java-runtime=8: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_${pkgver}_${_driverver}_linux.run
+source=(http://developer.download.nvidia.com/compute/cuda/11.0.1/local_installers/cuda_${pkgver}_${_driverver}_linux.run
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff
 *.pc)
-sha512sums=('ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e'
+sha512sums=('91228fd065a3f93ef0b56f158bb372bb4c4f7b0d6b691939a325eed660a19bf748042b58d49b77da9501e5f23b3d2d572aeda988574e9f54e03d3bcf0da25a01'
 
'b3691913027b8390161c7412d87a905712d90434cc82027a52f203f8ae3dda755738f734f8190277471e4541d685b524568ad03af58d4b7ebad346eee11c10e4'
 
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b'
@@ -57,40 +57,29 @@
   sh cuda_${pkgver}_${_driverver}_linux.run --target "${srcdir}" --noexec
 
   # Fix up samples tht use findgllib_mk
-  for f in builds/cuda-samples/*/*/findgllib.mk; do
+  for f in builds/cuda_samples/*/*/findgllib.mk; do
 patch $f cuda-findgllib_mk.diff
   done
 }
 
 package() {
-  mkdir -p "${pkgdir}/opt/"
-
   cd "${srcdir}/builds"
-  cp -r cuda-toolkit "${pkgdir}/opt/cuda"
-  cp -r cublas/include/* "${pkgdir}/opt/cuda/include/"
-  cp -r cublas/lib64/* "${pkgdir}/opt/cuda/lib64/"
-  cp -r cuda-samples "${pkgdir}/opt/cuda/samples"
-  ln -s /opt/cuda/targets/x86_64-linux/lib "${pkgdir}/opt/cuda/lib"
-  ln -s /opt/cuda/nvvm/lib64 "${pkgdir}/opt/cuda/nvvm/lib"
 
+  rm -r NVIDIA*.run bin
+  mkdir -p "${pkgdir}/opt/cuda/extras"
+  mv cuda_samples "${pkgdir}/opt/cuda/samples"
+  mv integration nsight_compute nsight_systems EULA.txt "${pkgdir}/opt/cuda"
+  mv cuda_sanitizer_api/Sanitizer "${pkgdir}/opt/cuda/extras/Sanitizer"
+  rmdir cuda_sanitizer_api
+  for lib in *; do
+cp -r $lib/* "${pkgdir}/opt/cuda/"
+  done
+
   # Define compilers for CUDA to use.
   # This allows us to use older versions of GCC if we have to.
-  ln -s /usr/bin/gcc-8 "${pkgdir}/opt/cuda/bin/gcc"
-  ln -s /usr/bin/g++-8 "${pkgdir}/opt/cuda/bin/g++"
+  ln -s /usr/bin/gcc-9 "${pkgdir}/opt/cuda/bin/gcc"
+  ln -s /usr/bin/g++-9 "${pkgdir}/opt/cuda/bin/g++"
 
-  # Create soname links.
-  # We have to be weird about this since for some reason the ELF SONAME is 
incorrect or at least partially incorrect for some libs.
-  # Best we can do is create all symlinks and hope for the best.
-  # Their installer used to perform this for us but now it's all manual and I 
think this is what we'll be stuck with for now.
-  find cuda-toolkit/targets -type f -name '*.so*' ! -path '*stubs/*' -print0 | 
while read -rd $'\0' _lib; do
-_base=${_lib%.so.*}
-_current_soname=$(basename ${_lib%.*})
-while [[ $_current_soname != $(basename $_base) ]]; do
-  ln -sf ${_lib##*/} ${pkgdir}/opt/cuda/lib64/$_current_soname
-  _current_soname=${_current_soname%.*}
-done
-  done
-
   # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
   install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"
@@ -102,12 +91,6 @@
   mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
   ln -s /opt/cuda/doc/pdf/EULA.pdf 
"${pkgdir}/usr/share/licenses/${pkgname}/EULA.pdf"
 
-  # Remove included copy of java and link to system java 8
-  rm -fr  "${pkgdir}/opt/cuda/jre"
-  sed 's|../jre/bin/java|/usr/lib/jvm/java-8-openjdk/jre/bin/java|g' \
--i "${pkgdir}/opt/cuda/libnsight/nsight.ini" \
--i "${pkgdir}/opt/cuda/libnvvp/nvvp.ini"
-
   # Allow newer compilers to work. This is not officially supp

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

2020-04-05 Thread Sven-Hendrik Haase via arch-commits
Date: Monday, April 6, 2020 @ 02:21:52
  Author: svenstaro
Revision: 612023

upgpkg: cuda 10.2.89-4: Allow clang to work (FS#66075)

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-06 00:46:07 UTC (rev 612022)
+++ PKGBUILD2020-04-06 02:21:52 UTC (rev 612023)
@@ -3,7 +3,7 @@
 pkgname=cuda
 pkgver=10.2.89
 _driverver=440.33.01
-pkgrel=3
+pkgrel=4
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
@@ -75,8 +75,12 @@
 -i "${pkgdir}/opt/cuda/libnsight/nsight.ini" \
 -i "${pkgdir}/opt/cuda/libnvvp/nvvp.ini"
 
-  # Allow GCC 9 to work
+  # Allow newer compilers to work. This is not officially supported in the 
Arch package but
+  # if users want to try, let them try.
+  # See 
https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
+  # for official requirements
   sed -i "/.*unsupported GNU version.*/d" 
"${pkgdir}"/opt/cuda/targets/x86_64-linux/include/crt/host_config.h
+  sed -i "/.*unsupported clang version.*/d" 
"${pkgdir}"/opt/cuda/targets/x86_64-linux/include/crt/host_config.h
 
   # Fix Makefile paths to CUDA
   for f in $(find "$pkgdir"/opt/cuda -name Makefile); do


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

2019-12-31 Thread Sven-Hendrik Haase via arch-commits
Date: Tuesday, December 31, 2019 @ 09:09:26
  Author: svenstaro
Revision: 545046

upgpkg: cuda 10.2.89-3

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-31 08:42:56 UTC (rev 545045)
+++ PKGBUILD2019-12-31 09:09:26 UTC (rev 545046)
@@ -3,7 +3,7 @@
 pkgname=cuda
 pkgver=10.2.89
 _driverver=440.33.01
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";


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

2019-12-07 Thread Konstantin Gizdov via arch-commits
Date: Saturday, December 7, 2019 @ 18:04:47
  Author: kgizdov
Revision: 536292

protobuf rebuild

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-07 17:17:46 UTC (rev 536291)
+++ PKGBUILD2019-12-07 18:04:47 UTC (rev 536292)
@@ -3,7 +3,7 @@
 pkgname=cuda
 pkgver=10.2.89
 _driverver=440.33.01
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";


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

2019-11-20 Thread Sven-Hendrik Haase via arch-commits
Date: Thursday, November 21, 2019 @ 00:56:59
  Author: svenstaro
Revision: 530975

upgpkg: cuda 10.2.89-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-20 22:11:51 UTC (rev 530974)
+++ PKGBUILD2019-11-21 00:56:59 UTC (rev 530975)
@@ -1,9 +1,9 @@
 # Maintainer: Sven-Hendrik Haase 
 # Maintainer: Konstantin Gizdov 
 pkgname=cuda
-pkgver=10.1.243
-_driverver=418.87.00
-pkgrel=2
+pkgver=10.2.89
+_driverver=440.33.01
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
@@ -15,11 +15,11 @@
 'java-runtime=8: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_${pkgver}_${_driverver}_linux.run
+source=(http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_${pkgver}_${_driverver}_linux.run
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-sha512sums=('f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe'
+sha512sums=('ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e'
 
'b3691913027b8390161c7412d87a905712d90434cc82027a52f203f8ae3dda755738f734f8190277471e4541d685b524568ad03af58d4b7ebad346eee11c10e4'
 
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b')


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

2019-10-29 Thread Sven-Hendrik Haase via arch-commits
Date: Tuesday, October 29, 2019 @ 08:11:58
  Author: svenstaro
Revision: 520876

upgpkg: cuda 10.1.243-2

Fix default path in sample Makefiles (FS#64170)

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-29 05:26:16 UTC (rev 520875)
+++ PKGBUILD2019-10-29 08:11:58 UTC (rev 520876)
@@ -1,9 +1,9 @@
 # Maintainer: Sven-Hendrik Haase 
-# Co-Maintainer: Konstantin Gizdov 
+# Maintainer: Konstantin Gizdov 
 pkgname=cuda
 pkgver=10.1.243
 _driverver=418.87.00
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
@@ -77,6 +77,11 @@
 
   # Allow GCC 9 to work
   sed -i "/.*unsupported GNU version.*/d" 
"${pkgdir}"/opt/cuda/targets/x86_64-linux/include/crt/host_config.h
+
+  # Fix Makefile paths to CUDA
+  for f in $(find "$pkgdir"/opt/cuda -name Makefile); do
+sed -i "s|/usr/local/cuda|/opt/cuda|g" "$f"
+  done
 }
 
 # vim:set ts=2 sw=2 et:


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

2019-08-19 Thread Sven-Hendrik Haase via arch-commits
Date: Monday, August 19, 2019 @ 23:30:11
  Author: svenstaro
Revision: 500226

upgpkg: cuda 10.1.243-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-19 20:46:50 UTC (rev 500225)
+++ PKGBUILD2019-08-19 23:30:11 UTC (rev 500226)
@@ -1,10 +1,9 @@
 # Maintainer: Sven-Hendrik Haase 
 # Co-Maintainer: Konstantin Gizdov 
 pkgname=cuda
-pkgver=10.1.168
-_basever=10.1.105
-_driverver=418.39
-pkgrel=4
+pkgver=10.1.243
+_driverver=418.87.00
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
@@ -16,20 +15,17 @@
 'java-runtime=8: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_${_basever}_${_driverver}_linux.run
-
https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.168_418.67_linux.run
+source=(http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_${pkgver}_${_driverver}_linux.run
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-sha512sums=('07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622'
-
'85635012ec7081e200fb46f973852939f9709e802f495c288d5f31ff1fbd283a578fdaca0afa8955e6e0c7ca6c4862428da5168e0938b48390952d8633350910'
+sha512sums=('f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe'
 
'b3691913027b8390161c7412d87a905712d90434cc82027a52f203f8ae3dda755738f734f8190277471e4541d685b524568ad03af58d4b7ebad346eee11c10e4'
 
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b')
 
 prepare() {
-  sh cuda_${_basever}_${_driverver}_linux.run --target "${srcdir}" --noexec
-  sh cuda_10.1.168_418.67_linux.run --target "${srcdir}" --noexec
+  sh cuda_${pkgver}_${_driverver}_linux.run --target "${srcdir}" --noexec
 
   # Fix up samples tht use findgllib_mk
   for f in builds/cuda-samples/*/*/findgllib.mk; do


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

2019-06-22 Thread Sven-Hendrik Haase via arch-commits
Date: Sunday, June 23, 2019 @ 06:04:12
  Author: svenstaro
Revision: 483013

upgpkg: cuda 10.1.168-4

Use gcc 8 again

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-23 06:02:20 UTC (rev 483012)
+++ PKGBUILD2019-06-23 06:04:12 UTC (rev 483013)
@@ -4,12 +4,12 @@
 pkgver=10.1.168
 _basever=10.1.105
 _driverver=418.39
-pkgrel=3
+pkgrel=4
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
 license=('custom:NVIDIA')
-depends=('gcc-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc')
+depends=('gcc8-libs'  'gcc8' 'opencl-nvidia' 'nvidia-utils')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'
@@ -50,8 +50,8 @@
 
   # Define compilers for CUDA to use.
   # This allows us to use older versions of GCC if we have to.
-  ln -s /usr/bin/gcc "${pkgdir}/opt/cuda/bin/gcc"
-  ln -s /usr/bin/g++ "${pkgdir}/opt/cuda/bin/g++"
+  ln -s /usr/bin/gcc-8 "${pkgdir}/opt/cuda/bin/gcc"
+  ln -s /usr/bin/g++-8 "${pkgdir}/opt/cuda/bin/g++"
 
   # Create soname links.
   # We have to be weird about this since for some reason the ELF SONAME is 
incorrect or at least partially incorrect for some libs.


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

2019-06-18 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, June 19, 2019 @ 04:59:33
  Author: svenstaro
Revision: 482302

upgpkg: cuda 10.1.168-3

Allow GCC 9 to work hopefully

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-19 04:51:31 UTC (rev 482301)
+++ PKGBUILD2019-06-19 04:59:33 UTC (rev 482302)
@@ -4,7 +4,7 @@
 pkgver=10.1.168
 _basever=10.1.105
 _driverver=418.39
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
@@ -48,7 +48,8 @@
   ln -s /opt/cuda/targets/x86_64-linux/lib "${pkgdir}/opt/cuda/lib"
   ln -s /opt/cuda/nvvm/lib64 "${pkgdir}/opt/cuda/nvvm/lib"
 
-  # Use GCC 8
+  # Define compilers for CUDA to use.
+  # This allows us to use older versions of GCC if we have to.
   ln -s /usr/bin/gcc "${pkgdir}/opt/cuda/bin/gcc"
   ln -s /usr/bin/g++ "${pkgdir}/opt/cuda/bin/g++"
 
@@ -77,6 +78,9 @@
   sed 's|../jre/bin/java|/usr/lib/jvm/java-8-openjdk/jre/bin/java|g' \
 -i "${pkgdir}/opt/cuda/libnsight/nsight.ini" \
 -i "${pkgdir}/opt/cuda/libnvvp/nvvp.ini"
+
+  # Allow GCC 9 to work
+  sed -i "/.*unsupported GNU version.*/d" 
"${pkgdir}"/opt/cuda/targets/x86_64-linux/include/crt/host_config.h
 }
 
 # vim:set ts=2 sw=2 et:


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

2019-06-17 Thread Sven-Hendrik Haase via arch-commits
Date: Tuesday, June 18, 2019 @ 01:47:58
  Author: svenstaro
Revision: 482060

upgpkg: cuda 10.1.168-2

Add CUDA_PATH to shell profile (Fixes FS#62915)

Modified:
  cuda/trunk/PKGBUILD
  cuda/trunk/cuda.sh

--+
 PKGBUILD |4 ++--
 cuda.sh  |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-18 01:29:16 UTC (rev 482059)
+++ PKGBUILD2019-06-18 01:47:58 UTC (rev 482060)
@@ -4,7 +4,7 @@
 pkgver=10.1.168
 _basever=10.1.105
 _driverver=418.39
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
@@ -23,7 +23,7 @@
 cuda-findgllib_mk.diff)
 
sha512sums=('07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622'
 
'85635012ec7081e200fb46f973852939f9709e802f495c288d5f31ff1fbd283a578fdaca0afa8955e6e0c7ca6c4862428da5168e0938b48390952d8633350910'
-
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
+
'b3691913027b8390161c7412d87a905712d90434cc82027a52f203f8ae3dda755738f734f8190277471e4541d685b524568ad03af58d4b7ebad346eee11c10e4'
 
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b')
 

Modified: cuda.sh
===
--- cuda.sh 2019-06-18 01:29:16 UTC (rev 482059)
+++ cuda.sh 2019-06-18 01:47:58 UTC (rev 482060)
@@ -1 +1,2 @@
+export CUDA_PATH=/opt/cuda
 export PATH=$PATH:/opt/cuda/bin


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

2019-05-15 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, May 15, 2019 @ 23:24:19
  Author: svenstaro
Revision: 467490

Prepare 10.1.168

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-15 22:46:19 UTC (rev 467489)
+++ PKGBUILD2019-05-15 23:24:19 UTC (rev 467490)
@@ -1,10 +1,10 @@
 # Maintainer: Sven-Hendrik Haase 
 # Co-Maintainer: Konstantin Gizdov 
 pkgname=cuda
-pkgver=10.1.105
+pkgver=10.1.168
 _basever=10.1.105
 _driverver=418.39
-pkgrel=12
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
@@ -17,10 +17,12 @@
 options=(!strip staticlibs)
 install=cuda.install
 
source=(https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_${_basever}_${_driverver}_linux.run
+
https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.168_418.67_linux.run
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
 
sha512sums=('07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622'
+
'85635012ec7081e200fb46f973852939f9709e802f495c288d5f31ff1fbd283a578fdaca0afa8955e6e0c7ca6c4862428da5168e0938b48390952d8633350910'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
 
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b')
@@ -27,6 +29,7 @@
 
 prepare() {
   sh cuda_${_basever}_${_driverver}_linux.run --target "${srcdir}" --noexec
+  sh cuda_10.1.168_418.67_linux.run --target "${srcdir}" --noexec
 
   # Fix up samples tht use findgllib_mk
   for f in builds/cuda-samples/*/*/findgllib.mk; do


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

2019-04-29 Thread Konstantin Gizdov via arch-commits
Date: Monday, April 29, 2019 @ 16:06:38
  Author: kgizdov
Revision: 456303

update url and quote vars

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-29 16:03:55 UTC (rev 456302)
+++ PKGBUILD2019-04-29 16:06:38 UTC (rev 456303)
@@ -7,7 +7,7 @@
 pkgrel=12
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
-url="http://www.nvidia.com/object/cuda_home.html";
+url="https://developer.nvidia.com/cuda-zone";
 license=('custom:NVIDIA')
 depends=('gcc-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc')
 replaces=('cuda-toolkit' 'cuda-sdk')
@@ -26,7 +26,7 @@
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b')
 
 prepare() {
-  sh cuda_${_basever}_${_driverver}_linux.run --target ${srcdir} --noexec
+  sh cuda_${_basever}_${_driverver}_linux.run --target "${srcdir}" --noexec
 
   # Fix up samples tht use findgllib_mk
   for f in builds/cuda-samples/*/*/findgllib.mk; do


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

2019-04-23 Thread Konstantin Gizdov via arch-commits
Date: Tuesday, April 23, 2019 @ 14:30:15
  Author: kgizdov
Revision: 453149

do not edit CUDA SONAMEs

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   24 +++-
 1 file changed, 11 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-23 14:30:08 UTC (rev 453148)
+++ PKGBUILD2019-04-23 14:30:15 UTC (rev 453149)
@@ -4,12 +4,11 @@
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=11
+pkgrel=12
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-makedepends=('patchelf')
 depends=('gcc-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
@@ -50,19 +49,17 @@
   ln -s /usr/bin/gcc "${pkgdir}/opt/cuda/bin/gcc"
   ln -s /usr/bin/g++ "${pkgdir}/opt/cuda/bin/g++"
 
-  # Create soname variants with patchelf.
+  # Create soname links.
   # We have to be weird about this since for some reason the ELF SONAME is 
incorrect or at least partially incorrect for some libs.
-  # Best we can do is copy those libs to *.so.10.1 variants, patchelf the 
SONAME and hope for the best.
+  # Best we can do is create all symlinks and hope for the best.
   # Their installer used to perform this for us but now it's all manual and I 
think this is what we'll be stuck with for now.
-  cd "${pkgdir}/opt/cuda/targets/x86_64-linux/lib"
-  find "${pkgdir}"/opt/cuda/targets/x86_64-linux/lib -type l -name "*.so.10" ! 
-path "*stubs/*" -print0 | while read -rd $'\0' _lib; do
-_current_soname=$(basename ${_lib})
-if [ ! -f "${_current_soname}.1" ]; then
-  echo "copying ${_current_soname} to ${_current_soname}.1 version"
-  cp ${_current_soname} "${_current_soname}.1"
-  echo "patching ${_current_soname}.1 SONAME to match ${_current_soname}.1"
-  patchelf --set-soname "${_current_soname}.1" "${_current_soname}.1"
-fi
+  find cuda-toolkit/targets -type f -name '*.so*' ! -path '*stubs/*' -print0 | 
while read -rd $'\0' _lib; do
+_base=${_lib%.so.*}
+_current_soname=$(basename ${_lib%.*})
+while [[ $_current_soname != $(basename $_base) ]]; do
+  ln -sf ${_lib##*/} ${pkgdir}/opt/cuda/lib64/$_current_soname
+  _current_soname=${_current_soname%.*}
+done
   done
 
   # Install profile and ld.so.config files
@@ -80,3 +77,4 @@
 }
 
 # vim:set ts=2 sw=2 et:
+


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

2019-04-21 Thread Konstantin Gizdov via arch-commits
Date: Monday, April 22, 2019 @ 00:38:58
  Author: kgizdov
Revision: 452852

make sure to split on null chars

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-21 19:27:30 UTC (rev 452851)
+++ PKGBUILD2019-04-22 00:38:58 UTC (rev 452852)
@@ -55,7 +55,7 @@
   # Best we can do is copy those libs to *.so.10.1 variants, patchelf the 
SONAME and hope for the best.
   # Their installer used to perform this for us but now it's all manual and I 
think this is what we'll be stuck with for now.
   cd "${pkgdir}/opt/cuda/targets/x86_64-linux/lib"
-  find "${pkgdir}"/opt/cuda/targets/x86_64-linux/lib -type l -name "*.so.10" ! 
-path "*stubs/*" -print0 | while read -rd '' _lib; do
+  find "${pkgdir}"/opt/cuda/targets/x86_64-linux/lib -type l -name "*.so.10" ! 
-path "*stubs/*" -print0 | while read -rd $'\0' _lib; do
 _current_soname=$(basename ${_lib})
 if [ ! -f "${_current_soname}.1" ]; then
   echo "copying ${_current_soname} to ${_current_soname}.1 version"
@@ -80,4 +80,3 @@
 }
 
 # vim:set ts=2 sw=2 et:
-


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

2019-04-11 Thread Konstantin Gizdov via arch-commits
Date: Thursday, April 11, 2019 @ 16:37:11
  Author: kgizdov
Revision: 451140

point directly to jre8 binaries

Modified:
  cuda/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-04-11 16:33:43 UTC (rev 451139)
+++ PKGBUILD2019-04-11 16:37:11 UTC (rev 451140)
@@ -4,7 +4,7 @@
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=10
+pkgrel=11
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -72,9 +72,9 @@
   mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
   ln -s /opt/cuda/doc/pdf/EULA.pdf 
"${pkgdir}/usr/share/licenses/${pkgname}/EULA.pdf"
 
-  # Remove included copy of java and link to system java
+  # Remove included copy of java and link to system java 8
   rm -fr  "${pkgdir}/opt/cuda/jre"
-  sed 's|../jre/bin/java|/usr/bin/java|g' \
+  sed 's|../jre/bin/java|/usr/lib/jvm/java-8-openjdk/jre/bin/java|g' \
 -i "${pkgdir}/opt/cuda/libnsight/nsight.ini" \
 -i "${pkgdir}/opt/cuda/libnvvp/nvvp.ini"
 }


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

2019-04-11 Thread Konstantin Gizdov via arch-commits
Date: Thursday, April 11, 2019 @ 15:38:25
  Author: kgizdov
Revision: 451126

automatically find and fix SONAMEs

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   35 +++
 1 file changed, 11 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-11 15:24:25 UTC (rev 451125)
+++ PKGBUILD2019-04-11 15:38:25 UTC (rev 451126)
@@ -4,7 +4,7 @@
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=9
+pkgrel=10
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -50,32 +50,19 @@
   ln -s /usr/bin/gcc "${pkgdir}/opt/cuda/bin/gcc"
   ln -s /usr/bin/g++ "${pkgdir}/opt/cuda/bin/g++"
 
-  # Create soname links.
+  # Create soname variants with patchelf.
   # We have to be weird about this since for some reason the ELF SONAME is 
incorrect or at least partially incorrect for some libs.
-  # Best we can do is create all symlinks and hope for the best.
+  # Best we can do is copy those libs to *.so.10.1 variants, patchelf the 
SONAME and hope for the best.
   # Their installer used to perform this for us but now it's all manual and I 
think this is what we'll be stuck with for now.
-  # find cuda-toolkit/targets -type f -name '*.so*' ! -path '*stubs/*' -print0 
| while read -rd '' _lib; do
-  #   _base=${_lib%.so.*}
-  #   _current_soname=$(basename ${_lib%.*})
-  #   while [[ $_current_soname != $(basename $_base) ]]; do
-  # ln -sf ${_lib##*/} ${pkgdir}/opt/cuda/lib64/$_current_soname
-  # _current_soname=${_current_soname%.*}
-  #   done
-  # done
-
-  # Try to patch unmatching SONAMEs
-  patchlibs=(libcublasLt.so.10 libcublas.so.10 libcufft.so.10 libcufftw.so.10
- libcurand.so.10 libcusolver.so.10 libcusparse.so.10 libnppc.so.10
- libnppial.so.10 libnppicc.so.10 libnppicom.so.10 libnppidei.so.10
- libnppif.so.10 libnppig.so.10 libnppim.so.10 libnppist.so.10
- libnppisu.so.10 libnppitc.so.10 libnpps.so.10 libnvblas.so.10
- libnvgraph.so.10 libnvjpeg.so.10)
   cd "${pkgdir}/opt/cuda/targets/x86_64-linux/lib"
-  for plib in "${patchlibs[@]}"; do
-echo "copying ${plib} to ${plib}.1 version"
-cp ${plib} "${plib}.1"
-echo "patching ${plib}.1 SONAME to match ${plib}.1"
-patchelf --set-soname "${plib}.1" "${plib}.1"
+  find "${pkgdir}"/opt/cuda/targets/x86_64-linux/lib -type l -name "*.so.10" ! 
-path "*stubs/*" -print0 | while read -rd '' _lib; do
+_current_soname=$(basename ${_lib})
+if [ ! -f "${_current_soname}.1" ]; then
+  echo "copying ${_current_soname} to ${_current_soname}.1 version"
+  cp ${_current_soname} "${_current_soname}.1"
+  echo "patching ${_current_soname}.1 SONAME to match ${_current_soname}.1"
+  patchelf --set-soname "${_current_soname}.1" "${_current_soname}.1"
+fi
   done
 
   # Install profile and ld.so.config files


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

2019-04-11 Thread Konstantin Gizdov via arch-commits
Date: Thursday, April 11, 2019 @ 13:27:28
  Author: kgizdov
Revision: 451096

specify jre=8 in optdepends

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-11 12:31:09 UTC (rev 451095)
+++ PKGBUILD2019-04-11 13:27:28 UTC (rev 451096)
@@ -4,7 +4,7 @@
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=8
+pkgrel=9
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -14,7 +14,7 @@
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'
-'java-runtime: for nsight and nvvp')
+'java-runtime=8: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
 
source=(https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_${_basever}_${_driverver}_linux.run


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

2019-04-11 Thread Konstantin Gizdov via arch-commits
Date: Thursday, April 11, 2019 @ 11:30:01
  Author: kgizdov
Revision: 451084

pkgrel bump

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-11 11:15:35 UTC (rev 451083)
+++ PKGBUILD2019-04-11 11:30:01 UTC (rev 451084)
@@ -4,7 +4,7 @@
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=7
+pkgrel=8
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";


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

2019-04-11 Thread Konstantin Gizdov via arch-commits
Date: Thursday, April 11, 2019 @ 09:53:26
  Author: kgizdov
Revision: 451029

make sure symlinks to lib are good

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-11 09:47:16 UTC (rev 451028)
+++ PKGBUILD2019-04-11 09:53:26 UTC (rev 451029)
@@ -43,10 +43,8 @@
   cp -r cublas/include/* "${pkgdir}/opt/cuda/include/"
   cp -r cublas/lib64/* "${pkgdir}/opt/cuda/lib64/"
   cp -r cuda-samples "${pkgdir}/opt/cuda/samples"
-  cd "${pkgdir}/opt/cuda"
-  ln -s "${pkgdir}/opt/cuda/lib64" lib
-  cd "${pkgdir}/opt/cuda/nvvm"
-  ln -s "${pkgdir}/opt/cuda/nvvm/lib64" lib
+  ln -s /opt/cuda/targets/x86_64-linux/lib "${pkgdir}/opt/cuda/lib"
+  ln -s /opt/cuda/nvvm/lib64 "${pkgdir}/opt/cuda/nvvm/lib"
 
   # Use GCC 8
   ln -s /usr/bin/gcc "${pkgdir}/opt/cuda/bin/gcc"


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

2019-04-10 Thread Konstantin Gizdov via arch-commits
Date: Wednesday, April 10, 2019 @ 23:10:56
  Author: kgizdov
Revision: 450921

try to patchelf 10.1 SONAMEs

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   40 +---
 1 file changed, 29 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-10 22:24:57 UTC (rev 450920)
+++ PKGBUILD2019-04-10 23:10:56 UTC (rev 450921)
@@ -4,11 +4,12 @@
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=6
+pkgrel=7
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
+makedepends=('patchelf')
 depends=('gcc-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
@@ -37,13 +38,15 @@
 package() {
   mkdir -p "${pkgdir}/opt/"
 
-  cd builds
+  cd "${srcdir}/builds"
   cp -r cuda-toolkit "${pkgdir}/opt/cuda"
   cp -r cublas/include/* "${pkgdir}/opt/cuda/include/"
   cp -r cublas/lib64/* "${pkgdir}/opt/cuda/lib64/"
   cp -r cuda-samples "${pkgdir}/opt/cuda/samples"
-  ln -s lib "${pkgdir}/opt/cuda/lib64"
-  ln -s lib "${pkgdir}/opt/cuda/nvvm/lib64"
+  cd "${pkgdir}/opt/cuda"
+  ln -s "${pkgdir}/opt/cuda/lib64" lib
+  cd "${pkgdir}/opt/cuda/nvvm"
+  ln -s "${pkgdir}/opt/cuda/nvvm/lib64" lib
 
   # Use GCC 8
   ln -s /usr/bin/gcc "${pkgdir}/opt/cuda/bin/gcc"
@@ -53,13 +56,28 @@
   # We have to be weird about this since for some reason the ELF SONAME is 
incorrect or at least partially incorrect for some libs.
   # Best we can do is create all symlinks and hope for the best.
   # Their installer used to perform this for us but now it's all manual and I 
think this is what we'll be stuck with for now.
-  find cuda-toolkit/targets -type f -name '*.so*' ! -path '*stubs/*' -print0 | 
while read -rd '' _lib; do
-_base=${_lib%.so.*}
-_current_soname=$(basename ${_lib%.*})
-while [[ $_current_soname != $(basename $_base) ]]; do
-  ln -sf ${_lib##*/} ${pkgdir}/opt/cuda/lib64/$_current_soname
-  _current_soname=${_current_soname%.*}
-done
+  # find cuda-toolkit/targets -type f -name '*.so*' ! -path '*stubs/*' -print0 
| while read -rd '' _lib; do
+  #   _base=${_lib%.so.*}
+  #   _current_soname=$(basename ${_lib%.*})
+  #   while [[ $_current_soname != $(basename $_base) ]]; do
+  # ln -sf ${_lib##*/} ${pkgdir}/opt/cuda/lib64/$_current_soname
+  # _current_soname=${_current_soname%.*}
+  #   done
+  # done
+
+  # Try to patch unmatching SONAMEs
+  patchlibs=(libcublasLt.so.10 libcublas.so.10 libcufft.so.10 libcufftw.so.10
+ libcurand.so.10 libcusolver.so.10 libcusparse.so.10 libnppc.so.10
+ libnppial.so.10 libnppicc.so.10 libnppicom.so.10 libnppidei.so.10
+ libnppif.so.10 libnppig.so.10 libnppim.so.10 libnppist.so.10
+ libnppisu.so.10 libnppitc.so.10 libnpps.so.10 libnvblas.so.10
+ libnvgraph.so.10 libnvjpeg.so.10)
+  cd "${pkgdir}/opt/cuda/targets/x86_64-linux/lib"
+  for plib in "${patchlibs[@]}"; do
+echo "copying ${plib} to ${plib}.1 version"
+cp ${plib} "${plib}.1"
+echo "patching ${plib}.1 SONAME to match ${plib}.1"
+patchelf --set-soname "${plib}.1" "${plib}.1"
   done
 
   # Install profile and ld.so.config files


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

2019-03-26 Thread Konstantin Gizdov via arch-commits
Date: Wednesday, March 27, 2019 @ 00:00:22
  Author: kgizdov
Revision: 443922

switch to GCC 8

Modified:
  cuda/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-03-26 23:55:32 UTC (rev 443921)
+++ PKGBUILD2019-03-27 00:00:22 UTC (rev 443922)
@@ -1,14 +1,15 @@
 # Maintainer: Sven-Hendrik Haase 
+# Co-Maintainer: Konstantin Gizdov 
 pkgname=cuda
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=5
+pkgrel=6
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc7-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc7')
+depends=('gcc-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'
@@ -44,9 +45,9 @@
   ln -s lib "${pkgdir}/opt/cuda/lib64"
   ln -s lib "${pkgdir}/opt/cuda/nvvm/lib64"
 
-  # Needs gcc7
-  ln -s /usr/bin/gcc-7 "${pkgdir}/opt/cuda/bin/gcc"
-  ln -s /usr/bin/g++-7 "${pkgdir}/opt/cuda/bin/g++"
+  # Use GCC 8
+  ln -s /usr/bin/gcc "${pkgdir}/opt/cuda/bin/gcc"
+  ln -s /usr/bin/g++ "${pkgdir}/opt/cuda/bin/g++"
 
   # Create soname links.
   # We have to be weird about this since for some reason the ELF SONAME is 
incorrect or at least partially incorrect for some libs.


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

2019-03-01 Thread Sven-Hendrik Haase via arch-commits
Date: Friday, March 1, 2019 @ 23:31:18
  Author: svenstaro
Revision: 437333

upgpkg: cuda 10.1.105-5

There and back again: The tales of gcc7

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-01 23:18:25 UTC (rev 437332)
+++ PKGBUILD2019-03-01 23:31:18 UTC (rev 437333)
@@ -3,12 +3,12 @@
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=4
+pkgrel=5
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc-libs' 'opencl-nvidia' 'nvidia-utils')
+depends=('gcc7-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc7')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'
@@ -44,6 +44,10 @@
   ln -s lib "${pkgdir}/opt/cuda/lib64"
   ln -s lib "${pkgdir}/opt/cuda/nvvm/lib64"
 
+  # Needs gcc7
+  ln -s /usr/bin/gcc-7 "${pkgdir}/opt/cuda/bin/gcc"
+  ln -s /usr/bin/g++-7 "${pkgdir}/opt/cuda/bin/g++"
+
   # Create soname links.
   # We have to be weird about this since for some reason the ELF SONAME is 
incorrect or at least partially incorrect for some libs.
   # Best we can do is create all symlinks and hope for the best.


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

2019-03-01 Thread Sven-Hendrik Haase via arch-commits
Date: Friday, March 1, 2019 @ 19:16:30
  Author: svenstaro
Revision: 437312

upgpkg: cuda 10.1.105-4

Fix symlinks for real

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-01 18:59:19 UTC (rev 437311)
+++ PKGBUILD2019-03-01 19:16:30 UTC (rev 437312)
@@ -48,13 +48,12 @@
   # We have to be weird about this since for some reason the ELF SONAME is 
incorrect or at least partially incorrect for some libs.
   # Best we can do is create all symlinks and hope for the best.
   # Their installer used to perform this for us but now it's all manual and I 
think this is what we'll be stuck with for now.
-  find builds/cuda-toolkit/targets -type f -name '*.so*' ! -path '*stubs/*' 
-print0 | while read -d $'\0' _lib; do
-_base=$(echo ${_lib} | sed -r 's/(.*).so.*/\1.so/')
+  find cuda-toolkit/targets -type f -name '*.so*' ! -path '*stubs/*' -print0 | 
while read -rd '' _lib; do
+_base=${_lib%.so.*}
 _current_soname=$(basename ${_lib%.*})
 while [[ $_current_soname != $(basename $_base) ]]; do
-  _full_soname=$(dirname $_base)/$_current_soname
-  echo "[[ ! -f $_full_soname ]] && ln -s $_lib $_full_soname"
-  _current_soname=$(basename ${_current_soname%.*})
+  ln -sf ${_lib##*/} ${pkgdir}/opt/cuda/lib64/$_current_soname
+  _current_soname=${_current_soname%.*}
 done
   done
 


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

2019-02-28 Thread Sven-Hendrik Haase via arch-commits
Date: Thursday, February 28, 2019 @ 16:24:46
  Author: svenstaro
Revision: 437061

Prepare new soname loop

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   22 +-
 1 file changed, 17 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-28 15:42:37 UTC (rev 437060)
+++ PKGBUILD2019-02-28 16:24:46 UTC (rev 437061)
@@ -3,7 +3,7 @@
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=3
+pkgrel=4
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -44,10 +44,19 @@
   ln -s lib "${pkgdir}/opt/cuda/lib64"
   ln -s lib "${pkgdir}/opt/cuda/nvvm/lib64"
 
-  # How did they forget these symlinks?
-  ln -s libcublasLt.so.10 "${pkgdir}"/opt/cuda/lib64/libcublasLt.so.10.1
-  ln -s libcublas.so.10 "${pkgdir}"/opt/cuda/lib64/libcublas.so.10.1
-  ln -s libnvblas.so.10 "${pkgdir}"/opt/cuda/lib64/libnvblas.so.10.1
+  # Create soname links.
+  # We have to be weird about this since for some reason the ELF SONAME is 
incorrect or at least partially incorrect for some libs.
+  # Best we can do is create all symlinks and hope for the best.
+  # Their installer used to perform this for us but now it's all manual and I 
think this is what we'll be stuck with for now.
+  find builds/cuda-toolkit/targets -type f -name '*.so*' ! -path '*stubs/*' 
-print0 | while read -d $'\0' _lib; do
+_base=$(echo ${_lib} | sed -r 's/(.*).so.*/\1.so/')
+_current_soname=$(basename ${_lib%.*})
+while [[ $_current_soname != $(basename $_base) ]]; do
+  _full_soname=$(dirname $_base)/$_current_soname
+  echo "[[ ! -f $_full_soname ]] && ln -s $_lib $_full_soname"
+  _current_soname=$(basename ${_current_soname%.*})
+done
+  done
 
   # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
@@ -62,3 +71,6 @@
 -i "${pkgdir}/opt/cuda/libnsight/nsight.ini" \
 -i "${pkgdir}/opt/cuda/libnvvp/nvvp.ini"
 }
+
+# vim:set ts=2 sw=2 et:
+


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

2019-02-28 Thread Sven-Hendrik Haase via arch-commits
Date: Thursday, February 28, 2019 @ 11:16:07
  Author: svenstaro
Revision: 437022

upgpkg: cuda 10.1.105-3

More symlinks for cublas

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-28 11:04:32 UTC (rev 437021)
+++ PKGBUILD2019-02-28 11:16:07 UTC (rev 437022)
@@ -3,7 +3,7 @@
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -44,6 +44,11 @@
   ln -s lib "${pkgdir}/opt/cuda/lib64"
   ln -s lib "${pkgdir}/opt/cuda/nvvm/lib64"
 
+  # How did they forget these symlinks?
+  ln -s libcublasLt.so.10 "${pkgdir}"/opt/cuda/lib64/libcublasLt.so.10.1
+  ln -s libcublas.so.10 "${pkgdir}"/opt/cuda/lib64/libcublas.so.10.1
+  ln -s libnvblas.so.10 "${pkgdir}"/opt/cuda/lib64/libnvblas.so.10.1
+
   # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
   install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"


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

2019-02-27 Thread Sven-Hendrik Haase via arch-commits
Date: Thursday, February 28, 2019 @ 01:44:25
  Author: svenstaro
Revision: 436955

upgpkg: cuda 10.1.105-2

Merge cublas into cuda installation

Modified:
  cuda/trunk/PKGBUILD
  cuda/trunk/cuda.conf

---+
 PKGBUILD  |   12 +---
 cuda.conf |1 -
 2 files changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-28 00:29:24 UTC (rev 436954)
+++ PKGBUILD2019-02-28 01:44:25 UTC (rev 436955)
@@ -3,7 +3,7 @@
 pkgver=10.1.105
 _basever=10.1.105
 _driverver=418.39
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -21,7 +21,7 @@
 cuda-findgllib_mk.diff)
 
sha512sums=('07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
-
'268effce192d72d51658c1c337517f47e731fc820cdf6918cfc31e787e286a6afe42914650050e7df18a5f14beebaa1b23cc3cb0b459e8c794b74226bd2d5701'
+
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b')
 
 prepare() {
@@ -37,12 +37,10 @@
   mkdir -p "${pkgdir}/opt/"
 
   cd builds
-  cp -r cublas "${pkgdir}/opt/cublas"
-  ln -s lib64 "${pkgdir}/opt/cublas/lib"
-
-  cp -r cuda-samples "${pkgdir}/opt/cuda-samples"
-
   cp -r cuda-toolkit "${pkgdir}/opt/cuda"
+  cp -r cublas/include/* "${pkgdir}/opt/cuda/include/"
+  cp -r cublas/lib64/* "${pkgdir}/opt/cuda/lib64/"
+  cp -r cuda-samples "${pkgdir}/opt/cuda/samples"
   ln -s lib "${pkgdir}/opt/cuda/lib64"
   ln -s lib "${pkgdir}/opt/cuda/nvvm/lib64"
 

Modified: cuda.conf
===
--- cuda.conf   2019-02-28 00:29:24 UTC (rev 436954)
+++ cuda.conf   2019-02-28 01:44:25 UTC (rev 436955)
@@ -1,4 +1,3 @@
-/opt/cublas/lib
 /opt/cuda/lib64
 /opt/cuda/nvvm/lib64
 /opt/cuda/extras/CUPTI/lib64


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

2019-02-27 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, February 27, 2019 @ 12:58:16
  Author: svenstaro
Revision: 436428

upgpkg: cuda 10.1.105-1

Modified:
  cuda/trunk/PKGBUILD
  cuda/trunk/cuda.conf

---+
 PKGBUILD  |   65 ++--
 cuda.conf |3 --
 2 files changed, 21 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-27 12:58:13 UTC (rev 436427)
+++ PKGBUILD2019-02-27 12:58:16 UTC (rev 436428)
@@ -1,14 +1,14 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=10.0.130
-_basever=10.0.130
-_driverver=410.48
-pkgrel=2
+pkgver=10.1.105
+_basever=10.1.105
+_driverver=418.39
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc7-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc7')
+depends=('gcc-libs' 'opencl-nvidia' 'nvidia-utils')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'
@@ -15,52 +15,37 @@
 'java-runtime: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_${_basever}_${_driverver}_linux
+source=(https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_${_basever}_${_driverver}_linux.run
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-sha512sums=('409ea4cc6aa0fe7063450e77c3b67b9b41aab1bbe556db673fb1a80610b20bd52e2020bf94034a92ab68c721d3d5739500bae4bd7a3558b2d8e73730a3b4ea25'
+sha512sums=('07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
-
'0f1f5bed19f9eaf66b53e32d2e163a40d03e11565b3d5d9f5220b6904bb510fd9548e0dd8a33ee84e729845333158f9fed078584e80a8361ca434b1410624473'
+
'268effce192d72d51658c1c337517f47e731fc820cdf6918cfc31e787e286a6afe42914650050e7df18a5f14beebaa1b23cc3cb0b459e8c794b74226bd2d5701'
 
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b')
 
 prepare() {
-  sh cuda_${_basever}_${_driverver}_linux --extract=${srcdir}
-  ./cuda-*.run --noexec --keep
-  ./cuda-samples*.run --noexec --keep
+  sh cuda_${_basever}_${_driverver}_linux.run --target ${srcdir} --noexec
 
-  # path hacks
-
-  # 1rd sed line: sets right path to install man files
-  # 2rd sed line: hack to lie installer, now detect launch script by root
-  # 3rd sed line: sets right path in .desktop files and other .desktop stuff 
(warnings by desktop-file-validate)
-  sed -e "s|/usr/share|${srcdir}/../pkg/${pkgname}/usr/share|g" \
-  -e 's|can_add_for_all_users;|1;|g' \
-  -e 's|=\\"$prefix\\\"|=/opt/cuda|g' -e 's|Terminal=No|Terminal=false|g' 
-e 's|ParallelComputing|ParallelComputing;|g' \
-  -i pkg/install-linux.pl
-
-  # set right path in Samples Makefiles
-  sed 's|\$cudaprefix\\|\\/opt\\/cuda\\|g' -i pkg/install-sdk-linux.pl
-
-  # use python2
-  find pkg -name '*.py' | xargs sed -i -e 's|env python|env python2|g' -e 
's|bin/python|bin/python2|g'
-
   # Fix up samples tht use findgllib_mk
-  for f in pkg/samples/*/*/findgllib.mk; do
+  for f in builds/cuda-samples/*/*/findgllib.mk; do
 patch $f cuda-findgllib_mk.diff
   done
 }
 
 package() {
-  cd pkg
-  export PERL5LIB=.
-  perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
-  perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
+  mkdir -p "${pkgdir}/opt/"
 
-  # Needs gcc7
-  ln -s /usr/bin/gcc-7 "${pkgdir}/opt/cuda/bin/gcc"
-  ln -s /usr/bin/g++-7 "${pkgdir}/opt/cuda/bin/g++"
+  cd builds
+  cp -r cublas "${pkgdir}/opt/cublas"
+  ln -s lib64 "${pkgdir}/opt/cublas/lib"
 
+  cp -r cuda-samples "${pkgdir}/opt/cuda-samples"
+
+  cp -r cuda-toolkit "${pkgdir}/opt/cuda"
+  ln -s lib "${pkgdir}/opt/cuda/lib64"
+  ln -s lib "${pkgdir}/opt/cuda/nvvm/lib64"
+
   # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
   install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"
@@ -68,19 +53,9 @@
   mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
   ln -s /opt/cuda/doc/pdf/EULA.pdf 
"${pkgdir}/usr/share/licenses/${pkgname}/EULA.pdf"
 
-  # Remove redundant man and samples
-  rm -fr "${pkgdir}/opt/cuda/cuda-samples"
-  rm -fr "${pkgdir}/usr/share/man/man3"
-
   # Remove included copy of java and link to system java
   rm -fr  "${pkgdir}/opt/cuda/jre"
   sed 's|../jre/bin/java|/usr/bin/java|g' \
 -i "${pkgdir}/opt/cuda/libnsight/nsight.ini" \
 -i "${pkgdir}/opt/cuda/libnvvp/nvvp.ini"
-
-  # Remove unused files
-  rm -fr 
"${pkgdir}/opt/cuda/

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

2018-09-23 Thread Sven-Hendrik Haase via arch-commits
Date: Monday, September 24, 2018 @ 06:45:13
  Author: svenstaro
Revision: 384333

upgpkg: cuda 10.0.130-2

Remove hack and conflicting files

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-24 06:43:57 UTC (rev 384332)
+++ PKGBUILD2018-09-24 06:45:13 UTC (rev 384333)
@@ -3,7 +3,7 @@
 pkgver=10.0.130
 _basever=10.0.130
 _driverver=410.48
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -57,12 +57,6 @@
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
-  # Hack we need because of glibc 2.26 (https://bugs.archlinux.org/task/55580)
-  # without which we couldn't compile anything at all.
-  # Super dirty hack. I really hope it doesn't break other stuff!
-  # Hopefully we can remove this for later version of cuda.
-  sed -i "1 i#define _BITS_FLOATN_H" 
"${pkgdir}/opt/cuda/include/host_defines.h"
-
   # Needs gcc7
   ln -s /usr/bin/gcc-7 "${pkgdir}/opt/cuda/bin/gcc"
   ln -s /usr/bin/g++-7 "${pkgdir}/opt/cuda/bin/g++"
@@ -75,9 +69,8 @@
   ln -s /opt/cuda/doc/pdf/EULA.pdf 
"${pkgdir}/usr/share/licenses/${pkgname}/EULA.pdf"
 
   # Remove redundant man and samples
-  rm -fr "${pkgdir}/opt/cuda/doc/man"
   rm -fr "${pkgdir}/opt/cuda/cuda-samples"
-  rm -fr "${pkgdir}/usr/share/man/man3/deprecated.3"*
+  rm -fr "${pkgdir}/usr/share/man/man3"
 
   # Remove included copy of java and link to system java
   rm -fr  "${pkgdir}/opt/cuda/jre"


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

2018-09-23 Thread Sven-Hendrik Haase via arch-commits
Date: Monday, September 24, 2018 @ 05:22:50
  Author: svenstaro
Revision: 384304

upgpkg: cuda 10.0.130-1

Modified:
  cuda/trunk/PKGBUILD
  cuda/trunk/cuda-findgllib_mk.diff

+
 PKGBUILD   |   14 +++---
 cuda-findgllib_mk.diff |8 
 2 files changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-24 04:20:21 UTC (rev 384303)
+++ PKGBUILD2018-09-24 05:22:50 UTC (rev 384304)
@@ -1,9 +1,9 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=9.2.148
-_basever=9.2.148
-_driverver=396.37
-pkgrel=2
+pkgver=10.0.130
+_basever=10.0.130
+_driverver=410.48
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -15,14 +15,14 @@
 'java-runtime: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_${_basever}_${_driverver}_linux
+source=(https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_${_basever}_${_driverver}_linux
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-sha512sums=('103c59151727b2c14b403799dbde01bbb95e48b95a55050edb4f6786b209876c65a96f8cf5ca7d6b3ac7cd886413b9bf273a7d5afecd8317dcfa49bb63162983'
+sha512sums=('409ea4cc6aa0fe7063450e77c3b67b9b41aab1bbe556db673fb1a80610b20bd52e2020bf94034a92ab68c721d3d5739500bae4bd7a3558b2d8e73730a3b4ea25'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
 
'0f1f5bed19f9eaf66b53e32d2e163a40d03e11565b3d5d9f5220b6904bb510fd9548e0dd8a33ee84e729845333158f9fed078584e80a8361ca434b1410624473'
-
'6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
+
'41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b')
 
 prepare() {
   sh cuda_${_basever}_${_driverver}_linux --extract=${srcdir}

Modified: cuda-findgllib_mk.diff
===
--- cuda-findgllib_mk.diff  2018-09-24 04:20:21 UTC (rev 384303)
+++ cuda-findgllib_mk.diff  2018-09-24 05:22:50 UTC (rev 384304)
@@ -1,10 +1,10 @@
 --- ./opt/cuda/samples/3_Imaging/bicubicTexture/findgllib.mk   2017-09-28 
09:07:30.310563874 +0200
 +++ findgllib.mk   2017-09-28 14:40:50.638930881 +0200
 @@ -60,6 +60,7 @@
- RHEL   = $(shell echo $(DISTRO) | grep -i 'red\|rhel' >/dev/null 2>&1; 
echo $$?)
- CENTOS = $(shell echo $(DISTRO) | grep -i centos  >/dev/null 2>&1; 
echo $$?)
- SUSE   = $(shell echo $(DISTRO) | grep -i suse>/dev/null 2>&1; 
echo $$?)
-+ARCHLX = $(shell echo $(DISTRO) | grep -i arch>/dev/null 2>&1; 
echo $$?)
+ RHEL   = $(shell echo $(DISTRO) | grep -i 'red\|rhel'  >/dev/null 2>&1; 
echo $$?)
+ CENTOS = $(shell echo $(DISTRO) | grep -i centos   >/dev/null 2>&1; 
echo $$?)
+ SUSE   = $(shell echo $(DISTRO) | grep -i 'suse\|sles' >/dev/null 2>&1; 
echo $$?)
++ARCHLX = $(shell echo $(DISTRO) | grep -i arch >/dev/null 2>&1; 
echo $$?)
  ifeq ("$(UBUNTU)","0")
ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l)
  GLPATH := /usr/arm-linux-gnueabihf/lib


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

2018-09-07 Thread Sven-Hendrik Haase via arch-commits
Date: Friday, September 7, 2018 @ 20:46:50
  Author: svenstaro
Revision: 378703

upgpkg: cuda 9.2.148-2

Modified:
  cuda/trunk/PKGBUILD
  cuda/trunk/cuda.conf

---+
 PKGBUILD  |4 ++--
 cuda.conf |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-07 20:43:06 UTC (rev 378702)
+++ PKGBUILD2018-09-07 20:46:50 UTC (rev 378703)
@@ -4,7 +4,7 @@
 pkgver=9.2.148
 _basever=9.2.148
 _driverver=396.37
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -22,7 +22,7 @@
 cuda-findgllib_mk.diff)
 
sha512sums=('103c59151727b2c14b403799dbde01bbb95e48b95a55050edb4f6786b209876c65a96f8cf5ca7d6b3ac7cd886413b9bf273a7d5afecd8317dcfa49bb63162983'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
-
'66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
+
'0f1f5bed19f9eaf66b53e32d2e163a40d03e11565b3d5d9f5220b6904bb510fd9548e0dd8a33ee84e729845333158f9fed078584e80a8361ca434b1410624473'
 
'6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
 
 prepare() {

Modified: cuda.conf
===
--- cuda.conf   2018-09-07 20:43:06 UTC (rev 378702)
+++ cuda.conf   2018-09-07 20:46:50 UTC (rev 378703)
@@ -2,3 +2,4 @@
 /opt/cuda/lib
 /opt/cuda/nvvm/lib64
 /opt/cuda/nvvm/lib
+/opt/cuda/extras/CUPTI/lib64


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

2018-07-12 Thread Sven-Hendrik Haase via arch-commits
Date: Thursday, July 12, 2018 @ 18:04:32
  Author: svenstaro
Revision: 358039

upgpkg: cuda 9.2.148-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-12 18:04:27 UTC (rev 358038)
+++ PKGBUILD2018-07-12 18:04:32 UTC (rev 358039)
@@ -1,10 +1,10 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=9.2.88.1
-_basever=9.2.88
-_driverver=396.26
-pkgrel=2
+pkgver=9.2.148
+_basever=9.2.148
+_driverver=396.37
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -16,13 +16,11 @@
 'java-runtime: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_${_basever}_${_driverver}_linux
-
https://developer.nvidia.com/compute/cuda/9.2/Prod/patches/1/cuda_9.2.88.1_linux
+source=(https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_${_basever}_${_driverver}_linux
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-sha512sums=('2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba'
-
'd43bddb2affbc66133aab69750e8c95fd4e86bf6357c50b580301dda1819940c33e1cb442f08b25784c82d6e4de1ca6f5b474e51b1396253e4a4e6d820294ff7'
+sha512sums=('103c59151727b2c14b403799dbde01bbb95e48b95a55050edb4f6786b209876c65a96f8cf5ca7d6b3ac7cd886413b9bf273a7d5afecd8317dcfa49bb63162983'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
 
'66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
 
'6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
@@ -59,7 +57,6 @@
   export PERL5LIB=.
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
-  sh "${srcdir}"/cuda_9.2.88.1_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
 
   # Hack we need because of glibc 2.26 (https://bugs.archlinux.org/task/55580)
   # without which we couldn't compile anything at all.


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

2018-05-29 Thread Sven-Hendrik Haase via arch-commits
Date: Tuesday, May 29, 2018 @ 23:13:56
  Author: svenstaro
Revision: 333216

upgpkg: cuda 9.2.88.1-2

Use gcc7

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-29 23:13:13 UTC (rev 333215)
+++ PKGBUILD2018-05-29 23:13:56 UTC (rev 333216)
@@ -3,12 +3,13 @@
 pkgname=cuda
 pkgver=9.2.88.1
 _basever=9.2.88
-pkgrel=1
+_driverver=396.26
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc54')
+depends=('gcc7-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc7')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'
@@ -15,7 +16,7 @@
 'java-runtime: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_${_basever}_396.26_linux
+source=(https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_${_basever}_${_driverver}_linux
 
https://developer.nvidia.com/compute/cuda/9.2/Prod/patches/1/cuda_9.2.88.1_linux
 cuda.sh
 cuda.conf
@@ -27,7 +28,7 @@
 
'6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
 
 prepare() {
-  sh cuda_${_basever}_396.26_linux --extract=${srcdir}
+  sh cuda_${_basever}_${_driverver}_linux --extract=${srcdir}
   ./cuda-*.run --noexec --keep
   ./cuda-samples*.run --noexec --keep
 
@@ -66,9 +67,9 @@
   # Hopefully we can remove this for later version of cuda.
   sed -i "1 i#define _BITS_FLOATN_H" 
"${pkgdir}/opt/cuda/include/host_defines.h"
 
-  # Needs gcc5
-  ln -s /usr/bin/gcc-5 "${pkgdir}/opt/cuda/bin/gcc"
-  ln -s /usr/bin/g++-5 "${pkgdir}/opt/cuda/bin/g++"
+  # Needs gcc7
+  ln -s /usr/bin/gcc-7 "${pkgdir}/opt/cuda/bin/gcc"
+  ln -s /usr/bin/g++-7 "${pkgdir}/opt/cuda/bin/g++"
 
   # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"


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

2018-05-17 Thread Sven-Hendrik Haase via arch-commits
Date: Thursday, May 17, 2018 @ 22:51:32
  Author: svenstaro
Revision: 324085

upgpkg: cuda 9.2.88.1-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   26 ++
 1 file changed, 10 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-17 20:55:55 UTC (rev 324084)
+++ PKGBUILD2018-05-17 22:51:32 UTC (rev 324085)
@@ -1,14 +1,14 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=9.1.85.3
-_basever=9.1.85
-pkgrel=5
+pkgver=9.2.88.1
+_basever=9.2.88
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc-libs' 'opencl-nvidia' 'gcc54' 'nvidia-utils')
+depends=('gcc-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc54')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'
@@ -15,23 +15,19 @@
 'java-runtime: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_${_basever}_387.26_linux
-
https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux
-
https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/2/cuda_9.1.85.2_linux
-
https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/3/cuda_9.1.85.3_linux
+source=(https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_${_basever}_396.26_linux
+
https://developer.nvidia.com/compute/cuda/9.2/Prod/patches/1/cuda_9.2.88.1_linux
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-sha512sums=('492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827'
-
'a29099ffad3470b8fe3a64c2ad675fd7950bd63dcf722dd19083c7daba55be90755456b937347ae3323b50d797a138f81daefddfd37228a6f75b2341dbd861fa'
-
'62644aa8219ff5ce7428033e279ebc05d96596c3c2b9d27f783aff90f41e38e0341578cc1b33e8d6d64c59a544c3e6174e77c5d046de9b12261d1f7e73b259c5'
-
'dcafdd55cbc6d9063f6dc2001c0365f1c1279254378d4d0231039be78b9dec5d6078b3500fa49457fbbf0fad8a17ef0d18c7fa21551b80dc99a16f2ae2a4110a'
+sha512sums=('2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba'
+
'd43bddb2affbc66133aab69750e8c95fd4e86bf6357c50b580301dda1819940c33e1cb442f08b25784c82d6e4de1ca6f5b474e51b1396253e4a4e6d820294ff7'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
 
'66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
 
'6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
 
 prepare() {
-  sh cuda_${_basever}_387.26_linux --extract=${srcdir}
+  sh cuda_${_basever}_396.26_linux --extract=${srcdir}
   ./cuda-*.run --noexec --keep
   ./cuda-samples*.run --noexec --keep
 
@@ -62,9 +58,7 @@
   export PERL5LIB=.
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
-  sh "${srcdir}"/cuda_9.1.85.1_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
-  sh "${srcdir}"/cuda_9.1.85.2_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
-  sh "${srcdir}"/cuda_9.1.85.3_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
+  sh "${srcdir}"/cuda_9.2.88.1_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
 
   # Hack we need because of glibc 2.26 (https://bugs.archlinux.org/task/55580)
   # without which we couldn't compile anything at all.


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

2018-05-06 Thread Sven-Hendrik Haase via arch-commits
Date: Sunday, May 6, 2018 @ 21:40:02
  Author: svenstaro
Revision: 319045

upgpkg: cuda 9.1.85.3-5

Use gcc54 because of a bug in nvcc

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-06 21:16:34 UTC (rev 319044)
+++ PKGBUILD2018-05-06 21:40:02 UTC (rev 319045)
@@ -3,12 +3,12 @@
 pkgname=cuda
 pkgver=9.1.85.3
 _basever=9.1.85
-pkgrel=4
+pkgrel=5
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc-libs' 'opencl-nvidia' 'gcc5' 'nvidia-utils')
+depends=('gcc-libs' 'opencl-nvidia' 'gcc54' 'nvidia-utils')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'


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

2018-05-01 Thread Sven-Hendrik Haase via arch-commits
Date: Tuesday, May 1, 2018 @ 15:48:14
  Author: svenstaro
Revision: 318594

upgpkg: cuda 9.1.85.3-4

Add depends on nvidia-utils

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-01 15:35:23 UTC (rev 318593)
+++ PKGBUILD2018-05-01 15:48:14 UTC (rev 318594)
@@ -3,12 +3,12 @@
 pkgname=cuda
 pkgver=9.1.85.3
 _basever=9.1.85
-pkgrel=3
+pkgrel=4
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc-libs' 'opencl-nvidia' 'gcc5')
+depends=('gcc-libs' 'opencl-nvidia' 'gcc5' 'nvidia-utils')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'


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

2018-05-01 Thread Sven-Hendrik Haase via arch-commits
Date: Tuesday, May 1, 2018 @ 10:26:37
  Author: svenstaro
Revision: 318586

upgpkg: cuda 9.1.85.3-3

Uncomment wrongfully commented code

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-01 09:55:49 UTC (rev 318585)
+++ PKGBUILD2018-05-01 10:26:37 UTC (rev 318586)
@@ -3,7 +3,7 @@
 pkgname=cuda
 pkgver=9.1.85.3
 _basever=9.1.85
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -70,7 +70,7 @@
   # without which we couldn't compile anything at all.
   # Super dirty hack. I really hope it doesn't break other stuff!
   # Hopefully we can remove this for later version of cuda.
-  # sed -i "1 i#define _BITS_FLOATN_H" 
"${pkgdir}/opt/cuda/include/host_defines.h"
+  sed -i "1 i#define _BITS_FLOATN_H" 
"${pkgdir}/opt/cuda/include/host_defines.h"
 
   # Needs gcc5
   ln -s /usr/bin/gcc-5 "${pkgdir}/opt/cuda/bin/gcc"


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

2018-04-30 Thread Sven-Hendrik Haase via arch-commits
Date: Monday, April 30, 2018 @ 20:17:08
  Author: svenstaro
Revision: 318528

upgpkg: cuda 9.1.85.3-2

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-30 17:44:35 UTC (rev 318527)
+++ PKGBUILD2018-04-30 20:17:08 UTC (rev 318528)
@@ -3,12 +3,12 @@
 pkgname=cuda
 pkgver=9.1.85.3
 _basever=9.1.85
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc-libs' 'opencl-nvidia' 'gcc6')
+depends=('gcc-libs' 'opencl-nvidia' 'gcc5')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb'
@@ -70,11 +70,11 @@
   # without which we couldn't compile anything at all.
   # Super dirty hack. I really hope it doesn't break other stuff!
   # Hopefully we can remove this for later version of cuda.
-  sed -i "1 i#define _BITS_FLOATN_H" 
"${pkgdir}/opt/cuda/include/host_defines.h"
+  # sed -i "1 i#define _BITS_FLOATN_H" 
"${pkgdir}/opt/cuda/include/host_defines.h"
 
-  # Needs gcc6
-  ln -s /usr/bin/gcc-6 "${pkgdir}/opt/cuda/bin/gcc"
-  ln -s /usr/bin/g++-6 "${pkgdir}/opt/cuda/bin/g++"
+  # Needs gcc5
+  ln -s /usr/bin/gcc-5 "${pkgdir}/opt/cuda/bin/gcc"
+  ln -s /usr/bin/g++-5 "${pkgdir}/opt/cuda/bin/g++"
 
   # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
@@ -96,7 +96,7 @@
 
   # Remove unused files
   rm -fr 
"${pkgdir}/opt/cuda/"{bin,samples}"/.uninstall_manifest_do_not_delete.txt"
-  rm -fr "${pkgdir}/opt/cuda/samples/uninstall_cuda_samples_8.0.pl"
-  rm -fr "${pkgdir}/opt/cuda/bin/cuda-install-samples-8.0.sh"
-  rm -fr "${pkgdir}/opt/cuda/bin/uninstall_cuda_toolkit_8.0.pl"
+  rm -fr "${pkgdir}/opt/cuda/samples/uninstall_cuda_samples"*.pl
+  rm -fr "${pkgdir}/opt/cuda/bin/cuda-install-samples"*.sh
+  rm -fr "${pkgdir}/opt/cuda/bin/uninstall_cuda_toolkit"*.pl
 }


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

2018-04-22 Thread Sven-Hendrik Haase via arch-commits
Date: Monday, April 23, 2018 @ 01:41:36
  Author: svenstaro
Revision: 317320

upgpkg: cuda 9.1.85.3-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-23 00:01:43 UTC (rev 317319)
+++ PKGBUILD2018-04-23 01:41:36 UTC (rev 317320)
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=9.1.85.2
+pkgver=9.1.85.3
 _basever=9.1.85
 pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
@@ -18,6 +18,7 @@
 
source=(https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_${_basever}_387.26_linux
 
https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux
 
https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/2/cuda_9.1.85.2_linux
+
https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/3/cuda_9.1.85.3_linux
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
@@ -24,6 +25,7 @@
 
sha512sums=('492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827'
 
'a29099ffad3470b8fe3a64c2ad675fd7950bd63dcf722dd19083c7daba55be90755456b937347ae3323b50d797a138f81daefddfd37228a6f75b2341dbd861fa'
 
'62644aa8219ff5ce7428033e279ebc05d96596c3c2b9d27f783aff90f41e38e0341578cc1b33e8d6d64c59a544c3e6174e77c5d046de9b12261d1f7e73b259c5'
+
'dcafdd55cbc6d9063f6dc2001c0365f1c1279254378d4d0231039be78b9dec5d6078b3500fa49457fbbf0fad8a17ef0d18c7fa21551b80dc99a16f2ae2a4110a'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
 
'66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
 
'6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
@@ -62,6 +64,7 @@
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
   sh "${srcdir}"/cuda_9.1.85.1_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
   sh "${srcdir}"/cuda_9.1.85.2_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
+  sh "${srcdir}"/cuda_9.1.85.3_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
 
   # Hack we need because of glibc 2.26 (https://bugs.archlinux.org/task/55580)
   # without which we couldn't compile anything at all.


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

2018-03-05 Thread Sven-Hendrik Haase via arch-commits
Date: Monday, March 5, 2018 @ 15:04:54
  Author: svenstaro
Revision: 302767

upgpkg: cuda 9.1.85.2-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-05 15:04:42 UTC (rev 302766)
+++ PKGBUILD2018-03-05 15:04:54 UTC (rev 302767)
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=9.1.85.1
+pkgver=9.1.85.2
 _basever=9.1.85
 pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
@@ -17,11 +17,13 @@
 install=cuda.install
 
source=(https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_${_basever}_387.26_linux
 
https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux
+
https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/2/cuda_9.1.85.2_linux
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
 
sha512sums=('492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827'
 
'a29099ffad3470b8fe3a64c2ad675fd7950bd63dcf722dd19083c7daba55be90755456b937347ae3323b50d797a138f81daefddfd37228a6f75b2341dbd861fa'
+
'62644aa8219ff5ce7428033e279ebc05d96596c3c2b9d27f783aff90f41e38e0341578cc1b33e8d6d64c59a544c3e6174e77c5d046de9b12261d1f7e73b259c5'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
 
'66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
 
'6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
@@ -59,6 +61,7 @@
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
   sh "${srcdir}"/cuda_9.1.85.1_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
+  sh "${srcdir}"/cuda_9.1.85.2_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
 
   # Hack we need because of glibc 2.26 (https://bugs.archlinux.org/task/55580)
   # without which we couldn't compile anything at all.


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

2018-02-17 Thread Sven-Hendrik Haase via arch-commits
Date: Sunday, February 18, 2018 @ 02:07:14
  Author: svenstaro
Revision: 296202

upgpkg: cuda 9.1.85.1-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-18 01:31:52 UTC (rev 296201)
+++ PKGBUILD2018-02-18 02:07:14 UTC (rev 296202)
@@ -1,7 +1,8 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=9.1.85
+pkgver=9.1.85.1
+_basever=9.1.85
 pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
@@ -14,17 +15,19 @@
 'java-runtime: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_${pkgver}_387.26_linux
+source=(https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_${_basever}_387.26_linux
+
https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
 
sha512sums=('492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827'
+
'a29099ffad3470b8fe3a64c2ad675fd7950bd63dcf722dd19083c7daba55be90755456b937347ae3323b50d797a138f81daefddfd37228a6f75b2341dbd861fa'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
 
'66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
 
'6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
 
 prepare() {
-  sh cuda_${pkgver}_387.26_linux --extract=${srcdir}
+  sh cuda_${_basever}_387.26_linux --extract=${srcdir}
   ./cuda-*.run --noexec --keep
   ./cuda-samples*.run --noexec --keep
 
@@ -55,6 +58,7 @@
   export PERL5LIB=.
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
+  sh "${srcdir}"/cuda_9.1.85.1_linux --silent --accept-eula 
--installdir="${pkgdir}/opt/cuda"
 
   # Hack we need because of glibc 2.26 (https://bugs.archlinux.org/task/55580)
   # without which we couldn't compile anything at all.


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

2017-12-12 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, December 13, 2017 @ 05:32:46
  Author: svenstaro
Revision: 274115

upgpkg: cuda 9.1.85-1

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-13 05:26:49 UTC (rev 274114)
+++ PKGBUILD2017-12-13 05:32:46 UTC (rev 274115)
@@ -1,8 +1,8 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=9.0.176
-pkgrel=4
+pkgver=9.1.85
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -14,17 +14,17 @@
 'java-runtime: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
-source=(https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_${pkgver}_384.81_linux-run
+source=(https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_${pkgver}_387.26_linux
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-sha512sums=('00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9'
+sha512sums=('492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
 
'66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
 
'6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
 
 prepare() {
-  sh cuda_${pkgver}_384.81_linux-run -extract=${srcdir}
+  sh cuda_${pkgver}_387.26_linux --extract=${srcdir}
   ./cuda-*.run --noexec --keep
   ./cuda-samples*.run --noexec --keep
 


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

2017-10-06 Thread Sven-Hendrik Haase
Date: Friday, October 6, 2017 @ 12:19:22
  Author: svenstaro
Revision: 261906

Add optdep to java-runtime

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-06 12:00:47 UTC (rev 261905)
+++ PKGBUILD2017-10-06 12:19:22 UTC (rev 261906)
@@ -10,7 +10,8 @@
 depends=('gcc-libs' 'opencl-nvidia' 'gcc6')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
-optdepends=('gdb: for cuda-gdb')
+optdepends=('gdb: for cuda-gdb'
+'java-runtime: for nsight and nvvp')
 options=(!strip staticlibs)
 install=cuda.install
 
source=(https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_${pkgver}_384.81_linux-run


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

2017-10-02 Thread Sven-Hendrik Haase
Date: Tuesday, October 3, 2017 @ 02:43:39
  Author: svenstaro
Revision: 261344

upgpkg: cuda 9.0.176-4

use gcc6

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-03 02:11:58 UTC (rev 261343)
+++ PKGBUILD2017-10-03 02:43:39 UTC (rev 261344)
@@ -2,12 +2,12 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=9.0.176
-pkgrel=3
+pkgrel=4
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc-libs' 'opencl-nvidia')
+depends=('gcc-libs' 'opencl-nvidia' 'gcc6')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb')
@@ -61,8 +61,9 @@
   # Hopefully we can remove this for later version of cuda.
   sed -i "1 i#define _BITS_FLOATN_H" 
"${pkgdir}/opt/cuda/include/host_defines.h"
 
-  # Hack for gcc7
-  sed -i "/.*unsupported GNU version.*/d" 
"${pkgdir}/opt/cuda/include/crt/host_config.h"
+  # Needs gcc6
+  ln -s /usr/bin/gcc-6 "${pkgdir}/opt/cuda/bin/gcc"
+  ln -s /usr/bin/g++-6 "${pkgdir}/opt/cuda/bin/g++"
 
   # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"


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

2017-10-02 Thread Sven-Hendrik Haase
Date: Tuesday, October 3, 2017 @ 00:05:19
  Author: svenstaro
Revision: 261340

upgpkg: cuda 9.0.176-3

Fix sed path

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-02 22:37:28 UTC (rev 261339)
+++ PKGBUILD2017-10-03 00:05:19 UTC (rev 261340)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=9.0.176
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -62,7 +62,7 @@
   sed -i "1 i#define _BITS_FLOATN_H" 
"${pkgdir}/opt/cuda/include/host_defines.h"
 
   # Hack for gcc7
-  sed -i "/unsupported GNU version/d" 
"${pkgdir}/opt/cuda/include/host_defines.h"
+  sed -i "/.*unsupported GNU version.*/d" 
"${pkgdir}/opt/cuda/include/crt/host_config.h"
 
   # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"


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

2017-10-02 Thread Sven-Hendrik Haase
Date: Monday, October 2, 2017 @ 22:17:42
  Author: svenstaro
Revision: 261333

upgpkg: cuda 9.0.176-2

Try to make this work with gcc7

Modified:
  cuda/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-10-02 22:17:21 UTC (rev 261332)
+++ PKGBUILD2017-10-02 22:17:42 UTC (rev 261333)
@@ -2,12 +2,12 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=9.0.176
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc-libs' 'opencl-nvidia' 'gcc5')
+depends=('gcc-libs' 'opencl-nvidia')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb')
@@ -58,12 +58,11 @@
   # Hack we need because of glibc 2.26 (https://bugs.archlinux.org/task/55580)
   # without which we couldn't compile anything at all.
   # Super dirty hack. I really hope it doesn't break other stuff!
-  # Probably we can remove this for cuda 9.
+  # Hopefully we can remove this for later version of cuda.
   sed -i "1 i#define _BITS_FLOATN_H" 
"${pkgdir}/opt/cuda/include/host_defines.h"
 
-  # Needs Gcc 5.x.x
-  ln -s /usr/bin/gcc-5 "${pkgdir}/opt/cuda/bin/gcc"
-  ln -s /usr/bin/g++-5 "${pkgdir}/opt/cuda/bin/g++"
+  # Hack for gcc7
+  sed -i "/unsupported GNU version/d" 
"${pkgdir}/opt/cuda/include/host_defines.h"
 
   # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"


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

2017-09-28 Thread Sven-Hendrik Haase
Date: Thursday, September 28, 2017 @ 13:11:22
  Author: svenstaro
Revision: 260783

upgpkg: cuda 9.0.176-1

Modified:
  cuda/trunk/PKGBUILD
  cuda/trunk/cuda-findgllib_mk.diff

+
 PKGBUILD   |   16 
 cuda-findgllib_mk.diff |   16 
 2 files changed, 16 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-28 13:09:15 UTC (rev 260782)
+++ PKGBUILD2017-09-28 13:11:22 UTC (rev 260783)
@@ -1,8 +1,8 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=8.0.61
-pkgrel=3
+pkgver=9.0.176
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -13,19 +13,19 @@
 optdepends=('gdb: for cuda-gdb')
 options=(!strip staticlibs)
 install=cuda.install
-source=(https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_${pkgver}_375.26_linux-run
+source=(https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_${pkgver}_384.81_linux-run
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-sha512sums=('d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b'
+sha512sums=('00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9'
 
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
 
'66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
-
'89cbe7ce38039188fa0a0b9554fb938e95aa0ced5bc65479c1bdb6f8e063530a8a7002dbf7c287a8d22aea449014c4502e487fa07ea1efa110db4def02819dfe')
+
'6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
 
 prepare() {
-  sh cuda_${pkgver}_375.26_linux-run -extract=${srcdir}
-  ./cuda-linux64-rel-*.run --noexec --keep
-  ./cuda-samples-linux-*.run --noexec --keep
+  sh cuda_${pkgver}_384.81_linux-run -extract=${srcdir}
+  ./cuda-*.run --noexec --keep
+  ./cuda-samples*.run --noexec --keep
 
   # path hacks
 

Modified: cuda-findgllib_mk.diff
===
--- cuda-findgllib_mk.diff  2017-09-28 13:09:15 UTC (rev 260782)
+++ cuda-findgllib_mk.diff  2017-09-28 13:11:22 UTC (rev 260783)
@@ -1,14 +1,14 @@
 findgllib.mk.dist  2016-05-01 23:04:03.0 +1200
-+++ findgllib.mk   2016-09-16 13:47:21.100160762 +1200
-@@ -64,6 +64,7 @@
- RHEL   = $(shell echo $(DISTRO) | grep -i 'red\|rhel' >/dev/null 
2>&1; echo $$?)
- CENTOS = $(shell echo $(DISTRO) | grep -i centos  >/dev/null 
2>&1; echo $$?)
- SUSE   = $(shell echo $(DISTRO) | grep -i suse>/dev/null 
2>&1; echo $$?)
-+ARCHLX = $(shell echo $(DISTRO) | grep -i arch>/dev/null 
2>&1; echo $$?)
+--- ./opt/cuda/samples/3_Imaging/bicubicTexture/findgllib.mk   2017-09-28 
09:07:30.310563874 +0200
 findgllib.mk   2017-09-28 14:40:50.638930881 +0200
+@@ -60,6 +60,7 @@
+ RHEL   = $(shell echo $(DISTRO) | grep -i 'red\|rhel' >/dev/null 2>&1; 
echo $$?)
+ CENTOS = $(shell echo $(DISTRO) | grep -i centos  >/dev/null 2>&1; 
echo $$?)
+ SUSE   = $(shell echo $(DISTRO) | grep -i suse>/dev/null 2>&1; 
echo $$?)
++ARCHLX = $(shell echo $(DISTRO) | grep -i arch>/dev/null 2>&1; 
echo $$?)
  ifeq ("$(UBUNTU)","0")
ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l)
  GLPATH := /usr/arm-linux-gnueabihf/lib
-@@ -102,6 +103,11 @@
+@@ -100,6 +101,11 @@
GLPATH?= /usr/lib64/nvidia
GLLINK?= -L/usr/lib64/nvidia
DFLT_PATH ?= /usr/lib64


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

2017-09-13 Thread Sven-Hendrik Haase
Date: Wednesday, September 13, 2017 @ 10:49:43
  Author: svenstaro
Revision: 257410

upgpkg: cuda 8.0.61-3

Add dirty hack for glibc 2.26

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-13 09:00:33 UTC (rev 257409)
+++ PKGBUILD2017-09-13 10:49:43 UTC (rev 257410)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=8.0.61
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -51,9 +51,16 @@
 
 package() {
   cd pkg
+  export PERL5LIB=.
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
+  # Hack we need because of glibc 2.26 (https://bugs.archlinux.org/task/55580)
+  # without which we couldn't compile anything at all.
+  # Super dirty hack. I really hope it doesn't break other stuff!
+  # Probably we can remove this for cuda 9.
+  sed -i "1 i#define _BITS_FLOATN_H" 
"${pkgdir}/opt/cuda/include/host_defines.h"
+
   # Needs Gcc 5.x.x
   ln -s /usr/bin/gcc-5 "${pkgdir}/opt/cuda/bin/gcc"
   ln -s /usr/bin/g++-5 "${pkgdir}/opt/cuda/bin/g++"


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

2017-05-23 Thread Sven-Hendrik Haase
Date: Wednesday, May 24, 2017 @ 05:26:13
  Author: svenstaro
Revision: 229912

upgpkg: cuda 8.0.61-2

Remove included JRE

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-24 04:54:08 UTC (rev 229911)
+++ PKGBUILD2017-05-24 05:26:13 UTC (rev 229912)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=8.0.61
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -54,9 +54,11 @@
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
+  # Needs Gcc 5.x.x
   ln -s /usr/bin/gcc-5 "${pkgdir}/opt/cuda/bin/gcc"
   ln -s /usr/bin/g++-5 "${pkgdir}/opt/cuda/bin/g++"
 
+  # Install profile and ld.so.config files
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
   install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"
 
@@ -63,8 +65,20 @@
   mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
   ln -s /opt/cuda/doc/pdf/EULA.pdf 
"${pkgdir}/usr/share/licenses/${pkgname}/EULA.pdf"
 
-  # remove redundant man and samples
+  # Remove redundant man and samples
   rm -fr "${pkgdir}/opt/cuda/doc/man"
   rm -fr "${pkgdir}/opt/cuda/cuda-samples"
   rm -fr "${pkgdir}/usr/share/man/man3/deprecated.3"*
+
+  # Remove included copy of java and link to system java
+  rm -fr  "${pkgdir}/opt/cuda/jre"
+  sed 's|../jre/bin/java|/usr/bin/java|g' \
+-i "${pkgdir}/opt/cuda/libnsight/nsight.ini" \
+-i "${pkgdir}/opt/cuda/libnvvp/nvvp.ini"
+
+  # Remove unused files
+  rm -fr 
"${pkgdir}/opt/cuda/"{bin,samples}"/.uninstall_manifest_do_not_delete.txt"
+  rm -fr "${pkgdir}/opt/cuda/samples/uninstall_cuda_samples_8.0.pl"
+  rm -fr "${pkgdir}/opt/cuda/bin/cuda-install-samples-8.0.sh"
+  rm -fr "${pkgdir}/opt/cuda/bin/uninstall_cuda_toolkit_8.0.pl"
 }


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

2017-05-23 Thread Sven-Hendrik Haase
Date: Wednesday, May 24, 2017 @ 04:54:08
  Author: svenstaro
Revision: 229911

Use sha512sums

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-24 04:52:57 UTC (rev 229910)
+++ PKGBUILD2017-05-24 04:54:08 UTC (rev 229911)
@@ -17,10 +17,10 @@
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-md5sums=('33e1bd980e91af4e55f3ef835c103f9b'
- '7e5990e03eea90075f5a500e91a0c3d3'
- '71420ee4e90c65df21c6c5d34373c245'
- '6476452a339c12d8ca18b5feb47100cc')
+sha512sums=('d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b'
+
'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
+
'66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
+
'89cbe7ce38039188fa0a0b9554fb938e95aa0ced5bc65479c1bdb6f8e063530a8a7002dbf7c287a8d22aea449014c4502e487fa07ea1efa110db4def02819dfe')
 
 prepare() {
   sh cuda_${pkgver}_375.26_linux-run -extract=${srcdir}


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

2017-02-28 Thread Sven-Hendrik Haase
Date: Tuesday, February 28, 2017 @ 10:57:42
  Author: svenstaro
Revision: 214203

upgpkg: cuda 8.0.61-1

upstream release 8.0.61

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-28 09:47:00 UTC (rev 214202)
+++ PKGBUILD2017-02-28 10:57:42 UTC (rev 214203)
@@ -1,8 +1,8 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=8.0.44
-pkgrel=3
+pkgver=8.0.61
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -13,17 +13,17 @@
 optdepends=('gdb: for cuda-gdb')
 options=(!strip staticlibs)
 install=cuda.install
-source=(https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_${pkgver}_linux-run
+source=(https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_${pkgver}_375.26_linux-run
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-md5sums=('6dca912f9b7e2b7569b0074a41713640'
+md5sums=('33e1bd980e91af4e55f3ef835c103f9b'
  '7e5990e03eea90075f5a500e91a0c3d3'
  '71420ee4e90c65df21c6c5d34373c245'
  '6476452a339c12d8ca18b5feb47100cc')
 
 prepare() {
-  sh cuda_${pkgver}_linux-run -extract=${srcdir}
+  sh cuda_${pkgver}_375.26_linux-run -extract=${srcdir}
   ./cuda-linux64-rel-*.run --noexec --keep
   ./cuda-samples-linux-*.run --noexec --keep
 


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

2017-01-09 Thread Sven-Hendrik Haase
Date: Tuesday, January 10, 2017 @ 00:56:04
  Author: svenstaro
Revision: 206329

upgpkg: cuda 8.0.44-3

Remove conflicting files

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-10 00:43:34 UTC (rev 206328)
+++ PKGBUILD2017-01-10 00:56:04 UTC (rev 206329)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=8.0.44
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -66,4 +66,5 @@
   # remove redundant man and samples
   rm -fr "${pkgdir}/opt/cuda/doc/man"
   rm -fr "${pkgdir}/opt/cuda/cuda-samples"
+  rm -fr "${pkgdir}/usr/share/man/man3/deprecated.3"*
 }


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

2016-10-23 Thread Sven-Hendrik Haase
Date: Monday, October 24, 2016 @ 00:37:25
  Author: svenstaro
Revision: 193121

upgpkg: cuda 8.0.44-2

Do not patch out compiler version check

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-24 00:11:45 UTC (rev 193120)
+++ PKGBUILD2016-10-24 00:37:25 UTC (rev 193121)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=8.0.44
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -54,8 +54,6 @@
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
-  # allow newer gccs to work
-  sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
   ln -s /usr/bin/gcc-5 "${pkgdir}/opt/cuda/bin/gcc"
   ln -s /usr/bin/g++-5 "${pkgdir}/opt/cuda/bin/g++"
 


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

2016-09-28 Thread Sven-Hendrik Haase
Date: Wednesday, September 28, 2016 @ 23:27:48
  Author: svenstaro
Revision: 190758

upgpkg: cuda 8.0.44-1

upstream release 8.0.44

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-09-28 22:49:22 UTC (rev 190757)
+++ PKGBUILD2016-09-28 23:27:48 UTC (rev 190758)
@@ -1,8 +1,8 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=7.5.18
-pkgrel=5
+pkgver=8.0.44
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -13,17 +13,17 @@
 optdepends=('gdb: for cuda-gdb')
 options=(!strip staticlibs)
 install=cuda.install
-source=(http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_${pkgver}_linux.run
+source=(https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_${pkgver}_linux-run
 cuda.sh
 cuda.conf
 cuda-findgllib_mk.diff)
-md5sums=('4b3bcecf0dfc35928a0898793cf3e4c6'
+md5sums=('6dca912f9b7e2b7569b0074a41713640'
  '7e5990e03eea90075f5a500e91a0c3d3'
  '71420ee4e90c65df21c6c5d34373c245'
  '6476452a339c12d8ca18b5feb47100cc')
 
 prepare() {
-  sh cuda_${pkgver}_linux.run -extract=${srcdir}
+  sh cuda_${pkgver}_linux-run -extract=${srcdir}
   ./cuda-linux64-rel-*.run --noexec --keep
   ./cuda-samples-linux-*.run --noexec --keep
 


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

2016-09-25 Thread Sven-Hendrik Haase
Date: Monday, September 26, 2016 @ 04:58:26
  Author: svenstaro
Revision: 190574

upgpkg: cuda 7.5.18-5

Try to fix FS#50795

Added:
  cuda/trunk/cuda-findgllib_mk.diff
Modified:
  cuda/trunk/PKGBUILD

+
 PKGBUILD   |   13 ++---
 cuda-findgllib_mk.diff |   22 ++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-09-26 04:55:36 UTC (rev 190573)
+++ PKGBUILD2016-09-26 04:58:26 UTC (rev 190574)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=7.5.18
-pkgrel=4
+pkgrel=5
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -15,10 +15,12 @@
 install=cuda.install
 
source=(http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_${pkgver}_linux.run
 cuda.sh
-cuda.conf)
+cuda.conf
+cuda-findgllib_mk.diff)
 md5sums=('4b3bcecf0dfc35928a0898793cf3e4c6'
  '7e5990e03eea90075f5a500e91a0c3d3'
- '71420ee4e90c65df21c6c5d34373c245')
+ '71420ee4e90c65df21c6c5d34373c245'
+ '6476452a339c12d8ca18b5feb47100cc')
 
 prepare() {
   sh cuda_${pkgver}_linux.run -extract=${srcdir}
@@ -40,6 +42,11 @@
 
   # use python2
   find pkg -name '*.py' | xargs sed -i -e 's|env python|env python2|g' -e 
's|bin/python|bin/python2|g'
+
+  # Fix up samples tht use findgllib_mk
+  for f in pkg/samples/*/*/findgllib.mk; do
+patch $f cuda-findgllib_mk.diff
+  done
 }
 
 package() {

Added: cuda-findgllib_mk.diff
===
--- cuda-findgllib_mk.diff  (rev 0)
+++ cuda-findgllib_mk.diff  2016-09-26 04:58:26 UTC (rev 190574)
@@ -0,0 +1,22 @@
+--- findgllib.mk.dist  2016-05-01 23:04:03.0 +1200
 findgllib.mk   2016-09-16 13:47:21.100160762 +1200
+@@ -64,6 +64,7 @@
+ RHEL   = $(shell echo $(DISTRO) | grep -i 'red\|rhel' >/dev/null 
2>&1; echo $$?)
+ CENTOS = $(shell echo $(DISTRO) | grep -i centos  >/dev/null 
2>&1; echo $$?)
+ SUSE   = $(shell echo $(DISTRO) | grep -i suse>/dev/null 
2>&1; echo $$?)
++ARCHLX = $(shell echo $(DISTRO) | grep -i arch>/dev/null 
2>&1; echo $$?)
+ ifeq ("$(UBUNTU)","0")
+   ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l)
+ GLPATH := /usr/arm-linux-gnueabihf/lib
+@@ -102,6 +103,11 @@
+   GLPATH?= /usr/lib64/nvidia
+   GLLINK?= -L/usr/lib64/nvidia
+   DFLT_PATH ?= /usr/lib64
++endif
++ifeq ("$(ARCHLX)","0")
++  GLPATH?= /usr/lib64/nvidia
++  GLLINK?= -L/usr/lib64/nvidia
++  DFLT_PATH ?= /usr/lib64
+ endif
+   
+   # find libGL, libGLU, libXi, 


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

2016-07-11 Thread Sven-Hendrik Haase
Date: Monday, July 11, 2016 @ 21:33:11
  Author: svenstaro
Revision: 182669

upgpkg: cuda 7.5.18-4

Make it use gcc-5

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-11 20:46:01 UTC (rev 182668)
+++ PKGBUILD2016-07-11 21:33:11 UTC (rev 182669)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=7.5.18
-pkgrel=3
+pkgrel=4
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -48,7 +48,9 @@
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
   # allow newer gccs to work
-  # sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
+  sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
+  ln -s /usr/bin/gcc-5 "${pkgdir}/opt/cuda/bin/gcc"
+  ln -s /usr/bin/g++-5 "${pkgdir}/opt/cuda/bin/g++"
 
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
   install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"


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

2016-07-11 Thread Sven-Hendrik Haase
Date: Monday, July 11, 2016 @ 20:45:45
  Author: svenstaro
Revision: 182667

upgpkg: cuda 7.5.18-3

Add gcc5 dep

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-11 19:34:32 UTC (rev 182666)
+++ PKGBUILD2016-07-11 20:45:45 UTC (rev 182667)
@@ -2,12 +2,12 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=7.5.18
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom:NVIDIA')
-depends=('gcc-libs' 'opencl-nvidia')
+depends=('gcc-libs' 'opencl-nvidia' 'gcc5')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb')
@@ -47,8 +47,8 @@
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
-  # allow gcc 4.9 to work
-  sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
+  # allow newer gccs to work
+  # sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
 
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
   install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"


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

2016-05-01 Thread Sven-Hendrik Haase
Date: Sunday, May 1, 2016 @ 13:21:00
  Author: svenstaro
Revision: 173255

upgpkg: cuda 7.5.18-2

Add nvvm to cuda ld config

Modified:
  cuda/trunk/PKGBUILD
  cuda/trunk/cuda.conf

---+
 PKGBUILD  |6 +++---
 cuda.conf |2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-01 11:16:33 UTC (rev 173254)
+++ PKGBUILD2016-05-01 11:21:00 UTC (rev 173255)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=7.5.18
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -16,9 +16,9 @@
 
source=(http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_${pkgver}_linux.run
 cuda.sh
 cuda.conf)
-md5sums=('b22ef6bc073f7cf767f547a84fb0e3c2'
+md5sums=('4b3bcecf0dfc35928a0898793cf3e4c6'
  '7e5990e03eea90075f5a500e91a0c3d3'
- 'ffe1e6fb7f97b23da28fd94a5fd7356d')
+ '71420ee4e90c65df21c6c5d34373c245')
 
 prepare() {
   sh cuda_${pkgver}_linux.run -extract=${srcdir}

Modified: cuda.conf
===
--- cuda.conf   2016-05-01 11:16:33 UTC (rev 173254)
+++ cuda.conf   2016-05-01 11:21:00 UTC (rev 173255)
@@ -1,2 +1,4 @@
 /opt/cuda/lib64
 /opt/cuda/lib
+/opt/cuda/nvvm/lib64
+/opt/cuda/nvvm/lib


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

2015-09-08 Thread Sven-Hendrik Haase
Date: Tuesday, September 8, 2015 @ 18:07:02
  Author: svenstaro
Revision: 139621

upgpkg: cuda 7.5.18-1

upstream release 7.5.18

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-08 15:38:56 UTC (rev 139620)
+++ PKGBUILD2015-09-08 16:07:02 UTC (rev 139621)
@@ -1,8 +1,8 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=7.0.28
-pkgrel=2
+pkgver=7.5.18
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -13,10 +13,10 @@
 optdepends=('gdb: for cuda-gdb')
 options=(!strip staticlibs)
 install=cuda.install
-source=(http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_${pkgver}_linux.run
+source=(http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_${pkgver}_linux.run
 cuda.sh
 cuda.conf)
-md5sums=('312aede1c3d1d3425c8caa67bbb7a55e'
+md5sums=('b22ef6bc073f7cf767f547a84fb0e3c2'
  '7e5990e03eea90075f5a500e91a0c3d3'
  'ffe1e6fb7f97b23da28fd94a5fd7356d')
 


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

2015-04-24 Thread Sven-Hendrik Haase
Date: Friday, April 24, 2015 @ 12:14:06
  Author: svenstaro
Revision: 132095

upgpkg: cuda 7.0.28-2

We don't care about unsupported compilers lol

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-24 09:49:49 UTC (rev 132094)
+++ PKGBUILD2015-04-24 10:14:06 UTC (rev 132095)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=7.0.28
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -48,7 +48,7 @@
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
   # allow gcc 4.9 to work
-  #sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
+  sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
 
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
   install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"


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

2015-03-21 Thread Sven-Hendrik Haase
Date: Saturday, March 21, 2015 @ 14:24:33
  Author: svenstaro
Revision: 129689

upgpkg: cuda 7.0.28-1

upstream release 7.0.28

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-21 13:00:38 UTC (rev 129688)
+++ PKGBUILD2015-03-21 13:24:33 UTC (rev 129689)
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=6.5.19
+pkgver=7.0.28
 pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
@@ -13,15 +13,15 @@
 optdepends=('gdb: for cuda-gdb')
 options=(!strip staticlibs)
 install=cuda.install
-source=(http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_${pkgver}_linux_64.run
+source=(http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_${pkgver}_linux.run
 cuda.sh
 cuda.conf)
-md5sums=('74014042f92d3eade43af0da5f65935e'
+md5sums=('312aede1c3d1d3425c8caa67bbb7a55e'
  '7e5990e03eea90075f5a500e91a0c3d3'
  'ffe1e6fb7f97b23da28fd94a5fd7356d')
 
 prepare() {
-  sh cuda_${pkgver}_linux_64.run -extract=${srcdir}
+  sh cuda_${pkgver}_linux.run -extract=${srcdir}
   ./cuda-linux64-rel-*.run --noexec --keep
   ./cuda-samples-linux-*.run --noexec --keep
 
@@ -48,7 +48,7 @@
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
   # allow gcc 4.9 to work
-  sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
+  #sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
 
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
   install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"


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

2015-02-05 Thread Sven-Hendrik Haase
Date: Friday, February 6, 2015 @ 00:02:21
  Author: svenstaro
Revision: 127172

upgpkg: cuda 6.5.19-1

upstream release 6.5.19

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-05 22:44:40 UTC (rev 127171)
+++ PKGBUILD2015-02-05 23:02:21 UTC (rev 127172)
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=6.5.14
+pkgver=6.5.19
 pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
@@ -16,7 +16,7 @@
 
source=(http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_${pkgver}_linux_64.run
 cuda.sh
 cuda.conf)
-md5sums=('90b1b8f77313600cc294d9271741f4da'
+md5sums=('74014042f92d3eade43af0da5f65935e'
  '7e5990e03eea90075f5a500e91a0c3d3'
  'ffe1e6fb7f97b23da28fd94a5fd7356d')
 


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

2014-08-20 Thread Sven-Hendrik Haase
Date: Thursday, August 21, 2014 @ 00:50:15
  Author: svenstaro
Revision: 117685

upgpkg: cuda 6.5.14-1

upstream release 6.5.14

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-20 22:45:10 UTC (rev 117684)
+++ PKGBUILD2014-08-20 22:50:15 UTC (rev 117685)
@@ -1,8 +1,8 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=6.0.37
-pkgrel=2
+pkgver=6.5.14
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -13,10 +13,10 @@
 optdepends=('gdb: for cuda-gdb')
 options=(!strip staticlibs)
 install=cuda.install
-source=(http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_${pkgver}_linux_64.run
+source=(http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_${pkgver}_linux_64.run
 cuda.sh
 cuda.conf)
-md5sums=('22f50793b6704fe987983302fa7d1707'
+md5sums=('90b1b8f77313600cc294d9271741f4da'
  '7e5990e03eea90075f5a500e91a0c3d3'
  'ffe1e6fb7f97b23da28fd94a5fd7356d')
 



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

2014-05-14 Thread Sven-Hendrik Haase
Date: Wednesday, May 14, 2014 @ 16:26:47
  Author: svenstaro
Revision: 26

upgpkg: cuda 6.0.37-2

allow gcc 4.9 to work more or less I guess

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-14 14:19:59 UTC (rev 25)
+++ PKGBUILD2014-05-14 14:26:47 UTC (rev 26)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=6.0.37
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -47,6 +47,9 @@
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
+  # allow gcc 4.9 to work
+  sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
+
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
   install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"
 



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

2014-04-16 Thread Sven-Hendrik Haase
Date: Wednesday, April 16, 2014 @ 12:39:36
  Author: svenstaro
Revision: 109581

upgpkg: cuda 6.0.37-1

upstream release 6.0.37

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-16 10:34:40 UTC (rev 109580)
+++ PKGBUILD2014-04-16 10:39:36 UTC (rev 109581)
@@ -1,8 +1,8 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=6.0.26_rc
-pkgrel=3
+pkgver=6.0.37
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -13,15 +13,15 @@
 optdepends=('gdb: for cuda-gdb')
 options=(!strip staticlibs)
 install=cuda.install
-source=(http://developer.download.nvidia.com/compute/cuda/6_0/rc/installers/cuda_${pkgver}_linux64.run
+source=(http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_${pkgver}_linux_64.run
 cuda.sh
 cuda.conf)
-md5sums=('ea1e1235ebc17dc8e2ca2bec3febde52'
+md5sums=('22f50793b6704fe987983302fa7d1707'
  '7e5990e03eea90075f5a500e91a0c3d3'
  'ffe1e6fb7f97b23da28fd94a5fd7356d')
 
 prepare() {
-  sh cuda_${pkgver}_linux64.run -extract=${srcdir}
+  sh cuda_${pkgver}_linux_64.run -extract=${srcdir}
   ./cuda-linux64-rel-*.run --noexec --keep
   ./cuda-samples-linux-*.run --noexec --keep
 



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

2014-03-16 Thread Sven-Hendrik Haase
Date: Monday, March 17, 2014 @ 00:56:49
  Author: svenstaro
Revision: 107312

upgpkg: cuda 6.0.26_rc-3

Fix FS#39246

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-16 23:55:04 UTC (rev 107311)
+++ PKGBUILD2014-03-16 23:56:49 UTC (rev 107312)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=6.0.26_rc
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -30,7 +30,7 @@
   # 1rd sed line: sets right path to install man files
   # 2rd sed line: hack to lie installer, now detect launch script by root
   # 3rd sed line: sets right path in .desktop files and other .desktop stuff 
(warnings by desktop-file-validate)
-  sed -e "s|/usr/share|${pkgdir}/${pkgname}/usr/share|g" \
+  sed -e "s|/usr/share|${srcdir}/../pkg/${pkgname}/usr/share|g" \
   -e 's|can_add_for_all_users;|1;|g' \
   -e 's|=\\"$prefix\\\"|=/opt/cuda|g' -e 's|Terminal=No|Terminal=false|g' 
-e 's|ParallelComputing|ParallelComputing;|g' \
   -i pkg/install-linux.pl



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

2014-03-15 Thread Sven-Hendrik Haase
Date: Sunday, March 16, 2014 @ 04:49:45
  Author: svenstaro
Revision: 107274

upgpkg: cuda 6.0.26_rc-2

Fix FS#39246

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-16 03:10:55 UTC (rev 107273)
+++ PKGBUILD2014-03-16 03:49:45 UTC (rev 107274)
@@ -20,7 +20,6 @@
  '7e5990e03eea90075f5a500e91a0c3d3'
  'ffe1e6fb7f97b23da28fd94a5fd7356d')
 
-PKGEXT='.pkg.tar' # use for test, compress cuda is a f*king pain (looong time)
 prepare() {
   sh cuda_${pkgver}_linux64.run -extract=${srcdir}
   ./cuda-linux64-rel-*.run --noexec --keep
@@ -44,7 +43,7 @@
 }
 
 package() {
-  cd ${pkgdir}
+  cd pkg
   perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
   perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
@@ -51,6 +50,7 @@
   install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
   install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"
 
+  mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
   ln -s /opt/cuda/doc/pdf/EULA.pdf 
"${pkgdir}/usr/share/licenses/${pkgname}/EULA.pdf"
 
   # remove redundant man and samples



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

2014-03-15 Thread Sven-Hendrik Haase
Date: Sunday, March 16, 2014 @ 03:56:04
  Author: svenstaro
Revision: 107271

Prepare new build

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   62 +
 1 file changed, 34 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-16 02:21:24 UTC (rev 107270)
+++ PKGBUILD2014-03-16 02:56:04 UTC (rev 107271)
@@ -2,52 +2,58 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=6.0.26_rc
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
-license=('custom')
+license=('custom:NVIDIA')
 depends=('gcc-libs' 'opencl-nvidia')
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb')
 options=(!strip staticlibs)
-md5sums=('ea1e1235ebc17dc8e2ca2bec3febde52'
- '7e5990e03eea90075f5a500e91a0c3d3'
- 'ffe1e6fb7f97b23da28fd94a5fd7356d')
 install=cuda.install
 
source=(http://developer.download.nvidia.com/compute/cuda/6_0/rc/installers/cuda_${pkgver}_linux64.run
 cuda.sh
 cuda.conf)
+md5sums=('ea1e1235ebc17dc8e2ca2bec3febde52'
+ '7e5990e03eea90075f5a500e91a0c3d3'
+ 'ffe1e6fb7f97b23da28fd94a5fd7356d')
 
-package() {
-  sh cuda_${pkgver}_linux64.run -extract=$srcdir
-  ./cuda-linux64-rel-6.0.26*.run -prefix=$pkgdir/opt/cuda -noprompt
-  ./cuda-samples-linux-6.0.26*.run -cudaprefix=$pkgdir/opt/cuda 
-prefix=$pkgdir/opt/cuda/samples -noprompt
+PKGEXT='.pkg.tar' # use for test, compress cuda is a f*king pain (looong time)
+prepare() {
+  sh cuda_${pkgver}_linux64.run -extract=${srcdir}
+  ./cuda-linux64-rel-*.run --noexec --keep
+  ./cuda-samples-linux-*.run --noexec --keep
 
-  # Now, let the hacks begin!
+  # path hacks
 
-  # allow newer gcc to work
-  # NOTE: We don't need these currently, but we might again! :D
-  #sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
-  #sed -i "1 i #define __STRICT_ANSI__" $pkgdir/opt/cuda/include/cuda_runtime.h
-  #echo "#undef _GLIBCXX_ATOMIC_BUILTINS" >> 
$pkgdir/opt/cuda/include/cuda_runtime.h
-  #echo "#define _GLIBCXX_GTHREAD_USE_WEAK 0" >> 
$pkgdir/opt/cuda/include/cuda_runtime.h
+  # 1rd sed line: sets right path to install man files
+  # 2rd sed line: hack to lie installer, now detect launch script by root
+  # 3rd sed line: sets right path in .desktop files and other .desktop stuff 
(warnings by desktop-file-validate)
+  sed -e "s|/usr/share|${pkgdir}/${pkgname}/usr/share|g" \
+  -e 's|can_add_for_all_users;|1;|g' \
+  -e 's|=\\"$prefix\\\"|=/opt/cuda|g' -e 's|Terminal=No|Terminal=false|g' 
-e 's|ParallelComputing|ParallelComputing;|g' \
+  -i pkg/install-linux.pl
 
-  # fix nvidia path fuckup
-  #sed -i "s|/build/pkg/cuda||g" $pkgdir/opt/cuda/bin/nvvp 
$pkgdir/opt/cuda/bin/nsight
+  # set right path in Samples Makefiles
+  sed 's|\$cudaprefix\\|\\/opt\\/cuda\\|g' -i pkg/install-sdk-linux.pl
 
-  install -Dm755 $srcdir/cuda.sh $pkgdir/etc/profile.d/cuda.sh
-  install -Dm644 $srcdir/cuda.conf $pkgdir/etc/ld.so.conf.d/cuda.conf
+  # use python2
+  find pkg -name '*.py' | xargs sed -i -e 's|env python|env python2|g' -e 
's|bin/python|bin/python2|g'
+}
 
-  # correct cuda path in samples
-  cd $pkgdir/opt/cuda/samples
-  find . -name Makefile | xargs sed -i "s|$pkgdir/opt/cuda|/opt/cuda|g"
+package() {
+  cd ${pkgdir}
+  perl install-linux.pl -prefix="${pkgdir}/opt/cuda" -noprompt
+  perl install-sdk-linux.pl -cudaprefix="${pkgdir}/opt/cuda" 
-prefix="${pkgdir}/opt/cuda/samples" -noprompt
 
-  # make cuda-gdk work
-  mkdir -p $pkgdir/usr/lib
-  cd $pkgdir/usr/lib
-  ln -s /usr/lib/libncurses.so.5 libtinfo.so.5
+  install -Dm755 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
+  install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"
 
-  install -Dm644 $pkgdir/opt/cuda/doc/pdf/EULA.pdf 
$pkgdir/usr/share/licenses/$pkgname/EULA.pdf
+  ln -s /opt/cuda/doc/pdf/EULA.pdf 
"${pkgdir}/usr/share/licenses/${pkgname}/EULA.pdf"
+
+  # remove redundant man and samples
+  rm -fr "${pkgdir}/opt/cuda/doc/man"
+  rm -fr "${pkgdir}/opt/cuda/cuda-samples"
 }



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

2014-03-08 Thread Sven-Hendrik Haase
Date: Sunday, March 9, 2014 @ 01:18:17
  Author: svenstaro
Revision: 106833

upgpkg: cuda 6.0.26_rc-1

upstream release 6.0.26rc

Modified:
  cuda/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-03-08 20:39:18 UTC (rev 106832)
+++ PKGBUILD2014-03-09 00:18:17 UTC (rev 106833)
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=5.5.22
+pkgver=6.0.26_rc
 pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
@@ -12,18 +12,18 @@
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb')
 options=(!strip staticlibs)
-md5sums=('7bb06908bdf33eac0f8426821640c2fb'
+md5sums=('ea1e1235ebc17dc8e2ca2bec3febde52'
  '7e5990e03eea90075f5a500e91a0c3d3'
  'ffe1e6fb7f97b23da28fd94a5fd7356d')
 install=cuda.install
-source=(http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_${pkgver}_linux_64.run
+source=(http://developer.download.nvidia.com/compute/cuda/6_0/rc/installers/cuda_${pkgver}_linux64.run
 cuda.sh
 cuda.conf)
 
 package() {
-  sh cuda_${pkgver}_linux_64.run -extract=$srcdir
-  ./cuda-linux64-rel-${pkgver}*.run -prefix=$pkgdir/opt/cuda -noprompt
-  ./cuda-samples-linux-${pkgver}*.run -cudaprefix=$pkgdir/opt/cuda 
-prefix=$pkgdir/opt/cuda/samples -noprompt
+  sh cuda_${pkgver}_linux64.run -extract=$srcdir
+  ./cuda-linux64-rel-6.0.26*.run -prefix=$pkgdir/opt/cuda -noprompt
+  ./cuda-samples-linux-6.0.26*.run -cudaprefix=$pkgdir/opt/cuda 
-prefix=$pkgdir/opt/cuda/samples -noprompt
 
   # Now, let the hacks begin!
 



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

2013-10-30 Thread Sven-Hendrik Haase
Date: Wednesday, October 30, 2013 @ 20:53:39
  Author: svenstaro
Revision: 99661

Ship license

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |2 ++
 1 file changed, 2 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-30 19:44:33 UTC (rev 99660)
+++ PKGBUILD2013-10-30 19:53:39 UTC (rev 99661)
@@ -48,4 +48,6 @@
   mkdir -p $pkgdir/usr/lib
   cd $pkgdir/usr/lib
   ln -s /usr/lib/libncurses.so.5 libtinfo.so.5
+
+  install -Dm644 $pkgdir/opt/cuda/doc/pdf/EULA.pdf 
$pkgdir/usr/share/licenses/$pkgname/EULA.pdf
 }



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

2013-10-30 Thread Sven-Hendrik Haase
Date: Wednesday, October 30, 2013 @ 18:05:16
  Author: svenstaro
Revision: 99644

Add options staticlibs

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-30 17:00:09 UTC (rev 99643)
+++ PKGBUILD2013-10-30 17:05:16 UTC (rev 99644)
@@ -11,7 +11,7 @@
 replaces=('cuda-toolkit' 'cuda-sdk')
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb')
-options=(!strip)
+options=(!strip staticlibs)
 md5sums=('7bb06908bdf33eac0f8426821640c2fb'
  '7e5990e03eea90075f5a500e91a0c3d3'
  'ffe1e6fb7f97b23da28fd94a5fd7356d')



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

2013-08-04 Thread Sven-Hendrik Haase
Date: Sunday, August 4, 2013 @ 12:38:58
  Author: svenstaro
Revision: 95042

upgpkg: cuda 5.5.22-1

Updating to 5.5.22

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |   50 ++
 1 file changed, 18 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-04 10:16:34 UTC (rev 95041)
+++ PKGBUILD2013-08-04 10:38:58 UTC (rev 95042)
@@ -1,10 +1,10 @@
 # $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
-pkgver=5.0.35
-pkgrel=6
+pkgver=5.5.22
+pkgrel=1
 pkgdesc="NVIDIA's GPU programming toolkit"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
 license=('custom')
 depends=('gcc-libs' 'opencl-nvidia')
@@ -12,51 +12,37 @@
 provides=('cuda-toolkit' 'cuda-sdk')
 optdepends=('gdb: for cuda-gdb')
 options=(!strip)
-if [ "$CARCH" = "i686" ]; then
-  _arch=32
-  md5sums=('40c514acb750902c54656b97a6deded6'
-   '7e5990e03eea90075f5a500e91a0c3d3'
-   'ffe1e6fb7f97b23da28fd94a5fd7356d')
-else
-  _arch=64
-  md5sums=('df796fb9ab66075b5c346b3fd0bf596b'
-   '7e5990e03eea90075f5a500e91a0c3d3'
-   'ffe1e6fb7f97b23da28fd94a5fd7356d')
-fi
+md5sums=('7bb06908bdf33eac0f8426821640c2fb'
+ '7e5990e03eea90075f5a500e91a0c3d3'
+ 'ffe1e6fb7f97b23da28fd94a5fd7356d')
 install=cuda.install
-source=(http://developer.download.nvidia.com/compute/cuda/5_0/rel-update-1/installers/cuda_${pkgver}_linux_${_arch}_fedora16-1.run
+source=(http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_${pkgver}_linux_64.run
 cuda.sh
 cuda.conf)
 
-build() {
-  cd "$srcdir"
-}
-
 package() {
-  sh cuda_${pkgver}_linux_${_arch}_fedora16-1.run -toolkitpath=$PWD 
-samplespath=$PWD -extract=$srcdir
-  ./cudatoolkit_${pkgver}_linux_${_arch}_fedora16.run -prefix=$pkgdir/opt/cuda 
-noprompt
-  ./cuda-samples_${pkgver}_linux.run -cudaprefix=$pkgdir/opt/cuda 
-prefix=$pkgdir/opt/cuda/samples -noprompt
+  sh cuda_${pkgver}_linux_64.run -extract=$srcdir
+  ./cuda-linux64-rel-${pkgver}*.run -prefix=$pkgdir/opt/cuda -noprompt
+  ./cuda-samples-linux-${pkgver}*.run -cudaprefix=$pkgdir/opt/cuda 
-prefix=$pkgdir/opt/cuda/samples -noprompt
 
   # Now, let the hacks begin!
 
-  # allow gcc 4.7 to work
-  sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
+  # allow newer gcc to work
+  # NOTE: We don't need these currently, but we might again! :D
+  #sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
+  #sed -i "1 i #define __STRICT_ANSI__" $pkgdir/opt/cuda/include/cuda_runtime.h
+  #echo "#undef _GLIBCXX_ATOMIC_BUILTINS" >> 
$pkgdir/opt/cuda/include/cuda_runtime.h
+  #echo "#define _GLIBCXX_GTHREAD_USE_WEAK 0" >> 
$pkgdir/opt/cuda/include/cuda_runtime.h
 
-  # allow gcc 4.8 to work
-  sed -i "1 i #define __STRICT_ANSI__" $pkgdir/opt/cuda/include/cuda_runtime.h
-  echo "#undef _GLIBCXX_ATOMIC_BUILTINS" >> 
$pkgdir/opt/cuda/include/cuda_runtime.h
-  echo "#define _GLIBCXX_GTHREAD_USE_WEAK 0" >> 
$pkgdir/opt/cuda/include/cuda_runtime.h
-
   # fix nvidia path fuckup
-  sed -i "s|/build/pkg/cuda||g" $pkgdir/opt/cuda/bin/nvvp 
$pkgdir/opt/cuda/bin/nsight
+  #sed -i "s|/build/pkg/cuda||g" $pkgdir/opt/cuda/bin/nvvp 
$pkgdir/opt/cuda/bin/nsight
 
   install -Dm755 $srcdir/cuda.sh $pkgdir/etc/profile.d/cuda.sh
   install -Dm644 $srcdir/cuda.conf $pkgdir/etc/ld.so.conf.d/cuda.conf
-  install -Dm644 $pkgdir/opt/cuda/doc/EULA.txt 
$pkgdir/usr/share/licenses/$pkgname/LICENSE
 
   # correct cuda path in samples
   cd $pkgdir/opt/cuda/samples
-  find . -type f | egrep -v '(ppm|pgm)' | xargs grep -lI "$pkgdir/opt/cuda" | 
xargs sed -i "s|$pkgdir/opt/cuda|/opt/cuda|g"
+  find . -name Makefile | xargs sed -i "s|$pkgdir/opt/cuda|/opt/cuda|g"
 
   # make cuda-gdk work
   mkdir -p $pkgdir/usr/lib



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

2013-04-14 Thread Sven-Hendrik Haase
Date: Monday, April 15, 2013 @ 04:08:23
  Author: svenstaro
Revision: 88244

upgpkg: cuda 5.0.35-6

Fix FS#34751

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-15 01:48:05 UTC (rev 88243)
+++ PKGBUILD2013-04-15 02:08:23 UTC (rev 88244)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=5.0.35
-pkgrel=5
+pkgrel=6
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -48,8 +48,7 @@
   echo "#define _GLIBCXX_GTHREAD_USE_WEAK 0" >> 
$pkgdir/opt/cuda/include/cuda_runtime.h
 
   # fix nvidia path fuckup
-  sed -i "s|/build/pkg||g" $pkgdir/opt/cuda/bin/nvvp
-  sed -i "s|/build/pkg||g" $pkgdir/opt/cuda/bin/nsight
+  sed -i "s|/build/pkg/cuda||g" $pkgdir/opt/cuda/bin/nvvp 
$pkgdir/opt/cuda/bin/nsight
 
   install -Dm755 $srcdir/cuda.sh $pkgdir/etc/profile.d/cuda.sh
   install -Dm644 $srcdir/cuda.conf $pkgdir/etc/ld.so.conf.d/cuda.conf



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

2013-04-08 Thread Sven-Hendrik Haase
Date: Monday, April 8, 2013 @ 16:10:06
  Author: svenstaro
Revision: 87884

upgpkg: cuda 5.0.35-5

More hacks for gcc 4.8

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-08 12:53:13 UTC (rev 87883)
+++ PKGBUILD2013-04-08 14:10:06 UTC (rev 87884)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=5.0.35
-pkgrel=4
+pkgrel=5
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -37,11 +37,15 @@
   ./cudatoolkit_${pkgver}_linux_${_arch}_fedora16.run -prefix=$pkgdir/opt/cuda 
-noprompt
   ./cuda-samples_${pkgver}_linux.run -cudaprefix=$pkgdir/opt/cuda 
-prefix=$pkgdir/opt/cuda/samples -noprompt
 
+  # Now, let the hacks begin!
+
   # allow gcc 4.7 to work
   sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
 
   # allow gcc 4.8 to work
   sed -i "1 i #define __STRICT_ANSI__" $pkgdir/opt/cuda/include/cuda_runtime.h
+  echo "#undef _GLIBCXX_ATOMIC_BUILTINS" >> 
$pkgdir/opt/cuda/include/cuda_runtime.h
+  echo "#define _GLIBCXX_GTHREAD_USE_WEAK 0" >> 
$pkgdir/opt/cuda/include/cuda_runtime.h
 
   # fix nvidia path fuckup
   sed -i "s|/build/pkg||g" $pkgdir/opt/cuda/bin/nvvp



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

2013-04-05 Thread Sven-Hendrik Haase
Date: Friday, April 5, 2013 @ 09:25:02
  Author: svenstaro
Revision: 87657

upgpkg: cuda 5.0.35-4

Fix for gcc 4.8

Modified:
  cuda/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-05 07:06:16 UTC (rev 87656)
+++ PKGBUILD2013-04-05 07:25:02 UTC (rev 87657)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase 
 pkgname=cuda
 pkgver=5.0.35
-pkgrel=3
+pkgrel=4
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/object/cuda_home.html";
@@ -40,6 +40,9 @@
   # allow gcc 4.7 to work
   sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h
 
+  # allow gcc 4.8 to work
+  sed -i "1 i #define __STRICT_ANSI__" $pkgdir/opt/cuda/include/cuda_runtime.h
+
   # fix nvidia path fuckup
   sed -i "s|/build/pkg||g" $pkgdir/opt/cuda/bin/nvvp
   sed -i "s|/build/pkg||g" $pkgdir/opt/cuda/bin/nsight