diff options
| author | Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com> | 2016-10-16 10:52:16 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-12 10:55:47 -0500 |
| commit | 0f098c37ae3f257649eae7566391ad74b7010c45 (patch) | |
| tree | 0d264920bda52dd55d6190c3ac3b4f911677eb11 | |
| parent | e02aaad63286169aebf63109363fed648a185b05 (diff) | |
| download | meson-0f098c37ae3f257649eae7566391ad74b7010c45.zip meson-0f098c37ae3f257649eae7566391ad74b7010c45.tar.gz meson-0f098c37ae3f257649eae7566391ad74b7010c45.tar.bz2 | |
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.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 1 | ||||
| -rw-r--r-- | test cases/vala/11 mixed sources/meson.build | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 76f47ab..c854f1b 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1024,6 +1024,7 @@ int dummy; # found inside the build tree (generated sources). args += ['-d', c_out_dir] args += ['-C'] + args += ['--nostdpkg'] if not isinstance(target, build.Executable): # Library name args += ['--library=' + target.name] diff --git a/test cases/vala/11 mixed sources/meson.build b/test cases/vala/11 mixed sources/meson.build index 75b8ecd..1aecd44 100644 --- a/test cases/vala/11 mixed sources/meson.build +++ b/test cases/vala/11 mixed sources/meson.build @@ -1,7 +1,8 @@ project('foo', 'c', 'vala') glib = dependency('glib-2.0') +gobject = dependency('gobject-2.0') 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) |