[arch-commits] Commit in cuda/repos/community-testing-x86_64 (10 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Tue May 29 23:42:56 UTC 2018


    Date: Tuesday, May 29, 2018 @ 23:42:56
  Author: svenstaro
Revision: 333222

archrelease: copy trunk to community-testing-x86_64

Added:
  cuda/repos/community-testing-x86_64/PKGBUILD
    (from rev 333221, cuda/trunk/PKGBUILD)
  cuda/repos/community-testing-x86_64/cuda-findgllib_mk.diff
    (from rev 333221, cuda/trunk/cuda-findgllib_mk.diff)
  cuda/repos/community-testing-x86_64/cuda.conf
    (from rev 333221, cuda/trunk/cuda.conf)
  cuda/repos/community-testing-x86_64/cuda.install
    (from rev 333221, cuda/trunk/cuda.install)
  cuda/repos/community-testing-x86_64/cuda.sh
    (from rev 333221, cuda/trunk/cuda.sh)
Deleted:
  cuda/repos/community-testing-x86_64/PKGBUILD
  cuda/repos/community-testing-x86_64/cuda-findgllib_mk.diff
  cuda/repos/community-testing-x86_64/cuda.conf
  cuda/repos/community-testing-x86_64/cuda.install
  cuda/repos/community-testing-x86_64/cuda.sh

------------------------+
 PKGBUILD               |  194 +++++++++++++++++++++++------------------------
 cuda-findgllib_mk.diff |   44 +++++-----
 cuda.conf              |    8 -
 cuda.install           |   22 ++---
 cuda.sh                |    2 
 5 files changed, 135 insertions(+), 135 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-29 23:30:40 UTC (rev 333221)
+++ PKGBUILD	2018-05-29 23:42:56 UTC (rev 333222)
@@ -1,97 +0,0 @@
-# $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgname=cuda
-pkgver=9.2.88.1
-_basever=9.2.88
-_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=('gcc7-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc7')
-replaces=('cuda-toolkit' 'cuda-sdk')
-provides=('cuda-toolkit' 'cuda-sdk')
-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.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
-        cuda-findgllib_mk.diff)
-sha512sums=('2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba'
-            'd43bddb2affbc66133aab69750e8c95fd4e86bf6357c50b580301dda1819940c33e1cb442f08b25784c82d6e4de1ca6f5b474e51b1396253e4a4e6d820294ff7'
-            'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
-            '66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
-            '6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
-
-prepare() {
-  sh cuda_${_basever}_${_driverver}_linux --extract=${srcdir}
-  ./cuda-*.run --noexec --keep
-  ./cuda-samples*.run --noexec --keep
-
-  # 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
-    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
-  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.
-  # 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++"
-
-  # 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"
-
-  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/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"*.pl
-  rm -fr "${pkgdir}/opt/cuda/bin/cuda-install-samples"*.sh
-  rm -fr "${pkgdir}/opt/cuda/bin/uninstall_cuda_toolkit"*.pl
-}

Copied: cuda/repos/community-testing-x86_64/PKGBUILD (from rev 333221, cuda/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-29 23:42:56 UTC (rev 333222)
@@ -0,0 +1,97 @@
+# $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgname=cuda
+pkgver=9.2.88.1
+_basever=9.2.88
+_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=('gcc7-libs' 'opencl-nvidia' 'nvidia-utils' 'gcc7')
+replaces=('cuda-toolkit' 'cuda-sdk')
+provides=('cuda-toolkit' 'cuda-sdk')
+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.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
+        cuda-findgllib_mk.diff)
+sha512sums=('2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba'
+            'd43bddb2affbc66133aab69750e8c95fd4e86bf6357c50b580301dda1819940c33e1cb442f08b25784c82d6e4de1ca6f5b474e51b1396253e4a4e6d820294ff7'
+            'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
+            '66bd93ecab7e1aa07218c3dd1c96e460f63ed4ac47e853ecb313c78a58e5425c8a5772f1c7f73d696bf5f93fc3e556a046a4ed955a53d900976ac525abd1f518'
+            '6e9a15c73849e6400b0289ed9d6e9d3b7f100712713efcb7bbf4921f39fe671cd9fd3958e735c0da3a44f9afdd2aca94dbc63b564970a0dcacba599b570aca0f')
+
+prepare() {
+  sh cuda_${_basever}_${_driverver}_linux --extract=${srcdir}
+  ./cuda-*.run --noexec --keep
+  ./cuda-samples*.run --noexec --keep
+
+  # 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
+    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
+  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.
+  # 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++"
+
+  # 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"
+
+  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/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"*.pl
+  rm -fr "${pkgdir}/opt/cuda/bin/cuda-install-samples"*.sh
+  rm -fr "${pkgdir}/opt/cuda/bin/uninstall_cuda_toolkit"*.pl
+}

Deleted: cuda-findgllib_mk.diff
===================================================================
--- cuda-findgllib_mk.diff	2018-05-29 23:30:40 UTC (rev 333221)
+++ cuda-findgllib_mk.diff	2018-05-29 23:42:56 UTC (rev 333222)
@@ -1,22 +0,0 @@
---- ./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
-@@ -100,6 +101,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, 

Copied: cuda/repos/community-testing-x86_64/cuda-findgllib_mk.diff (from rev 333221, cuda/trunk/cuda-findgllib_mk.diff)
===================================================================
--- cuda-findgllib_mk.diff	                        (rev 0)
+++ cuda-findgllib_mk.diff	2018-05-29 23:42:56 UTC (rev 333222)
@@ -0,0 +1,22 @@
+--- ./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
+@@ -100,6 +101,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, 

Deleted: cuda.conf
===================================================================
--- cuda.conf	2018-05-29 23:30:40 UTC (rev 333221)
+++ cuda.conf	2018-05-29 23:42:56 UTC (rev 333222)
@@ -1,4 +0,0 @@
-/opt/cuda/lib64
-/opt/cuda/lib
-/opt/cuda/nvvm/lib64
-/opt/cuda/nvvm/lib

Copied: cuda/repos/community-testing-x86_64/cuda.conf (from rev 333221, cuda/trunk/cuda.conf)
===================================================================
--- cuda.conf	                        (rev 0)
+++ cuda.conf	2018-05-29 23:42:56 UTC (rev 333222)
@@ -0,0 +1,4 @@
+/opt/cuda/lib64
+/opt/cuda/lib
+/opt/cuda/nvvm/lib64
+/opt/cuda/nvvm/lib

Deleted: cuda.install
===================================================================
--- cuda.install	2018-05-29 23:30:40 UTC (rev 333221)
+++ cuda.install	2018-05-29 23:42:56 UTC (rev 333222)
@@ -1,11 +0,0 @@
-post_install() {
-    echo "The cuda binaries are in /opt/cuda/bin"
-    echo "The cuda samples are in /opt/cuda/samples"
-    echo "The cuda docs are in /opt/cuda/doc"
-    echo "You need to relogin in order for the cuda binaries to appear in your PATH"
-    post_upgrade
-}
-
-post_upgrade() {
-    ldconfig -r .
-}

Copied: cuda/repos/community-testing-x86_64/cuda.install (from rev 333221, cuda/trunk/cuda.install)
===================================================================
--- cuda.install	                        (rev 0)
+++ cuda.install	2018-05-29 23:42:56 UTC (rev 333222)
@@ -0,0 +1,11 @@
+post_install() {
+    echo "The cuda binaries are in /opt/cuda/bin"
+    echo "The cuda samples are in /opt/cuda/samples"
+    echo "The cuda docs are in /opt/cuda/doc"
+    echo "You need to relogin in order for the cuda binaries to appear in your PATH"
+    post_upgrade
+}
+
+post_upgrade() {
+    ldconfig -r .
+}

Deleted: cuda.sh
===================================================================
--- cuda.sh	2018-05-29 23:30:40 UTC (rev 333221)
+++ cuda.sh	2018-05-29 23:42:56 UTC (rev 333222)
@@ -1 +0,0 @@
-export PATH=$PATH:/opt/cuda/bin

Copied: cuda/repos/community-testing-x86_64/cuda.sh (from rev 333221, cuda/trunk/cuda.sh)
===================================================================
--- cuda.sh	                        (rev 0)
+++ cuda.sh	2018-05-29 23:42:56 UTC (rev 333222)
@@ -0,0 +1 @@
+export PATH=$PATH:/opt/cuda/bin



More information about the arch-commits mailing list