[arch-commits] Commit in meson/repos/extra-any (7 files)
Jan Steffens
heftig at gemini.archlinux.org
Sat Oct 23 18:42:44 UTC 2021
Date: Saturday, October 23, 2021 @ 18:42:43
Author: heftig
Revision: 426485
archrelease: copy trunk to extra-any
Added:
meson/repos/extra-any/PKGBUILD
(from rev 426484, meson/trunk/PKGBUILD)
meson/repos/extra-any/arch-meson
(from rev 426484, meson/trunk/arch-meson)
meson/repos/extra-any/skip-test.diff
(from rev 426484, meson/trunk/skip-test.diff)
Deleted:
meson/repos/extra-any/0001-tests-rust-add-libm-to-fix-build-with-rust-1.55.patch
meson/repos/extra-any/PKGBUILD
meson/repos/extra-any/arch-meson
meson/repos/extra-any/skip-test.diff
------------------------------------------------------------+
0001-tests-rust-add-libm-to-fix-build-with-rust-1.55.patch | 22 -
PKGBUILD | 127 +++++------
arch-meson | 26 +-
skip-test.diff | 30 +-
4 files changed, 89 insertions(+), 116 deletions(-)
Deleted: 0001-tests-rust-add-libm-to-fix-build-with-rust-1.55.patch
===================================================================
--- 0001-tests-rust-add-libm-to-fix-build-with-rust-1.55.patch 2021-10-23 18:42:37 UTC (rev 426484)
+++ 0001-tests-rust-add-libm-to-fix-build-with-rust-1.55.patch 2021-10-23 18:42:43 UTC (rev 426485)
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar at opensuse.org>
-Date: Wed, 29 Sep 2021 14:20:53 +0200
-Subject: [PATCH] tests/rust: add libm to fix build with rust 1.55
-
-Fixes #9309
----
- test cases/rust/5 polyglot static/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test cases/rust/5 polyglot static/meson.build b/test cases/rust/5 polyglot static/meson.build
-index de2e61bcb..a6e9550b6 100644
---- a/test cases/rust/5 polyglot static/meson.build
-+++ b/test cases/rust/5 polyglot static/meson.build
-@@ -2,6 +2,7 @@ project('static rust and c polyglot executable', 'c', 'rust')
-
- deps = [
- meson.get_compiler('c').find_library('dl', required: false),
-+ meson.get_compiler('c').find_library('m', required: false),
- dependency('threads'),
- ]
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-10-23 18:42:37 UTC (rev 426484)
+++ PKGBUILD 2021-10-23 18:42:43 UTC (rev 426485)
@@ -1,66 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
-
-pkgname=meson
-pkgver=0.59.2
-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' 'wxgtk3' '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' 'nasm' 'gnustep-base' 'libelf'
- 'python-pytest-xdist' 'python2-setuptools' 'ldc' 'rust-bindgen' 'cuda' 'hotdoc')
-source=(https://github.com/mesonbuild/meson/releases/download/${pkgver/rc/.rc}/meson-${pkgver}.tar.gz{,.asc}
- 0001-tests-rust-add-libm-to-fix-build-with-rust-1.55.patch
- skip-test.diff
- arch-meson)
-sha512sums=('910e4a8c9828506b576dc8ae0b5765efec24f44a34a5694f782c8a533d75053b10b4167564c06456d05f7a32c5fd9bd657faa62329e1e4ed24bfc4c9ac1ef73e'
- 'SKIP'
- 'c366e149fa04ce41d572fa42a1116d3ddfb25e3e6192c918127d96f2f1e50214c503ce8864473fc7712f0452b63336ac92b4e94fe8ac7f0a9ae6933e07463abc'
- 'c00c3bbb6f6dfe41bb6e05e3eba94fb177f3ef9353bc132e33e54eabacc14d81ed7bff5fe965fb4d49ce8a586a7ebb887b625174f272a48b2f3c85d3288e23b1'
- 'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
-validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen <jpakkane at gmail.com>
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # Fix tests with Rust 1.55
- patch -Np1 -i ../0001-tests-rust-add-libm-to-fix-build-with-rust-1.55.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/bash-completion/completions" -m644 data/shell-completions/bash/*
- 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:set sw=2 et:
Copied: meson/repos/extra-any/PKGBUILD (from rev 426484, meson/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-10-23 18:42:43 UTC (rev 426485)
@@ -0,0 +1,61 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
+
+pkgname=meson
+pkgver=0.59.3
+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' 'wxgtk3' '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' 'nasm' 'gnustep-base' 'libelf'
+ 'python-pytest-xdist' 'python2-setuptools' 'ldc' 'rust-bindgen' 'cuda' 'hotdoc')
+source=(https://github.com/mesonbuild/meson/releases/download/${pkgver/rc/.rc}/meson-${pkgver}.tar.gz{,.asc}
+ skip-test.diff
+ arch-meson)
+sha512sums=('4ffca094474c09567a69f576b25588c38e18d3a96d0b1d592adb05493a5d6dcfcd1a6549a821862a5aabd3df34d81b3a90d01e012e62c7f46bd98152337c0ea6'
+ 'SKIP'
+ 'c00c3bbb6f6dfe41bb6e05e3eba94fb177f3ef9353bc132e33e54eabacc14d81ed7bff5fe965fb4d49ce8a586a7ebb887b625174f272a48b2f3c85d3288e23b1'
+ 'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
+validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # 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/bash-completion/completions" -m644 data/shell-completions/bash/*
+ 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:set sw=2 et:
Deleted: arch-meson
===================================================================
--- arch-meson 2021-10-23 18:42:37 UTC (rev 426484)
+++ arch-meson 2021-10-23 18:42:43 UTC (rev 426485)
@@ -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 426484, meson/trunk/arch-meson)
===================================================================
--- arch-meson (rev 0)
+++ arch-meson 2021-10-23 18:42:43 UTC (rev 426485)
@@ -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 2021-10-23 18:42:37 UTC (rev 426484)
+++ skip-test.diff 2021-10-23 18:42:43 UTC (rev 426485)
@@ -1,15 +0,0 @@
- run_unittests.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git c/run_unittests.py i/run_unittests.py
-index 15312731c..f9a0e494f 100755
---- c/run_unittests.py
-+++ i/run_unittests.py
-@@ -7101,6 +7101,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, extra_args=['-Db_sanitize=address', '-Db_lundef=false'])
Copied: meson/repos/extra-any/skip-test.diff (from rev 426484, meson/trunk/skip-test.diff)
===================================================================
--- skip-test.diff (rev 0)
+++ skip-test.diff 2021-10-23 18:42:43 UTC (rev 426485)
@@ -0,0 +1,15 @@
+ run_unittests.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git c/run_unittests.py i/run_unittests.py
+index 15312731c..f9a0e494f 100755
+--- c/run_unittests.py
++++ i/run_unittests.py
+@@ -7101,6 +7101,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, extra_args=['-Db_sanitize=address', '-Db_lundef=false'])
More information about the arch-commits
mailing list