[arch-commits] Commit in cuda/repos/community-testing-x86_64 (10 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Fri Mar 1 23:31:56 UTC 2019
Date: Friday, March 1, 2019 @ 23:31:55
Author: svenstaro
Revision: 437334
archrelease: copy trunk to community-testing-x86_64
Added:
cuda/repos/community-testing-x86_64/PKGBUILD
(from rev 437333, cuda/trunk/PKGBUILD)
cuda/repos/community-testing-x86_64/cuda-findgllib_mk.diff
(from rev 437333, cuda/trunk/cuda-findgllib_mk.diff)
cuda/repos/community-testing-x86_64/cuda.conf
(from rev 437333, cuda/trunk/cuda.conf)
cuda/repos/community-testing-x86_64/cuda.install
(from rev 437333, cuda/trunk/cuda.install)
cuda/repos/community-testing-x86_64/cuda.sh
(from rev 437333, 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 | 154 ++++++++++++++++++++++++-----------------------
cuda-findgllib_mk.diff | 44 ++++++-------
cuda.conf | 6 -
cuda.install | 22 +++---
cuda.sh | 2
5 files changed, 116 insertions(+), 112 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-01 23:31:18 UTC (rev 437333)
+++ PKGBUILD 2019-03-01 23:31:55 UTC (rev 437334)
@@ -1,75 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgname=cuda
-pkgver=10.1.105
-_basever=10.1.105
-_driverver=418.39
-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' 'nvidia-utils')
-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/10.1/Prod/local_installers/cuda_${_basever}_${_driverver}_linux.run
- cuda.sh
- cuda.conf
- cuda-findgllib_mk.diff)
-sha512sums=('07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622'
- 'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
- '714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
- '41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b')
-
-prepare() {
- 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
- patch $f cuda-findgllib_mk.diff
- done
-}
-
-package() {
- mkdir -p "${pkgdir}/opt/"
-
- cd 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"
-
- # 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 '' _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"
-
- 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
- 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"
-}
-
-# vim:set ts=2 sw=2 et:
-
Copied: cuda/repos/community-testing-x86_64/PKGBUILD (from rev 437333, cuda/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-03-01 23:31:55 UTC (rev 437334)
@@ -0,0 +1,79 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgname=cuda
+pkgver=10.1.105
+_basever=10.1.105
+_driverver=418.39
+pkgrel=5
+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/10.1/Prod/local_installers/cuda_${_basever}_${_driverver}_linux.run
+ cuda.sh
+ cuda.conf
+ cuda-findgllib_mk.diff)
+sha512sums=('07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622'
+ 'ce0b8df5d918ec8429da4ab8f9dee463ac04055ee5b0beeb0386b67d765a4c892d314995776a0d695cd06bcfbaf996e4904935ddc898a9d774f6bf965d989dea'
+ '714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
+ '41d6b6cad934f135eafde610d1cbd862033977fd4416a4b6abaa47709a70bab7fcf6f8377c21329084fb9db13f2a8c8c20e93c15292d7d4a6448d70a33b23f1b')
+
+prepare() {
+ 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
+ patch $f cuda-findgllib_mk.diff
+ done
+}
+
+package() {
+ mkdir -p "${pkgdir}/opt/"
+
+ cd 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"
+
+ # 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.
+ # 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
+
+ # 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 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"
+}
+
+# vim:set ts=2 sw=2 et:
+
Deleted: cuda-findgllib_mk.diff
===================================================================
--- cuda-findgllib_mk.diff 2019-03-01 23:31:18 UTC (rev 437333)
+++ cuda-findgllib_mk.diff 2019-03-01 23:31:55 UTC (rev 437334)
@@ -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\|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
-@@ -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 437333, cuda/trunk/cuda-findgllib_mk.diff)
===================================================================
--- cuda-findgllib_mk.diff (rev 0)
+++ cuda-findgllib_mk.diff 2019-03-01 23:31:55 UTC (rev 437334)
@@ -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\|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
+@@ -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 2019-03-01 23:31:18 UTC (rev 437333)
+++ cuda.conf 2019-03-01 23:31:55 UTC (rev 437334)
@@ -1,3 +0,0 @@
-/opt/cuda/lib64
-/opt/cuda/nvvm/lib64
-/opt/cuda/extras/CUPTI/lib64
Copied: cuda/repos/community-testing-x86_64/cuda.conf (from rev 437333, cuda/trunk/cuda.conf)
===================================================================
--- cuda.conf (rev 0)
+++ cuda.conf 2019-03-01 23:31:55 UTC (rev 437334)
@@ -0,0 +1,3 @@
+/opt/cuda/lib64
+/opt/cuda/nvvm/lib64
+/opt/cuda/extras/CUPTI/lib64
Deleted: cuda.install
===================================================================
--- cuda.install 2019-03-01 23:31:18 UTC (rev 437333)
+++ cuda.install 2019-03-01 23:31:55 UTC (rev 437334)
@@ -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 437333, cuda/trunk/cuda.install)
===================================================================
--- cuda.install (rev 0)
+++ cuda.install 2019-03-01 23:31:55 UTC (rev 437334)
@@ -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 2019-03-01 23:31:18 UTC (rev 437333)
+++ cuda.sh 2019-03-01 23:31:55 UTC (rev 437334)
@@ -1 +0,0 @@
-export PATH=$PATH:/opt/cuda/bin
Copied: cuda/repos/community-testing-x86_64/cuda.sh (from rev 437333, cuda/trunk/cuda.sh)
===================================================================
--- cuda.sh (rev 0)
+++ cuda.sh 2019-03-01 23:31:55 UTC (rev 437334)
@@ -0,0 +1 @@
+export PATH=$PATH:/opt/cuda/bin
More information about the arch-commits
mailing list