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

[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
===================================================================
--- PKGBUILD	2013-08-04 10:16:34 UTC (rev 95041)
+++ PKGBUILD	2013-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 <sh at lutzhaase.com>
 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