mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
extra/meson to 1.5.0-1
This commit is contained in:
Kevin Mihelich
parent
223e0b59e4
commit
b295db0d60
5 changed files with 22 additions and 70 deletions
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = meson
|
||||
pkgdesc = High productivity build system
|
||||
pkgver = 1.4.1
|
||||
pkgver = 1.5.0
|
||||
pkgrel = 1
|
||||
url = https://mesonbuild.com/
|
||||
arch = any
|
||||
|
|
@ -14,6 +14,7 @@ pkgbase = meson
|
|||
checkdepends = gcc-fortran
|
||||
checkdepends = gcc-objc
|
||||
checkdepends = git
|
||||
checkdepends = glib2-devel
|
||||
checkdepends = glibc-locales
|
||||
checkdepends = gmock
|
||||
checkdepends = gnustep-base
|
||||
|
|
@ -56,24 +57,22 @@ pkgbase = meson
|
|||
depends = ninja
|
||||
depends = python
|
||||
depends = python-tqdm
|
||||
source = https://github.com/mesonbuild/meson/releases/download/1.4.1/meson-1.4.1.tar.gz
|
||||
source = https://github.com/mesonbuild/meson/releases/download/1.4.1/meson-1.4.1.tar.gz.asc
|
||||
source = meson-reference-1.4.1.3::https://github.com/mesonbuild/meson/releases/download/1.4.1/meson-reference.3
|
||||
source = meson-reference-1.4.1.json::https://github.com/mesonbuild/meson/releases/download/1.4.1/reference_manual.json
|
||||
source = https://github.com/mesonbuild/meson/releases/download/1.5.0/meson-1.5.0.tar.gz
|
||||
source = https://github.com/mesonbuild/meson/releases/download/1.5.0/meson-1.5.0.tar.gz.asc
|
||||
source = meson-reference-1.5.0.3::https://github.com/mesonbuild/meson/releases/download/1.5.0/meson-reference.3
|
||||
source = meson-reference-1.5.0.json::https://github.com/mesonbuild/meson/releases/download/1.5.0/reference_manual.json
|
||||
source = arch-meson
|
||||
source = cross-lib32
|
||||
source = native-clang
|
||||
source = 0001-Skip-broken-tests.patch
|
||||
source = 0002-cuda-avoid-test-failure-without-GPU-available.patch
|
||||
validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70
|
||||
b2sums = 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3
|
||||
b2sums = 5103622831a3581b428f9cdd96950b8544ddfdcbd384ec2ccd344d6b9ffb2cdd7da069963d57b09a22f26938f6a3b34823abe678fb50a0fe8d79c8abc7899605
|
||||
b2sums = SKIP
|
||||
b2sums = a0ea6a1dd599c0a559dae64772f730ac7cad7df3ea63acc8355ff933152873567803efff012e6ea0a4c75ef9c8be023a8d927411a49e43de20bbfc69b1263488
|
||||
b2sums = f44fdcb30d576e1f94d184963a379745c7ff8561622151f2ecd2c03de854bc2c9b4e1162c34dc8c6a367f16c7307044691f7e43076725bce66c979e4f4a5ce5f
|
||||
b2sums = c81d1014f93ca3848e03e6a8948190a31e1823b04134ab6861db94d5b9517252bf66fcbbc987ba2051430c54282256d729d3575db83e1e8d09fa344c6ff06dbf
|
||||
b2sums = 1b30812b992a8c823f5536bbade66ede9817d14ed29f7dd303c838e85e0d43150d6c220f20b108b6823fb283b3fb7424b6220855282fff3ac80707c7286a4bc5
|
||||
b2sums = 70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af
|
||||
b2sums = 9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081
|
||||
b2sums = 7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e
|
||||
b2sums = ba31657ec0362795c95ada7a3d903f34aa04effe2594cc8b7731f8de1d5407350855bc438b8d79cae45726283f22be5e8dbf18fc7a119f410e4a110441d4f79b
|
||||
b2sums = 0318ef99fbb9e268496e75e6ec584b65fb961dc5b4b37b43f14485ebfce197688f5d9f434ec028011a2c7b720581e346075905520d10863e1b36a65d18de0289
|
||||
b2sums = ee2b3a174c86affd7b5c26128eda7c51f8b223184eb4a67d957fb32a1396068e5b2613bfdb142134e4ceb8b64dd4464fad3a73e2b4087e0a87f9d0ccb83203d8
|
||||
|
||||
pkgname = meson
|
||||
|
|
|
|||
4
extra/meson/.nvchecker.toml
Normal file
4
extra/meson/.nvchecker.toml
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
[meson]
|
||||
source = "git"
|
||||
git = "https://github.com/mesonbuild/meson.git"
|
||||
include_regex = '\d+(\.\d+)*'
|
||||
|
|
@ -4,23 +4,10 @@ Date: Thu, 14 Apr 2022 14:08:15 +0000
|
|||
Subject: [PATCH] Skip broken tests
|
||||
|
||||
---
|
||||
test cases/frameworks/15 llvm/test.json | 1 -
|
||||
test cases/linuxlike/13 cmake dependency/meson.build | 2 ++
|
||||
unittests/linuxliketests.py | 2 ++
|
||||
3 files changed, 4 insertions(+), 1 deletion(-)
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json
|
||||
index eade970be637..d8b06d31abac 100644
|
||||
--- a/test cases/frameworks/15 llvm/test.json
|
||||
+++ b/test cases/frameworks/15 llvm/test.json
|
||||
@@ -7,7 +7,6 @@
|
||||
{ "val": "combination", "skip_on_jobname": ["msys2-gcc"] }
|
||||
],
|
||||
"link-static": [
|
||||
- { "val": true, "skip_on_jobname": ["arch", "opensuse", "linux-gentoo-gcc"] },
|
||||
{ "val": false }
|
||||
]
|
||||
}
|
||||
diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build
|
||||
index f612e1d52d6d..d0e0d079a069 100644
|
||||
--- a/test cases/linuxlike/13 cmake dependency/meson.build
|
||||
|
|
@ -35,7 +22,7 @@ index f612e1d52d6d..d0e0d079a069 100644
|
|||
|
||||
dep = dependency('ZLIB', version : '>=1.2', method : 'cmake')
|
||||
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
|
||||
index bfe3586c1b84..ce4d36fe024c 100644
|
||||
index ea86784892f3..864021688121 100644
|
||||
--- a/unittests/linuxliketests.py
|
||||
+++ b/unittests/linuxliketests.py
|
||||
@@ -312,6 +312,7 @@ class LinuxlikeTests(BasePlatformTests):
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Seifert <soap@gentoo.org>
|
||||
Date: Fri, 31 May 2024 00:21:43 +0200
|
||||
Subject: [PATCH] cuda: avoid test failure without GPU available
|
||||
|
||||
Fixes #13269
|
||||
---
|
||||
.../cuda/17 separate compilation linking/meson.build | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test cases/cuda/17 separate compilation linking/meson.build b/test cases/cuda/17 separate compilation linking/meson.build
|
||||
index 8e90ddd7f6fd..7ba7e220870d 100644
|
||||
--- a/test cases/cuda/17 separate compilation linking/meson.build
|
||||
+++ b/test cases/cuda/17 separate compilation linking/meson.build
|
||||
@@ -11,12 +11,16 @@ add_languages('cuda')
|
||||
nvcc = meson.get_compiler('cuda')
|
||||
cuda = import('unstable-cuda')
|
||||
|
||||
-arch_flags = cuda.nvcc_arch_flags(nvcc.version(), 'Auto', detected : ['8.0'])
|
||||
+arch_flags = cuda.nvcc_arch_flags(nvcc.version(), 'Common')
|
||||
|
||||
message('NVCC version: ' + nvcc.version())
|
||||
message('NVCC flags: ' + ' '.join(arch_flags))
|
||||
|
||||
# test device linking with -dc (which is equivalent to `--relocatable-device-code true`)
|
||||
lib = static_library('devicefuncs', ['b.cu'], cuda_args : ['-dc'] + arch_flags)
|
||||
exe = executable('app', 'main.cu', cuda_args : ['-dc'] + arch_flags, link_with : lib, link_args : arch_flags)
|
||||
-test('cudatest', exe)
|
||||
+
|
||||
+# if we don't have a CUDA-capable GPU available, avoid creating the test
|
||||
+if run_command('__nvcc_device_query', check : false).returncode() == 0
|
||||
+ test('cudatest', exe)
|
||||
+endif
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
# - disable lto in arch-meson
|
||||
|
||||
pkgname=meson
|
||||
pkgver=1.4.1
|
||||
pkgver=1.5.0
|
||||
pkgrel=1
|
||||
pkgdesc="High productivity build system"
|
||||
url="https://mesonbuild.com/"
|
||||
|
|
@ -33,6 +33,7 @@ checkdepends=(
|
|||
gcc-fortran
|
||||
gcc-objc
|
||||
git
|
||||
glib2-devel
|
||||
glibc-locales
|
||||
gmock
|
||||
gnustep-base
|
||||
|
|
@ -77,17 +78,15 @@ source=(
|
|||
cross-lib32
|
||||
native-clang
|
||||
0001-Skip-broken-tests.patch
|
||||
0002-cuda-avoid-test-failure-without-GPU-available.patch
|
||||
)
|
||||
b2sums=('1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3'
|
||||
b2sums=('5103622831a3581b428f9cdd96950b8544ddfdcbd384ec2ccd344d6b9ffb2cdd7da069963d57b09a22f26938f6a3b34823abe678fb50a0fe8d79c8abc7899605'
|
||||
'SKIP'
|
||||
'a0ea6a1dd599c0a559dae64772f730ac7cad7df3ea63acc8355ff933152873567803efff012e6ea0a4c75ef9c8be023a8d927411a49e43de20bbfc69b1263488'
|
||||
'f44fdcb30d576e1f94d184963a379745c7ff8561622151f2ecd2c03de854bc2c9b4e1162c34dc8c6a367f16c7307044691f7e43076725bce66c979e4f4a5ce5f'
|
||||
'c81d1014f93ca3848e03e6a8948190a31e1823b04134ab6861db94d5b9517252bf66fcbbc987ba2051430c54282256d729d3575db83e1e8d09fa344c6ff06dbf'
|
||||
'1b30812b992a8c823f5536bbade66ede9817d14ed29f7dd303c838e85e0d43150d6c220f20b108b6823fb283b3fb7424b6220855282fff3ac80707c7286a4bc5'
|
||||
'70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af'
|
||||
'9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081'
|
||||
'7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e'
|
||||
'ba31657ec0362795c95ada7a3d903f34aa04effe2594cc8b7731f8de1d5407350855bc438b8d79cae45726283f22be5e8dbf18fc7a119f410e4a110441d4f79b'
|
||||
'0318ef99fbb9e268496e75e6ec584b65fb961dc5b4b37b43f14485ebfce197688f5d9f434ec028011a2c7b720581e346075905520d10863e1b36a65d18de0289')
|
||||
'ee2b3a174c86affd7b5c26128eda7c51f8b223184eb4a67d957fb32a1396068e5b2613bfdb142134e4ceb8b64dd4464fad3a73e2b4087e0a87f9d0ccb83203d8')
|
||||
validpgpkeys=(
|
||||
19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen <jpakkane@gmail.com>
|
||||
)
|
||||
|
|
@ -97,10 +96,6 @@ prepare() {
|
|||
|
||||
# Pass tests
|
||||
patch -Np1 -i ../0001-Skip-broken-tests.patch
|
||||
|
||||
# https://github.com/mesonbuild/meson/issues/13269
|
||||
# https://github.com/mesonbuild/meson/pull/13273
|
||||
patch -Np1 -i ../0002-cuda-avoid-test-failure-without-GPU-available.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue