[arch-commits] Commit in meson/repos/extra-any (7 files)

Jan Steffens heftig at archlinux.org
Tue May 11 13:30:39 UTC 2021


    Date: Tuesday, May 11, 2021 @ 13:30:39
  Author: heftig
Revision: 414985

archrelease: copy trunk to extra-any

Added:
  meson/repos/extra-any/PKGBUILD
    (from rev 414984, meson/trunk/PKGBUILD)
  meson/repos/extra-any/arch-meson
    (from rev 414984, meson/trunk/arch-meson)
  meson/repos/extra-any/skip-test.diff
    (from rev 414984, meson/trunk/skip-test.diff)
  meson/repos/extra-any/workaround-8744.diff
    (from rev 414984, meson/trunk/workaround-8744.diff)
Deleted:
  meson/repos/extra-any/PKGBUILD
  meson/repos/extra-any/arch-meson
  meson/repos/extra-any/skip-test.diff

----------------------+
 PKGBUILD             |  127 +++++++++++++++++++++++++------------------------
 arch-meson           |   26 +++++-----
 skip-test.diff       |   30 +++++------
 workaround-8744.diff |   33 ++++++++++++
 4 files changed, 127 insertions(+), 89 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-11 13:29:57 UTC (rev 414984)
+++ PKGBUILD	2021-05-11 13:30:39 UTC (rev 414985)
@@ -1,61 +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.58.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' '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')
-source=(https://github.com/mesonbuild/meson/releases/download/${pkgver/rc/.rc}/meson-${pkgver}.tar.gz{,.asc}
-        skip-test.diff
-        arch-meson)
-sha512sums=('6a075666a12962a613c63c35e19c692b31ee434ce61040ecd12af83d98766164076744570fe426ebf7f6a93ce83f7fdce26c8447f9d3752f6b94824d57c751c5'
-            'SKIP'
-            '4e643d1db5a09c061f1118aee4018e820c86ad164c469eeb5823a17e7ec83be0a875b1a841ae22078c84777b4951f198fb55c31aa31a8f37209fae0de06e61ea'
-            '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: ts=2 sw=2 et:

Copied: meson/repos/extra-any/PKGBUILD (from rev 414984, meson/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-11 13:30:39 UTC (rev 414985)
@@ -0,0 +1,66 @@
+# 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.58.0
+pkgrel=2
+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}
+        workaround-8744.diff
+        skip-test.diff
+        arch-meson)
+sha512sums=('6a075666a12962a613c63c35e19c692b31ee434ce61040ecd12af83d98766164076744570fe426ebf7f6a93ce83f7fdce26c8447f9d3752f6b94824d57c751c5'
+            'SKIP'
+            '5f4ab315599c5c950048472a92b4ef28cd978cfc2aed17f8361174d68ad1ef153a72ff4e6d3d0593d0363b8988daca9c454a55c33422b9f3357e0a55e1545155'
+            'a40e3be7a4ea7048cbbab59d28fb355debdfcdc5e45244aad65ab57fa222f4a2cf3165f28cc7e1dba893a162de9c7563ef0e155fa6a77960c4d02ef622313ace'
+            'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
+validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen <jpakkane at gmail.com>
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # Workaround https://github.com/mesonbuild/meson/issues/8744
+  patch -Np1 -i ../workaround-8744.diff
+
+  # 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: sw=2 et:

Deleted: arch-meson
===================================================================
--- arch-meson	2021-05-11 13:29:57 UTC (rev 414984)
+++ arch-meson	2021-05-11 13:30:39 UTC (rev 414985)
@@ -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 414984, meson/trunk/arch-meson)
===================================================================
--- arch-meson	                        (rev 0)
+++ arch-meson	2021-05-11 13:30:39 UTC (rev 414985)
@@ -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-05-11 13:29:57 UTC (rev 414984)
+++ skip-test.diff	2021-05-11 13:30:39 UTC (rev 414985)
@@ -1,15 +0,0 @@
- run_unittests.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git c/run_unittests.py i/run_unittests.py
-index 80833425f..43f647d35 100755
---- c/run_unittests.py
-+++ i/run_unittests.py
-@@ -6455,6 +6455,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 414984, meson/trunk/skip-test.diff)
===================================================================
--- skip-test.diff	                        (rev 0)
+++ skip-test.diff	2021-05-11 13:30:39 UTC (rev 414985)
@@ -0,0 +1,15 @@
+ run_unittests.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git c/run_unittests.py i/run_unittests.py
+index 828c80e70..7d4e448f0 100755
+--- c/run_unittests.py
++++ i/run_unittests.py
+@@ -6699,6 +6699,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/workaround-8744.diff (from rev 414984, meson/trunk/workaround-8744.diff)
===================================================================
--- workaround-8744.diff	                        (rev 0)
+++ workaround-8744.diff	2021-05-11 13:30:39 UTC (rev 414985)
@@ -0,0 +1,33 @@
+diff --git i/mesonbuild/backend/backends.py w/mesonbuild/backend/backends.py
+index ee5f4463a..4100c54c9 100644
+--- i/mesonbuild/backend/backends.py
++++ w/mesonbuild/backend/backends.py
+@@ -23,6 +23,7 @@ import pickle
+ import re
+ import typing as T
+ import hashlib
++import copy
+ 
+ from .. import build
+ from .. import dependencies
+@@ -1429,7 +1430,19 @@ class Backend:
+                         d.targets.append(i)
+ 
+     def generate_custom_install_script(self, d: InstallData) -> None:
+-        d.install_scripts = self.build.install_scripts
++        result: T.List[ExecutableSerialisation] = []
++        srcdir = self.environment.get_source_dir()
++        builddir = self.environment.get_build_dir()
++        for i in self.build.install_scripts:
++            fixed_args = []
++            for a in i.cmd_args:
++                a = a.replace('@SOURCE_ROOT@', srcdir)
++                a = a.replace('@BUILD_ROOT@', builddir)
++                fixed_args.append(a)
++            es = copy.copy(i)
++            es.cmd_args = fixed_args
++            result.append(es)
++        d.install_scripts = result
+ 
+     def generate_header_install(self, d: InstallData) -> None:
+         incroot = self.environment.get_includedir()



More information about the arch-commits mailing list