Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages /
meson
Commits:
482bc794 by Jakub Klinkovský at 2025-09-06T18:50:24+02:00
Patch tests for CUDA 13
- - - - -
3 changed files:
- .SRCINFO
- + 0002-Update-tests-to-work-with-CUDA-13.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -78,6 +78,7 @@ pkgbase = meson
source = cross-lib32
source = native-clang
source = 0001-Skip-broken-tests.patch
+ source = 0002-Update-tests-to-work-with-CUDA-13.patch
validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70
validpgpkeys = BD27B07A5EF45C2ADAF70E0484818A6819AF4A9B
b2sums =
266c40d74c27b595250b537855f30bf5c2fafde6f9153530314794b2b6d2263dae187475cf9dc0a87851129dbe0737349de3c0fabdab19c26b92d8add8cc7403
@@ -85,5 +86,6 @@ pkgbase = meson
b2sums =
01de9b127552feaec612a0bc9551796e44f0800908bd759c6ede4dc22a65dd8ed4fc06dcbdeaef48c4aef926115d783ef019e429b01295526f23f8fa7d49e11b
b2sums =
7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e
b2sums =
20f87cfec26a32615a95a93d7b4785449f32673d6209c5e5ff4d3652ba3b558f1e5c604b7d4413d03e6a4704fdad1119b004fdc3b43d52d80cb27521861c35e1
+ b2sums =
a065b11de0ac9de29eb3de95187404e23fe9f85c89182460a1c386fee656a415d4358b75f0e9907b77dde1db3646adba76b60f2ff059bf224e4c07cb21f7e629
pkgname = meson
=====================================
0002-Update-tests-to-work-with-CUDA-13.patch
=====================================
@@ -0,0 +1,42 @@
+From 5345ccc11b3a60eea6aa043513a193aa83f8f210 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?=
+ <[email protected]>
+Date: Sat, 6 Sep 2025 18:42:09 +0200
+Subject: [PATCH] Update tests to work with CUDA 13
+
+---
+ test cases/cuda/17 separate compilation linking/meson.build | 2 +-
+ test cases/cuda/3 cudamodule/meson.build | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test cases/cuda/17 separate compilation linking/meson.build
b/test cases/cuda/17 separate compilation linking/meson.build
+index 7ba7e2208..a00e7299e 100644
+--- a/test cases/cuda/17 separate compilation linking/meson.build
++++ b/test cases/cuda/17 separate compilation linking/meson.build
+@@ -11,7 +11,7 @@ add_languages('cuda')
+ nvcc = meson.get_compiler('cuda')
+ cuda = import('unstable-cuda')
+
+-arch_flags = cuda.nvcc_arch_flags(nvcc.version(), 'Common')
++arch_flags = cuda.nvcc_arch_flags(nvcc.version(), 'Turing')
+
+ message('NVCC version: ' + nvcc.version())
+ message('NVCC flags: ' + ' '.join(arch_flags))
+diff --git a/test cases/cuda/3 cudamodule/meson.build b/test cases/cuda/3
cudamodule/meson.build
+index 5c3ed6073..63e57eccb 100644
+--- a/test cases/cuda/3 cudamodule/meson.build
++++ b/test cases/cuda/3 cudamodule/meson.build
+@@ -3,8 +3,8 @@ project('cudamodule', 'cuda', version : '1.0.0')
+ nvcc = meson.get_compiler('cuda')
+ cuda = import('unstable-cuda')
+
+-arch_flags = cuda.nvcc_arch_flags(nvcc.version(), 'Auto', detected:
['6.0'])
+-arch_readable = cuda.nvcc_arch_readable(nvcc.version(), 'Auto', detected:
['6.0'])
++arch_flags = cuda.nvcc_arch_flags(nvcc.version(), 'Auto', detected:
['8.0'])
++arch_readable = cuda.nvcc_arch_readable(nvcc.version(), 'Auto', detected:
['8.0'])
+ driver_version = cuda.min_driver_version(nvcc.version())
+
+ message('NVCC version: ' + nvcc.version())
+--
+2.51.0
+
=====================================
PKGBUILD
=====================================
@@ -89,12 +89,14 @@ source=(
cross-lib32
native-clang
0001-Skip-broken-tests.patch
+ 0002-Update-tests-to-work-with-CUDA-13.patch
)
b2sums=('266c40d74c27b595250b537855f30bf5c2fafde6f9153530314794b2b6d2263dae187475cf9dc0a87851129dbe0737349de3c0fabdab19c26b92d8add8cc7403'
'70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af'
'01de9b127552feaec612a0bc9551796e44f0800908bd759c6ede4dc22a65dd8ed4fc06dcbdeaef48c4aef926115d783ef019e429b01295526f23f8fa7d49e11b'
'7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e'
-
'20f87cfec26a32615a95a93d7b4785449f32673d6209c5e5ff4d3652ba3b558f1e5c604b7d4413d03e6a4704fdad1119b004fdc3b43d52d80cb27521861c35e1')
+
'20f87cfec26a32615a95a93d7b4785449f32673d6209c5e5ff4d3652ba3b558f1e5c604b7d4413d03e6a4704fdad1119b004fdc3b43d52d80cb27521861c35e1'
+
'a065b11de0ac9de29eb3de95187404e23fe9f85c89182460a1c386fee656a415d4358b75f0e9907b77dde1db3646adba76b60f2ff059bf224e4c07cb21f7e629')
validpgpkeys=(
19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen
<[email protected]>
BD27B07A5EF45C2ADAF70E0484818A6819AF4A9B # Eli Schwartz
<[email protected]>
@@ -105,6 +107,7 @@ prepare() {
# Pass tests
patch -Np1 -i ../0001-Skip-broken-tests.patch
+ patch -Np1 -i ../0002-Update-tests-to-work-with-CUDA-13.patch
}
build() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/meson/-/commit/482bc79445dda4ab224b058b230de875b18b25da
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/meson/-/commit/482bc79445dda4ab224b058b230de875b18b25da
You're receiving this email because of your account on gitlab.archlinux.org.
