[arch-commits] Commit in meson/repos/extra-any (6 files)
Jan Steffens
heftig at archlinux.org
Sun Jan 28 13:48:02 UTC 2018
Date: Sunday, January 28, 2018 @ 13:48:01
Author: heftig
Revision: 315533
archrelease: copy trunk to extra-any
Added:
meson/repos/extra-any/0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch
(from rev 315532, meson/trunk/0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch)
meson/repos/extra-any/0002-d-Detect-recent-DMD-compilers.patch
(from rev 315532, meson/trunk/0002-d-Detect-recent-DMD-compilers.patch)
meson/repos/extra-any/PKGBUILD
(from rev 315532, meson/trunk/PKGBUILD)
meson/repos/extra-any/arch-meson
(from rev 315532, meson/trunk/arch-meson)
Deleted:
meson/repos/extra-any/PKGBUILD
meson/repos/extra-any/arch-meson
-----------------------------------------------------------------+
0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch | 30 ++
0002-d-Detect-recent-DMD-compilers.patch | 33 ++
PKGBUILD | 131 +++++-----
arch-meson | 43 +--
4 files changed, 156 insertions(+), 81 deletions(-)
Copied: meson/repos/extra-any/0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch (from rev 315532, meson/trunk/0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch)
===================================================================
--- 0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch (rev 0)
+++ 0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch 2018-01-28 13:48:01 UTC (rev 315533)
@@ -0,0 +1,30 @@
+From 89d4decc9cdda01590c2a734c0f58924bcf30777 Mon Sep 17 00:00:00 2001
+Message-Id: <89d4decc9cdda01590c2a734c0f58924bcf30777.1517146929.git.jan.steffens at gmail.com>
+From: Dylan Baker <dylan at pnwbakers.com>
+Date: Tue, 19 Dec 2017 20:05:24 -0800
+Subject: [PATCH 1/2] tests: skip objc nsstring test if gnustep is not
+ installed
+
+---
+ test cases/objc/2 nsstring/meson.build | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test cases/objc/2 nsstring/meson.build b/test cases/objc/2 nsstring/meson.build
+index a877d746..7f2483f4 100644
+--- a/test cases/objc/2 nsstring/meson.build
++++ b/test cases/objc/2 nsstring/meson.build
+@@ -5,7 +5,10 @@ if host_machine.system() == 'darwin'
+ elif host_machine.system() == 'cygwin'
+ error('MESON_SKIP_TEST GNUstep is not packaged for Cygwin.')
+ else
+- dep = dependency('gnustep')
++ dep = dependency('gnustep', required : false)
++ if not dep.found()
++ error('MESON_SKIP_TEST: GNUstep is not installed')
++ endif
+ if host_machine.system() == 'linux' and meson.get_compiler('objc').get_id() == 'clang'
+ error('MESON_SKIP_TEST: GNUstep is broken on Linux with Clang')
+ endif
+--
+2.16.1
+
Copied: meson/repos/extra-any/0002-d-Detect-recent-DMD-compilers.patch (from rev 315532, meson/trunk/0002-d-Detect-recent-DMD-compilers.patch)
===================================================================
--- 0002-d-Detect-recent-DMD-compilers.patch (rev 0)
+++ 0002-d-Detect-recent-DMD-compilers.patch 2018-01-28 13:48:01 UTC (rev 315533)
@@ -0,0 +1,33 @@
+From 67d5488753911b06b80afd57066e36b4eddec892 Mon Sep 17 00:00:00 2001
+Message-Id: <67d5488753911b06b80afd57066e36b4eddec892.1517146929.git.jan.steffens at gmail.com>
+In-Reply-To: <89d4decc9cdda01590c2a734c0f58924bcf30777.1517146929.git.jan.steffens at gmail.com>
+References: <89d4decc9cdda01590c2a734c0f58924bcf30777.1517146929.git.jan.steffens at gmail.com>
+From: Matthias Klumpp <matthias at tenstral.net>
+Date: Sun, 7 Jan 2018 17:57:43 +0100
+Subject: [PATCH 2/2] d: Detect recent DMD compilers
+
+They now are published by the D Language Foundation, and not Digital
+Mars. Therefore, their signature has changed slightly.
+(We can not check for 'DMD', because that string appears in every
+compiler version output to denote the frontend version used by the
+compiler).
+---
+ mesonbuild/environment.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 0cb1450e..7fa4732a 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -725,7 +725,7 @@ class Environment:
+ return compilers.LLVMDCompiler(exelist, version, is_cross)
+ elif 'gdc' in out:
+ return compilers.GnuDCompiler(exelist, version, is_cross)
+- elif 'Digital Mars' in out:
++ elif 'The D Language Foundation' in out or 'Digital Mars' in out:
+ return compilers.DmdDCompiler(exelist, version, is_cross)
+ raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"')
+
+--
+2.16.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-28 13:46:55 UTC (rev 315532)
+++ PKGBUILD 2018-01-28 13:48:01 UTC (rev 315533)
@@ -1,59 +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.44.0
-pkgrel=1
-pkgdesc='High productivity build system'
-url='http://mesonbuild.com/'
-arch=('any')
-license=('Apache')
-depends=('python' 'ninja')
-makedepends=('python-setuptools')
-checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt4' 'qt5-base' 'git' 'gnustep-base'
- 'cython' 'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk' 'python-gobject' 'gobject-introspection'
- 'itstool' 'gtk3' 'java-environment=8' 'gtk-doc' 'llvm' 'clang' 'sdl2'
- 'doxygen' 'vulkan-validation-layers' 'openmpi' 'openssh' 'mercurial' 'gtk-sharp-2'
- 'qt5-tools' 'libwmf')
-checkdepends_x86_64=('ldc' 'valgrind')
-source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
- arch-meson)
-sha512sums=('9aefa52d92d7750528e9a9236f19131c8e58bfc21212595c311f4e2787ad40bb53d6085f52283cad13923ddf12da1a59067d48424c72ace47fc127978d1af2ff'
- 'SKIP'
- '82557891b9424b1597f1200bfacfae2f357e94bf81d53fc3fe9b2b641098566513dce6eeaa8882e9892c7cdec796650e5298ed25af61f35f9d02d9b4b9ca39c8')
-validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
-
-prepare() {
- cd ${pkgname}-${pkgver}
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- python setup.py build
-}
-
-check() {
- cd ${pkgname}-${pkgver}
- unset CLASSPATH # GNUstep breaks java tests
- LDFLAGS="${LDFLAGS/,--as-needed/}" # --as-needed breaks openmpi linking
- # export MESON_PRINT_TEST_OUTPUT=1 # set this for debug output
- # graphviz: Installing breaks doxygen tests
- LC_CTYPE=en_US.UTF-8 DC=ldc ./run_tests.py
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-
- for _f in data/syntax-highlighting/vim/*/*; do
- install -Dt "${pkgdir}/usr/share/vim/vimfiles/$(basename "$(dirname "$_f")")" -m644 "$_f"
- done
- 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 315532, meson/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-28 13:48:01 UTC (rev 315533)
@@ -0,0 +1,72 @@
+# 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.44.0
+pkgrel=2
+pkgdesc='High productivity build system'
+url='http://mesonbuild.com/'
+arch=('any')
+license=('Apache')
+depends=('python' 'ninja')
+makedepends=('python-setuptools')
+checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt4' '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' 'openmpi' 'openssh' 'mercurial' 'gtk-sharp-2'
+ 'qt5-tools' 'libwmf' 'dmd' 'valgrind')
+source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
+ 0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch
+ 0002-d-Detect-recent-DMD-compilers.patch
+ arch-meson)
+sha512sums=('9aefa52d92d7750528e9a9236f19131c8e58bfc21212595c311f4e2787ad40bb53d6085f52283cad13923ddf12da1a59067d48424c72ace47fc127978d1af2ff'
+ 'SKIP'
+ '04a0f113ba5f1ae57591fad3f5ecf812ef88b8809b4ffe063e82f6548e728a1a7bd51c171a948873884c2631fc10a9cd141f56de22cd7cf766cdb74996840eec'
+ 'b38af817966e60db19c1efcc5e8e4f1b822925bf823b0a68c33eb0bfd0aa4ccff1439e352d8df032d0a189cd0ff37fb7dcefe0ed7a272e45f963f7e3d0b63f0f'
+ 'e901f87f3ee1baa7b9aedb79bd5c9e50898a5695ac938f7f8420d8e81f526a09f07ceedadb65975437efa5a68fcf581110a040f579f2530437d1e6eb5addea76')
+validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Skip gnustep tests
+ patch -Np1 -i ../0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch
+
+ # Fix for recent DMD
+ patch -Np1 -i ../0002-d-Detect-recent-DMD-compilers.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ python setup.py build
+}
+
+check() (
+ cd ${pkgname}-${pkgver}
+
+ # --as-needed breaks openmpi linking
+ LDFLAGS="${LDFLAGS/,--as-needed/}"
+
+ # set for debug output
+ #export MESON_PRINT_TEST_OUTPUT=1
+
+ export LC_CTYPE=en_US.UTF-8
+ ./run_tests.py
+)
+
+package() {
+ cd ${pkgname}-${pkgver}
+ python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+
+ for _f in data/syntax-highlighting/vim/*/*; do
+ install -Dt "${pkgdir}/usr/share/vim/vimfiles/$(basename "$(dirname "$_f")")" -m644 "$_f"
+ done
+ 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 2018-01-28 13:46:55 UTC (rev 315532)
+++ arch-meson 2018-01-28 13:48:01 UTC (rev 315533)
@@ -1,22 +0,0 @@
-#!/bin/bash -ex
-# Meson wrapper for Arch Linux packaging
-
-exec meson setup \
- --prefix /usr \
- --libdir /usr/lib \
- --libexecdir /usr/lib \
- --bindir /usr/bin \
- --sbindir /usr/bin \
- --includedir /usr/include \
- --datadir /usr/share \
- --mandir /usr/share/man \
- --infodir /usr/share/info \
- --localedir /usr/share/locale \
- --sysconfdir /etc \
- --localstatedir /var \
- --sharedstatedir /var/lib \
- --buildtype release \
- --warnlevel 2 \
- --wrap-mode nofallback \
- "$@" \
- -D b_lto=true
Copied: meson/repos/extra-any/arch-meson (from rev 315532, meson/trunk/arch-meson)
===================================================================
--- arch-meson (rev 0)
+++ arch-meson 2018-01-28 13:48:01 UTC (rev 315533)
@@ -0,0 +1,21 @@
+#!/bin/bash -ex
+# Meson wrapper for Arch Linux packaging
+
+exec meson setup \
+ --prefix /usr \
+ --libdir /usr/lib \
+ --libexecdir /usr/lib \
+ --bindir /usr/bin \
+ --sbindir /usr/bin \
+ --includedir /usr/include \
+ --datadir /usr/share \
+ --mandir /usr/share/man \
+ --infodir /usr/share/info \
+ --localedir /usr/share/locale \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ --sharedstatedir /var/lib \
+ --buildtype release \
+ --wrap-mode nofallback \
+ "$@" \
+ -D b_lto=true
More information about the arch-commits
mailing list