[arch-commits] Commit in meson/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Mon Mar 30 13:07:06 UTC 2020
Date: Monday, March 30, 2020 @ 13:07:05
Author: heftig
Revision: 378738
0.54.0-1
Added:
meson/trunk/0001-Fix-meson_jar_template-so-test-suite-passes.patch
Modified:
meson/trunk/PKGBUILD
Deleted:
meson/trunk/0001-environment-Fix-construction-of-CudaLinker.patch
--------------------------------------------------------+
0001-Fix-meson_jar_template-so-test-suite-passes.patch | 88 +++++++++++++++
0001-environment-Fix-construction-of-CudaLinker.patch | 41 ------
PKGBUILD | 16 +-
3 files changed, 96 insertions(+), 49 deletions(-)
Added: 0001-Fix-meson_jar_template-so-test-suite-passes.patch
===================================================================
--- 0001-Fix-meson_jar_template-so-test-suite-passes.patch (rev 0)
+++ 0001-Fix-meson_jar_template-so-test-suite-passes.patch 2020-03-30 13:07:05 UTC (rev 378738)
@@ -0,0 +1,88 @@
+From f61bab556a2cf6aae7935f6add8b00657666b5e2 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 30 Mar 2020 01:27:39 +0200
+Subject: [PATCH] Fix meson_jar_template so test suite passes
+
+It was generating an extra comma.
+
+ The Meson build system
+ Version: 0.54.0
+ Source dir: /tmp/tmp34halxhe
+ Build dir: /tmp/tmp34halxhe/build
+ Build type: native build
+
+ meson.build:6:15: ERROR: Expecting rparen got comma.
+ 'Foo.java',,
+ ^
+ For a block that started at 5,3
+ jar('tmp34halxhe',
+ ^
+
+ A full log can be found at /tmp/tmp34halxhe/build/meson-logs/meson-log.txt
+ Using "tmp34halxhe" (name of current directory) as project name.
+ Using "tmp34halxhe" (project name) as name of executable to build.
+ Detected source files: Foo.java
+ Detected language: java
+ Generated meson.build file:
+
+ project('tmp34halxhe', 'java',
+ version : '0.1',
+ default_options : ['warning_level=3'])
+
+ jar('tmp34halxhe',
+ 'Foo.java',,
+ main_class: tmp34halxhe,
+ install : true)
+
+It was also missing quotes around the main class name.
+
+ The Meson build system
+ Version: 0.54.0
+ Source dir: /tmp/tmpjm5cg44a
+ Build dir: /tmp/tmpjm5cg44a/build
+ Build type: native build
+ Project name: tmpjm5cg44a
+ Project version: 0.1
+ Java compiler for the host machine: javac (unknown 1.8.0)
+ Host machine cpu family: x86_64
+ Host machine cpu: x86_64
+
+ meson.build:5:0: ERROR: Unknown variable "tmpjm5cg44a".
+
+ A full log can be found at /tmp/tmpjm5cg44a/build/meson-logs/meson-log.txt
+ Using "tmpjm5cg44a" (name of current directory) as project name.
+ Using "tmpjm5cg44a" (project name) as name of executable to build.
+ Detected source files: Foo.java
+ Detected language: java
+ Generated meson.build file:
+
+ project('tmpjm5cg44a', 'java',
+ version : '0.1',
+ default_options : ['warning_level=3'])
+
+ jar('tmpjm5cg44a',
+ 'Foo.java',
+ main_class: tmpjm5cg44a,
+ install : true)
+---
+ mesonbuild/templates/mesontemplates.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/templates/mesontemplates.py b/mesonbuild/templates/mesontemplates.py
+index 2739c9d8..6b341a21 100644
+--- a/mesonbuild/templates/mesontemplates.py
++++ b/mesonbuild/templates/mesontemplates.py
+@@ -27,8 +27,8 @@ meson_jar_template = '''project('{project_name}', '{language}',
+ default_options : [{default_options}])
+
+ jar('{executable}',
+- {sourcespec},{depspec},
+- main_class: {main_class},
++ {sourcespec},{depspec}
++ main_class: '{main_class}',
+ install : true)
+ '''
+
+--
+2.26.0
+
Deleted: 0001-environment-Fix-construction-of-CudaLinker.patch
===================================================================
--- 0001-environment-Fix-construction-of-CudaLinker.patch 2020-03-30 12:29:42 UTC (rev 378737)
+++ 0001-environment-Fix-construction-of-CudaLinker.patch 2020-03-30 13:07:05 UTC (rev 378738)
@@ -1,41 +0,0 @@
-From a798616f8ac85c02f0830269410a16c54cbd0cab Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Thu, 27 Feb 2020 15:53:43 +0100
-Subject: [PATCH] environment: Fix construction of CudaLinker
-
-The 0.53.2 test suite has a new failure:
-
- Traceback (most recent call last):
- File "run_project_tests.py", line 1024, in <module>
- detect_system_compiler()
- File "run_project_tests.py", line 964, in detect_system_compiler
- comp = env.compiler_from_language(lang, MachineChoice.HOST)
- File "/build/meson/src/meson-0.53.2/mesonbuild/environment.py", line 1565, in compiler_from_language
- comp = self.detect_cuda_compiler(for_machine)
- File "/build/meson/src/meson-0.53.2/mesonbuild/environment.py", line 1131, in detect_cuda_compiler
- linker = CudaLinker(compiler, for_machine, 'nvlink', CudaCompiler.LINKER_PREFIX, [], version=CudaLinker.parse_version())
- File "/build/meson/src/meson-0.53.2/mesonbuild/linkers.py", line 963, in __init__
- super().__init__('nvlink', *args, **kwargs)
- TypeError: __init__() takes 6 positional arguments but 7 positional arguments (and 1 keyword-only argument) were given
-
-Fixes: c708c52ca225 ("linkers: Update the linker names to be more consistent")
----
- mesonbuild/environment.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 39c6b542..ebadd576 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -1128,7 +1128,7 @@ class Environment:
- cpp_compiler = self.detect_cpp_compiler(for_machine)
- cls = CudaCompiler
- self.coredata.add_lang_args(cls.language, cls, for_machine, self)
-- linker = CudaLinker(compiler, for_machine, 'nvlink', CudaCompiler.LINKER_PREFIX, [], version=CudaLinker.parse_version())
-+ linker = CudaLinker(compiler, for_machine, CudaCompiler.LINKER_PREFIX, [], version=CudaLinker.parse_version())
- return cls(ccache + compiler, version, for_machine, is_cross, exe_wrap, host_compiler=cpp_compiler, info=info, linker=linker)
- raise EnvironmentException('Could not find suitable CUDA compiler: "' + ' '.join(compilers) + '"')
-
---
-2.25.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-30 12:29:42 UTC (rev 378737)
+++ PKGBUILD 2020-03-30 13:07:05 UTC (rev 378738)
@@ -3,7 +3,7 @@
# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
pkgname=meson
-pkgver=0.53.2
+pkgver=0.54.0
pkgrel=1
pkgdesc='High productivity build system'
url='https://mesonbuild.com/'
@@ -14,16 +14,16 @@
'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')
+ 'libwmf' 'valgrind' 'cmake' 'netcdf-fortran' 'openmpi' 'nasm' 'gnustep-base' 'libelf'
+ 'python-pytest-xdist') # 'cuda')
source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
skip-test.diff
- 0001-environment-Fix-construction-of-CudaLinker.patch
+ 0001-Fix-meson_jar_template-so-test-suite-passes.patch
arch-meson)
-sha512sums=('005340f0faaa8fc5065b916355af6c2e3311da59fae67c781eb9ca47c5430dca85e9aa1052c5e92b3da8546b4b197fe623a6d48b073a24e05535141ba59ecac7'
+sha512sums=('e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7'
'SKIP'
'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347'
- 'c214888ef7b095e1baa68743a065438cd4270032c457580d5e6e2f728b694abfe07b609c17b11d6b9f66b0f5ba2702552084508f69003072dc45ae01b09d8eb2'
+ '1203c844466409fceb6e3bd4f419762d7dcd460f4dbf412eda7d966b002dd69710af97d9135fc399c71fdcd191aa512bf180e60562f5996932e2827acf591eb2'
'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
@@ -33,8 +33,8 @@
# Our containers do not allow sanitizers to run
patch -Np1 -i ../skip-test.diff
- # Fix CUDA
- patch -Np1 -i ../0001-environment-Fix-construction-of-CudaLinker.patch
+ # https://github.com/mesonbuild/meson/pull/6868
+ patch -Np1 -i ../0001-Fix-meson_jar_template-so-test-suite-passes.patch
}
build() {
More information about the arch-commits
mailing list