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 =================================================================== --- PKGBUILD 2019-02-27 12:58:13 UTC (rev 436427) +++ PKGBUILD 2019-02-27 12:58:16 UTC (rev 436428) @@ -1,14 +1,14 @@ # Maintainer: Sven-Hendrik Haase <[email protected]> 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/"{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 } Modified: cuda.conf =================================================================== --- cuda.conf 2019-02-27 12:58:13 UTC (rev 436427) +++ cuda.conf 2019-02-27 12:58:16 UTC (rev 436428) @@ -1,5 +1,4 @@ +/opt/cublas/lib /opt/cuda/lib64 -/opt/cuda/lib /opt/cuda/nvvm/lib64 -/opt/cuda/nvvm/lib /opt/cuda/extras/CUPTI/lib64
