From 3c48bd2d88e94db2c9f6e714b7b320889a5dcb38 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 24 Oct 2016 17:21:30 +0300 Subject: [PATCH] Revert d9473095f234df54a9a531a859cb745bc349c5c2 because it broke GStreamer. --- mesonbuild/modules/gnome.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 20a42f8de..4ce8a4a05 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -381,8 +381,11 @@ class GnomeModule: deps = [deps] deps = (girtarget.get_all_link_deps() + girtarget.get_external_deps() + deps) - cflags, _, gi_includes = self.get_dependencies_flags(deps, state, depends) - scan_command += list(cflags) + # ldflags will be misinterpreted by gir scanner (showing + # spurious dependencies) but building GStreamer fails if they + # are not used here. + cflags, ldflags, gi_includes = self.get_dependencies_flags(deps, state, depends) + scan_command += list(cflags) + list(ldflags) for i in gi_includes: scan_command += ['--add-include-path=%s' % i]