[arch-commits] Commit in meson/repos/staging-any (8 files)
Antonio Rojas
arojas at archlinux.org
Mon Nov 4 20:03:37 UTC 2019
Date: Monday, November 4, 2019 @ 20:03:36
Author: arojas
Revision: 366757
archrelease: copy trunk to staging-any
Added:
meson/repos/staging-any/PKGBUILD
(from rev 366756, meson/trunk/PKGBUILD)
meson/repos/staging-any/arch-meson
(from rev 366756, meson/trunk/arch-meson)
meson/repos/staging-any/meson-python-3.8.patch
(from rev 366756, meson/trunk/meson-python-3.8.patch)
meson/repos/staging-any/skip-test.diff
(from rev 366756, meson/trunk/skip-test.diff)
Deleted:
meson/repos/staging-any/PKGBUILD
meson/repos/staging-any/arch-meson
meson/repos/staging-any/meson-python-3.8.patch
meson/repos/staging-any/skip-test.diff
------------------------+
PKGBUILD | 129 ++++++++++++++++++++++++-----------------------
arch-meson | 26 ++++-----
meson-python-3.8.patch | 26 ++++-----
skip-test.diff | 24 ++++----
4 files changed, 104 insertions(+), 101 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-04 20:03:12 UTC (rev 366756)
+++ PKGBUILD 2019-11-04 20:03:36 UTC (rev 366757)
@@ -1,63 +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.52.0
-pkgrel=3
-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
- meson-python-3.8.patch
- arch-meson)
-sha512sums=('9efe962c60e21bf4159ce0b113caba0119751a5f6217cd116f6e43b0b4150af0eb7ab484a74d8e9438d78a5d0458dda4215e9b6b9c96bfc0d07e23d709d2929f'
- 'SKIP'
- 'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347'
- '343d49889942d1cd3f5dc0c573dba226ca9a6c6c5845ff4e74d3c672532ba6fb7cbfeaadb6e053e8793cd7cbfbc936fb753c2dcd95dd236476f07129ac07f67c'
- '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
- patch -p1 -i ../meson-python-3.8.patch # Fix boost test with python 3.8
-}
-
-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/staging-any/PKGBUILD (from rev 366756, meson/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-04 20:03:36 UTC (rev 366757)
@@ -0,0 +1,66 @@
+# 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.52.0
+pkgrel=4
+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
+ meson-python-3.8.patch
+ remove-duplicate-objects.patch::"https://github.com/mesonbuild/meson/commit/212a05b8.patch"
+ arch-meson)
+sha512sums=('9efe962c60e21bf4159ce0b113caba0119751a5f6217cd116f6e43b0b4150af0eb7ab484a74d8e9438d78a5d0458dda4215e9b6b9c96bfc0d07e23d709d2929f'
+ 'SKIP'
+ 'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347'
+ '343d49889942d1cd3f5dc0c573dba226ca9a6c6c5845ff4e74d3c672532ba6fb7cbfeaadb6e053e8793cd7cbfbc936fb753c2dcd95dd236476f07129ac07f67c'
+ '78587f8d7ec758e433c81c2a656c7e337320dc199f97ee0fb2134e6a677bdd1c2d556e2912933d50211833d0efcc786965ee1f8c2e58f66c58d9911e9c103777'
+ '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
+ patch -p1 -i ../meson-python-3.8.patch # Fix boost test with python 3.8
+ patch -p1 -i ../remove-duplicate-objects.patch # Fix build of gnome-builder
+}
+
+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-11-04 20:03:12 UTC (rev 366756)
+++ arch-meson 2019-11-04 20:03:36 UTC (rev 366757)
@@ -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/staging-any/arch-meson (from rev 366756, meson/trunk/arch-meson)
===================================================================
--- arch-meson (rev 0)
+++ arch-meson 2019-11-04 20:03:36 UTC (rev 366757)
@@ -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: meson-python-3.8.patch
===================================================================
--- meson-python-3.8.patch 2019-11-04 20:03:12 UTC (rev 366756)
+++ meson-python-3.8.patch 2019-11-04 20:03:36 UTC (rev 366757)
@@ -1,13 +0,0 @@
-diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build
-index 8f45dc7f..44bc376d 100644
---- a/test cases/frameworks/1 boost/meson.build
-+++ b/test cases/frameworks/1 boost/meson.build
-@@ -30,7 +30,7 @@ pymod = import('python')
- python2 = pymod.find_installation('python2', required: host_machine.system() == 'linux', disabler: true)
- python3 = pymod.find_installation('python3', required: host_machine.system() == 'linux', disabler: true)
- python2dep = python2.dependency(required: host_machine.system() == 'linux', disabler: true)
--python3dep = python3.dependency(required: host_machine.system() == 'linux', disabler: true)
-+python3dep = dependency('python3-embed', required: host_machine.system() == 'linux', disabler: true)
-
- # compile python 2/3 modules only if we found a corresponding python version
- if(python2dep.found() and host_machine.system() == 'linux')
Copied: meson/repos/staging-any/meson-python-3.8.patch (from rev 366756, meson/trunk/meson-python-3.8.patch)
===================================================================
--- meson-python-3.8.patch (rev 0)
+++ meson-python-3.8.patch 2019-11-04 20:03:36 UTC (rev 366757)
@@ -0,0 +1,13 @@
+diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build
+index 8f45dc7f..44bc376d 100644
+--- a/test cases/frameworks/1 boost/meson.build
++++ b/test cases/frameworks/1 boost/meson.build
+@@ -30,7 +30,7 @@ pymod = import('python')
+ python2 = pymod.find_installation('python2', required: host_machine.system() == 'linux', disabler: true)
+ python3 = pymod.find_installation('python3', required: host_machine.system() == 'linux', disabler: true)
+ python2dep = python2.dependency(required: host_machine.system() == 'linux', disabler: true)
+-python3dep = python3.dependency(required: host_machine.system() == 'linux', disabler: true)
++python3dep = dependency('python3-embed', required: host_machine.system() == 'linux', disabler: true)
+
+ # compile python 2/3 modules only if we found a corresponding python version
+ if(python2dep.found() and host_machine.system() == 'linux')
Deleted: skip-test.diff
===================================================================
--- skip-test.diff 2019-11-04 20:03:12 UTC (rev 366756)
+++ skip-test.diff 2019-11-04 20:03:36 UTC (rev 366757)
@@ -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/staging-any/skip-test.diff (from rev 366756, meson/trunk/skip-test.diff)
===================================================================
--- skip-test.diff (rev 0)
+++ skip-test.diff 2019-11-04 20:03:36 UTC (rev 366757)
@@ -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