From 0f098c37ae3f257649eae7566391ad74b7010c45 Mon Sep 17 00:00:00 2001 From: Guillaume Poirier-Morency Date: Sun, 16 Oct 2016 10:52:16 -0400 Subject: [PATCH] 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. --- mesonbuild/backend/ninjabackend.py | 1 + test cases/vala/11 mixed sources/meson.build | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 76f47ab2c..c854f1bf0 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 75b8ecda2..1aecd44da 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)