Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vala: Build with '--nostdpkg' 

Since Vala require 'glib-2.0' and 'gobject-2.0' dependencies, it's
better to fail at 'valac' step with meaningful error.

Add missing 'gobject-2.0' dependency on the mixed source test case.
This commit is contained in:
Guillaume Poirier-Morency 2016-10-16 10:52:16 -04:00 committed by Jussi Pakkanen
parent e02aaad632
commit 0f098c37ae
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mesonbuild/backend/ninjabackend.py
View File

@ -1024,6 +1024,7 @@ int dummy;
# found inside the build tree (generated sources). # found inside the build tree (generated sources).
args += ['-d', c_out_dir] args += ['-d', c_out_dir]
args += ['-C'] args += ['-C']
args += ['--nostdpkg']
if not isinstance(target, build.Executable): if not isinstance(target, build.Executable):
# Library name # Library name
args += ['--library=' + target.name] args += ['--library=' + target.name]

3
test cases/vala/11 mixed sources/meson.build
View File

@ -1,7 +1,8 @@
project('foo', 'c', 'vala') project('foo', 'c', 'vala')
glib = dependency('glib-2.0') glib = dependency('glib-2.0')
gobject = dependency('gobject-2.0')
subdir('c') subdir('c')
e = executable('foo', 'c/foo.c', retval, 'vala/bar.vala', dependencies: [glib]) e = executable('foo', 'c/foo.c', retval, 'vala/bar.vala', dependencies: [glib, gobject])
test('test foo', e) test('test foo', e)