Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages /
cuda
Commits:
eedfd7f6 by Sven-Hendrik Haase at 2023-11-04T15:40:09+01:00
upgpkg: 12.3.0-2: Try to fix wrong gcc getting used
Apparently the former mechanism is now broken?
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- cuda.sh
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = cuda
pkgdesc = NVIDIA's GPU programming toolkit
pkgver = 12.3.0
- pkgrel = 1
+ pkgrel = 2
url = https://developer.nvidia.com/cuda-zone
install = cuda.install
arch = x86_64
@@ -44,7 +44,7 @@ pkgbase = cuda
source = nvrtc.pc
source = nvToolsExt.pc
sha512sums =
b62e34ac694a2925e6c02ebb94d66c8c3f3773d04ee547284a0940c73769d52e3a2fe10cce6f0c3936a029b4c5f7ad1f6329426d54a5a8519ffd665d1fa654f6
- sha512sums =
35f1f56411eecb2d978553f5606a0d6e70ad363cfaa9f37b9e6f12a799b041caa4aeca183341055d4789425dc4d62bee0aac68cc9d864155084b1ea571ee998f
+ sha512sums =
a651ca3104e24e6b068e08607af41d979f8a1638ee27a56edd481b8a21c479aa3104c6a750a00397a6b7df2afb104ed67c9c8929bc7efe2fe2ea4e8b5eb938d4
sha512sums =
714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e
sha512sums =
a4b3b03682801a98a1d8c1d14c084fd35efd384d92d497e230e3a28e0bd97b1fa48a93ccb2150f892f0b4154ca4ea2d66f5484a6a59b5c9b49963de42ecf1736
sha512sums =
d69d3ec0e270648f55d8c3e420f89d056b120eca5b25e9e7fc1cca799d1a252909ee31ff399c137223eca57cdf82b856221a251b6ff1daf5d6f75c1a582b1e32
=====================================
PKGBUILD
=====================================
@@ -4,11 +4,12 @@ pkgname=(cuda cuda-tools)
pkgbase=cuda
pkgver=12.3.0
_driverver=545.23.06
-pkgrel=1
+pkgrel=2
pkgdesc="NVIDIA's GPU programming toolkit"
arch=('x86_64')
url="https://developer.nvidia.com/cuda-zone";
license=('custom:NVIDIA')
+# NOTE: When changing the gcc version, remember to also update it in
profile.d/cuda.sh
depends=('opencl-nvidia' 'nvidia-utils' 'python' 'gcc12')
options=(!strip staticlibs)
install=cuda.install
@@ -44,7 +45,7 @@
source=(https://developer.download.nvidia.com/compute/cuda/${pkgver}/local_insta
nvrtc.pc
nvToolsExt.pc)
sha512sums=('b62e34ac694a2925e6c02ebb94d66c8c3f3773d04ee547284a0940c73769d52e3a2fe10cce6f0c3936a029b4c5f7ad1f6329426d54a5a8519ffd665d1fa654f6'
-
'35f1f56411eecb2d978553f5606a0d6e70ad363cfaa9f37b9e6f12a799b041caa4aeca183341055d4789425dc4d62bee0aac68cc9d864155084b1ea571ee998f'
+
'a651ca3104e24e6b068e08607af41d979f8a1638ee27a56edd481b8a21c479aa3104c6a750a00397a6b7df2afb104ed67c9c8929bc7efe2fe2ea4e8b5eb938d4'
'714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e'
'a4b3b03682801a98a1d8c1d14c084fd35efd384d92d497e230e3a28e0bd97b1fa48a93ccb2150f892f0b4154ca4ea2d66f5484a6a59b5c9b49963de42ecf1736'
'd69d3ec0e270648f55d8c3e420f89d056b120eca5b25e9e7fc1cca799d1a252909ee31ff399c137223eca57cdf82b856221a251b6ff1daf5d6f75c1a582b1e32'
@@ -100,11 +101,6 @@ build() {
# Delete some unnecessary files
rm -r "${_prepdir}"/opt/cuda/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-12 "${_prepdir}/opt/cuda/bin/gcc"
- ln -s /usr/bin/g++-12 "${_prepdir}/opt/cuda/bin/g++"
-
# Install profile and ld.so.config files
install -Dm755 "${srcdir}/cuda.sh" "${_prepdir}/etc/profile.d/cuda.sh"
install -Dm644 "${srcdir}/cuda.conf" "${_prepdir}/etc/ld.so.conf.d/cuda.conf"
=====================================
cuda.sh
=====================================
@@ -1,2 +1,4 @@
export CUDA_PATH=/opt/cuda
export
PATH=$PATH:/opt/cuda/bin:/opt/cuda/nsight_compute:/opt/cuda/nsight_systems/bin
+# NOTE: Make sure this is updated when the gcc host compiler dependency
changes.
+export NVCC_PREPEND_FLAGS='--cbin /usr/bin/g++-12'
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cuda/-/commit/eedfd7f6721155b4c35a0061698a11c7db9e7c7a
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cuda/-/commit/eedfd7f6721155b4c35a0061698a11c7db9e7c7a
You're receiving this email because of your account on gitlab.archlinux.org.
