[arch-commits] Commit in meson/repos/extra-any (8 files)
Jan Steffens
heftig at archlinux.org
Fri Jan 24 10:03:45 UTC 2020
Date: Friday, January 24, 2020 @ 10:03:44
Author: heftig
Revision: 373876
archrelease: copy trunk to extra-any
Added:
meson/repos/extra-any/0001-Fix-CUDA-test-without-devices.patch
(from rev 373875, meson/trunk/0001-Fix-CUDA-test-without-devices.patch)
meson/repos/extra-any/PKGBUILD
(from rev 373875, meson/trunk/PKGBUILD)
meson/repos/extra-any/arch-meson
(from rev 373875, meson/trunk/arch-meson)
meson/repos/extra-any/skip-test.diff
(from rev 373875, meson/trunk/skip-test.diff)
Deleted:
meson/repos/extra-any/0001-Fix-CUDA-test-without-devices.patch
meson/repos/extra-any/PKGBUILD
meson/repos/extra-any/arch-meson
meson/repos/extra-any/skip-test.diff
------------------------------------------+
0001-Fix-CUDA-test-without-devices.patch | 98 ++++++++++-----------
PKGBUILD | 130 ++++++++++++++---------------
arch-meson | 26 ++---
skip-test.diff | 24 ++---
4 files changed, 139 insertions(+), 139 deletions(-)
Deleted: 0001-Fix-CUDA-test-without-devices.patch
===================================================================
--- 0001-Fix-CUDA-test-without-devices.patch 2020-01-24 10:02:22 UTC (rev 373875)
+++ 0001-Fix-CUDA-test-without-devices.patch 2020-01-24 10:03:44 UTC (rev 373876)
@@ -1,49 +0,0 @@
-From bee44c4c029eeee4c77434fd38208a5c02780b44 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 7 Jan 2020 23:48:18 +0100
-Subject: [PATCH] Fix CUDA test without devices.
-
-Getting the runtime version fails when no devices are present.
----
- .../version_reqs/prog.cu | 21 ++++++++++---------
- 1 file changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/test cases/cuda/11 cuda dependency (nvcc)/version_reqs/prog.cu b/test cases/cuda/11 cuda dependency (nvcc)/version_reqs/prog.cu
-index 56688303..bc90081e 100644
---- a/test cases/cuda/11 cuda dependency (nvcc)/version_reqs/prog.cu
-+++ b/test cases/cuda/11 cuda dependency (nvcc)/version_reqs/prog.cu
-@@ -9,20 +9,21 @@ int cuda_devices(void) {
-
- int main(void) {
- std::cout << "Compiled against CUDA version: " << CUDART_VERSION << "\n";
-+
- int runtime_version = 0;
-- cudaError_t r = cudaRuntimeGetVersion(&runtime_version);
-- if (r != cudaSuccess) {
-- std::cout << "Couldn't obtain CUDA runtime version (error " << r << "). Exiting.\n";
-- return -1;
-+ switch (cudaError_t r = cudaRuntimeGetVersion(&runtime_version)) {
-+ case cudaSuccess:
-+ std::cout << "CUDA runtime version: " << runtime_version << "\n";
-+ break;
-+ case cudaErrorNoDevice:
-+ std::cout << "No CUDA hardware found. Exiting.\n";
-+ return 0;
-+ default:
-+ std::cout << "Couldn't obtain CUDA runtime version (error " << r << "). Exiting.\n";
-+ return -1;
- }
-- std::cout << "CUDA runtime version: " << runtime_version << "\n";
-
- int n = cuda_devices();
-- if (n == 0) {
-- std::cout << "No CUDA hardware found. Exiting.\n";
-- return 0;
-- }
--
- std::cout << "Found " << n << " CUDA devices.\n";
- return 0;
- }
---
-2.24.1
-
Copied: meson/repos/extra-any/0001-Fix-CUDA-test-without-devices.patch (from rev 373875, meson/trunk/0001-Fix-CUDA-test-without-devices.patch)
===================================================================
--- 0001-Fix-CUDA-test-without-devices.patch (rev 0)
+++ 0001-Fix-CUDA-test-without-devices.patch 2020-01-24 10:03:44 UTC (rev 373876)
@@ -0,0 +1,49 @@
+From bee44c4c029eeee4c77434fd38208a5c02780b44 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 7 Jan 2020 23:48:18 +0100
+Subject: [PATCH] Fix CUDA test without devices.
+
+Getting the runtime version fails when no devices are present.
+---
+ .../version_reqs/prog.cu | 21 ++++++++++---------
+ 1 file changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/test cases/cuda/11 cuda dependency (nvcc)/version_reqs/prog.cu b/test cases/cuda/11 cuda dependency (nvcc)/version_reqs/prog.cu
+index 56688303..bc90081e 100644
+--- a/test cases/cuda/11 cuda dependency (nvcc)/version_reqs/prog.cu
++++ b/test cases/cuda/11 cuda dependency (nvcc)/version_reqs/prog.cu
+@@ -9,20 +9,21 @@ int cuda_devices(void) {
+
+ int main(void) {
+ std::cout << "Compiled against CUDA version: " << CUDART_VERSION << "\n";
++
+ int runtime_version = 0;
+- cudaError_t r = cudaRuntimeGetVersion(&runtime_version);
+- if (r != cudaSuccess) {
+- std::cout << "Couldn't obtain CUDA runtime version (error " << r << "). Exiting.\n";
+- return -1;
++ switch (cudaError_t r = cudaRuntimeGetVersion(&runtime_version)) {
++ case cudaSuccess:
++ std::cout << "CUDA runtime version: " << runtime_version << "\n";
++ break;
++ case cudaErrorNoDevice:
++ std::cout << "No CUDA hardware found. Exiting.\n";
++ return 0;
++ default:
++ std::cout << "Couldn't obtain CUDA runtime version (error " << r << "). Exiting.\n";
++ return -1;
+ }
+- std::cout << "CUDA runtime version: " << runtime_version << "\n";
+
+ int n = cuda_devices();
+- if (n == 0) {
+- std::cout << "No CUDA hardware found. Exiting.\n";
+- return 0;
+- }
+-
+ std::cout << "Found " << n << " CUDA devices.\n";
+ return 0;
+ }
+--
+2.24.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-24 10:02:22 UTC (rev 373875)
+++ PKGBUILD 2020-01-24 10:03:44 UTC (rev 373876)
@@ -1,65 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
-
-pkgname=meson
-pkgver=0.53.0
-pkgrel=1
-pkgdesc='High productivity build system'
-url='https://mesonbuild.com/'
-arch=('any')
-license=('Apache')
-depends=('python-setuptools' 'ninja')
-checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' 'git' 'cython'
- 'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk' 'python-gobject' 'gobject-introspection'
- 'itstool' 'gtk3' 'java-environment=8' 'gtk-doc' 'llvm' 'clang' 'sdl2' 'graphviz'
- 'doxygen' 'vulkan-validation-layers' 'openssh' 'mercurial' 'gtk-sharp-2' 'qt5-tools'
- 'libwmf' 'valgrind' 'cmake' 'netcdf-fortran' 'openmpi' 'cuda' 'nasm' 'gnustep-base'
- 'libelf' 'python-pytest-xdist')
-source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.sig}
- skip-test.diff
- 0001-Fix-CUDA-test-without-devices.patch
- arch-meson)
-sha512sums=('e375e22eb650d5f8facbffe9773b740b5dcd971a86c5b197bbfa0e82a51f4774345456856e19d6305661e227afbe24db5ca472d5ff9f707b754c1d5361187cd8'
- 'SKIP'
- 'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347'
- '459559575ac6556cf7f9b340099886442ca222b9cfb584aaad3a2a43c2fe6ce850e7125fb8b7a01782c5f5a57b353adc5683f24aec6717ba78076ad75140fc4e'
- 'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
-validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # Our containers do not allow sanitizers to run
- patch -Np1 -i ../skip-test.diff
-
- # Fix CUDA test without devices
- patch -Np1 -i ../0001-Fix-CUDA-test-without-devices.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- python setup.py build
-}
-
-check() (
- cd ${pkgname}-${pkgver}
- export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
- ./run_tests.py
-)
-
-package() {
- cd ${pkgname}-${pkgver}
- python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-
- install -d "${pkgdir}/usr/share/vim/vimfiles"
- cp -rt "${pkgdir}/usr/share/vim/vimfiles" data/syntax-highlighting/vim/*/
-
- install -Dt "${pkgdir}/usr/share/emacs/site-lisp" -m644 data/syntax-highlighting/emacs/*
- install -Dt "${pkgdir}/usr/share/zsh/site-functions" -m644 data/shell-completions/zsh/*
-
- # Arch packaging helper
- install -D ../arch-meson -t "${pkgdir}/usr/bin"
-}
-
-# vim: ts=2 sw=2 et:
Copied: meson/repos/extra-any/PKGBUILD (from rev 373875, meson/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-01-24 10:03:44 UTC (rev 373876)
@@ -0,0 +1,65 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
+
+pkgname=meson
+pkgver=0.53.1
+pkgrel=1
+pkgdesc='High productivity build system'
+url='https://mesonbuild.com/'
+arch=('any')
+license=('Apache')
+depends=('python-setuptools' 'ninja')
+checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' 'git' 'cython'
+ 'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk' 'python-gobject' 'gobject-introspection'
+ 'itstool' 'gtk3' 'java-environment=8' 'gtk-doc' 'llvm' 'clang' 'sdl2' 'graphviz'
+ 'doxygen' 'vulkan-validation-layers' 'openssh' 'mercurial' 'gtk-sharp-2' 'qt5-tools'
+ 'libwmf' 'valgrind' 'cmake' 'netcdf-fortran' 'openmpi' 'cuda' 'nasm' 'gnustep-base'
+ 'libelf' 'python-pytest-xdist')
+source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
+ skip-test.diff
+ 0001-Fix-CUDA-test-without-devices.patch
+ arch-meson)
+sha512sums=('0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859'
+ 'SKIP'
+ 'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347'
+ '459559575ac6556cf7f9b340099886442ca222b9cfb584aaad3a2a43c2fe6ce850e7125fb8b7a01782c5f5a57b353adc5683f24aec6717ba78076ad75140fc4e'
+ 'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
+validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Our containers do not allow sanitizers to run
+ patch -Np1 -i ../skip-test.diff
+
+ # Fix CUDA test without devices
+ patch -Np1 -i ../0001-Fix-CUDA-test-without-devices.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ python setup.py build
+}
+
+check() (
+ cd ${pkgname}-${pkgver}
+ export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
+ ./run_tests.py
+)
+
+package() {
+ cd ${pkgname}-${pkgver}
+ python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+
+ install -d "${pkgdir}/usr/share/vim/vimfiles"
+ cp -rt "${pkgdir}/usr/share/vim/vimfiles" data/syntax-highlighting/vim/*/
+
+ install -Dt "${pkgdir}/usr/share/emacs/site-lisp" -m644 data/syntax-highlighting/emacs/*
+ install -Dt "${pkgdir}/usr/share/zsh/site-functions" -m644 data/shell-completions/zsh/*
+
+ # Arch packaging helper
+ install -D ../arch-meson -t "${pkgdir}/usr/bin"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: arch-meson
===================================================================
--- arch-meson 2020-01-24 10:02:22 UTC (rev 373875)
+++ arch-meson 2020-01-24 10:03:44 UTC (rev 373876)
@@ -1,13 +0,0 @@
-#!/bin/bash -ex
-# Highly opinionated wrapper for Arch Linux packaging
-
-exec meson setup \
- --prefix /usr \
- --libexecdir lib \
- --sbindir bin \
- --buildtype plain \
- --auto-features enabled \
- --wrap-mode nodownload \
- -D b_lto=true \
- -D b_pie=true \
- "$@"
Copied: meson/repos/extra-any/arch-meson (from rev 373875, meson/trunk/arch-meson)
===================================================================
--- arch-meson (rev 0)
+++ arch-meson 2020-01-24 10:03:44 UTC (rev 373876)
@@ -0,0 +1,13 @@
+#!/bin/bash -ex
+# Highly opinionated wrapper for Arch Linux packaging
+
+exec meson setup \
+ --prefix /usr \
+ --libexecdir lib \
+ --sbindir bin \
+ --buildtype plain \
+ --auto-features enabled \
+ --wrap-mode nodownload \
+ -D b_lto=true \
+ -D b_pie=true \
+ "$@"
Deleted: skip-test.diff
===================================================================
--- skip-test.diff 2020-01-24 10:02:22 UTC (rev 373875)
+++ skip-test.diff 2020-01-24 10:03:44 UTC (rev 373876)
@@ -1,12 +0,0 @@
-diff --git i/run_unittests.py w/run_unittests.py
-index 90d4a628..f83bd61f 100755
---- i/run_unittests.py
-+++ w/run_unittests.py
-@@ -4368,6 +4368,7 @@ class LinuxlikeTests(BasePlatformTests):
- raise unittest.SkipTest('asan not available on Cygwin')
- if is_openbsd():
- raise unittest.SkipTest('-fsanitize=address is not supported on OpenBSD')
-+ raise unittest.SkipTest('cannot run sanitizers in containers without ptrace')
-
- testdir = os.path.join(self.framework_test_dir, '7 gnome')
- self.init(testdir, ['-Db_sanitize=address', '-Db_lundef=false'])
Copied: meson/repos/extra-any/skip-test.diff (from rev 373875, meson/trunk/skip-test.diff)
===================================================================
--- skip-test.diff (rev 0)
+++ skip-test.diff 2020-01-24 10:03:44 UTC (rev 373876)
@@ -0,0 +1,12 @@
+diff --git i/run_unittests.py w/run_unittests.py
+index 90d4a628..f83bd61f 100755
+--- i/run_unittests.py
++++ w/run_unittests.py
+@@ -4368,6 +4368,7 @@ class LinuxlikeTests(BasePlatformTests):
+ raise unittest.SkipTest('asan not available on Cygwin')
+ if is_openbsd():
+ raise unittest.SkipTest('-fsanitize=address is not supported on OpenBSD')
++ raise unittest.SkipTest('cannot run sanitizers in containers without ptrace')
+
+ testdir = os.path.join(self.framework_test_dir, '7 gnome')
+ self.init(testdir, ['-Db_sanitize=address', '-Db_lundef=false'])
More information about the arch-commits
mailing list