diff --git a/extra/meson/5500.patch b/extra/meson/5500.patch deleted file mode 100644 index ebdef11eb..000000000 --- a/extra/meson/5500.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f16bd54da6d2334fd6d36b0e2c2729e1cf1bdc05 Mon Sep 17 00:00:00 2001 -From: Jussi Pakkanen -Date: Mon, 17 Jun 2019 21:49:34 +0300 -Subject: [PATCH] Handle thread flags when not using C at all. Closes #5497. - ---- - mesonbuild/dependencies/misc.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py -index af2da29b63..e5fab64599 100644 ---- a/mesonbuild/dependencies/misc.py -+++ b/mesonbuild/dependencies/misc.py -@@ -388,8 +388,14 @@ def __init__(self, environment, kwargs): - super().__init__('threads', environment, None, kwargs) - self.name = 'threads' - self.is_found = True -- self.compile_args = self.clib_compiler.thread_flags(environment) -- self.link_args = self.clib_compiler.thread_link_flags(environment) -+ # Happens if you are using a language with threads -+ # concept without C, such as plain Cuda. -+ if self.clib_compiler is None: -+ self.compile_args = [] -+ self.link_args = [] -+ else: -+ self.compile_args = self.clib_compiler.thread_flags(environment) -+ self.link_args = self.clib_compiler.thread_link_flags(environment) - - - class Python3Dependency(ExternalDependency): diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD index 045f0ebc9..03ac90613 100644 --- a/extra/meson/PKGBUILD +++ b/extra/meson/PKGBUILD @@ -7,7 +7,7 @@ # - remove checkdepend on dmd pkgname=meson -pkgver=0.51.0 +pkgver=0.51.1 pkgrel=1 pkgdesc='High productivity build system' url='https://mesonbuild.com/' @@ -21,12 +21,10 @@ checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' ' 'libwmf' 'valgrind' 'cmake' 'netcdf-fortran' 'openmpi' 'cuda' 'ldc' 'nasm' 'gnustep-base' 'libelf') source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc} - 5500.patch skip-test.diff arch-meson) -sha512sums=('90cb564bb008631f1276b78b0ed725870f0d1baef34c385d1d9df076935f402c516906141fe0f11540739d4174dafcc252ee71e2ad902057544ddda1142153b1' +sha512sums=('b0b220de2a20c355cbd2f63aff195374ad8b2dae64f0dc4efb7abf84d7a9e70b6d4239d3d94b2b8ba2de5dd6e871589848b057c842c8f256016c666e9aa882f1' 'SKIP' - 'da674c88a69f744d3fe4692e1091943f83b1d02e132ff9c84e87700e588313d50d609669c097b2c4dcfeefc8ad13095e698a7c9d5f4d1f54fc6bb6a3aea0cebf' 'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347' '278f5e4de3aa1170d9b4f9f212985d664f44d90ffec727febeeea1ed570046c6469558a5d123a41bf4c2fdf99dbe7832515b06f1ace423c63e2e95ba6d0ef235') validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen @@ -34,9 +32,6 @@ validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen