[arch-commits] Commit in meson/repos/extra-any (7 files)
Jan Steffens
heftig at archlinux.org
Sat Jul 13 22:41:30 UTC 2019
Date: Saturday, July 13, 2019 @ 22:41:30
Author: heftig
Revision: 357884
archrelease: copy trunk to extra-any
Added:
meson/repos/extra-any/PKGBUILD
(from rev 357883, meson/trunk/PKGBUILD)
meson/repos/extra-any/arch-meson
(from rev 357883, meson/trunk/arch-meson)
meson/repos/extra-any/skip-test.diff
(from rev 357883, meson/trunk/skip-test.diff)
Deleted:
meson/repos/extra-any/5500.patch
meson/repos/extra-any/PKGBUILD
meson/repos/extra-any/arch-meson
meson/repos/extra-any/skip-test.diff
----------------+
5500.patch | 30 -------------
PKGBUILD | 125 ++++++++++++++++++++++++++-----------------------------
arch-meson | 26 +++++------
skip-test.diff | 24 +++++-----
4 files changed, 85 insertions(+), 120 deletions(-)
Deleted: 5500.patch
===================================================================
--- 5500.patch 2019-07-13 22:41:15 UTC (rev 357883)
+++ 5500.patch 2019-07-13 22:41:30 UTC (rev 357884)
@@ -1,30 +0,0 @@
-From f16bd54da6d2334fd6d36b0e2c2729e1cf1bdc05 Mon Sep 17 00:00:00 2001
-From: Jussi Pakkanen <jpakkane at gmail.com>
-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):
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-07-13 22:41:15 UTC (rev 357883)
+++ PKGBUILD 2019-07-13 22:41:30 UTC (rev 357884)
@@ -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.51.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' 'dmd' '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'
- 'SKIP'
- 'da674c88a69f744d3fe4692e1091943f83b1d02e132ff9c84e87700e588313d50d609669c097b2c4dcfeefc8ad13095e698a7c9d5f4d1f54fc6bb6a3aea0cebf'
- 'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347'
- 'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
-validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # https://github.com/mesonbuild/meson/issues/5497
- patch -Np1 -i ../5500.patch
-
- # Our containers do not allow sanitizers to run
- patch -Np1 -i ../skip-test.diff
-}
-
-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 357883, meson/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-07-13 22:41:30 UTC (rev 357884)
@@ -0,0 +1,60 @@
+# 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.51.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' 'dmd' '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}
+ skip-test.diff
+ arch-meson)
+sha512sums=('b0b220de2a20c355cbd2f63aff195374ad8b2dae64f0dc4efb7abf84d7a9e70b6d4239d3d94b2b8ba2de5dd6e871589848b057c842c8f256016c666e9aa882f1'
+ 'SKIP'
+ 'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347'
+ '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
+}
+
+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 2019-07-13 22:41:15 UTC (rev 357883)
+++ arch-meson 2019-07-13 22:41:30 UTC (rev 357884)
@@ -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 357883, meson/trunk/arch-meson)
===================================================================
--- arch-meson (rev 0)
+++ arch-meson 2019-07-13 22:41:30 UTC (rev 357884)
@@ -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 2019-07-13 22:41:15 UTC (rev 357883)
+++ skip-test.diff 2019-07-13 22:41:30 UTC (rev 357884)
@@ -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 357883, meson/trunk/skip-test.diff)
===================================================================
--- skip-test.diff (rev 0)
+++ skip-test.diff 2019-07-13 22:41:30 UTC (rev 357884)
@@ -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