From 1e0ae0a083cc454dad64f9195e7b5e08b80f9bd9 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 12 Nov 2016 18:45:24 +0200 Subject: Revert "vala: Build with '--nostdpkg'", MR #920 This reverts commit 0f098c37ae3f257649eae7566391ad74b7010c45. --- mesonbuild/backend/ninjabackend.py | 1 - test cases/vala/11 mixed sources/meson.build | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index c854f1b..76f47ab 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1024,7 +1024,6 @@ 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 1aecd44..75b8ecd 100644 --- a/test cases/vala/11 mixed sources/meson.build +++ b/test cases/vala/11 mixed sources/meson.build @@ -1,8 +1,7 @@ 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, gobject]) +e = executable('foo', 'c/foo.c', retval, 'vala/bar.vala', dependencies: [glib]) test('test foo', e) -- cgit v1.1