diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-24 17:21:30 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-24 12:16:28 -0700 |
| commit | 3c48bd2d88e94db2c9f6e714b7b320889a5dcb38 (patch) | |
| tree | 6d4c82cabbcca2938209b07774fd546e0cfc9474 | |
| parent | caa1ef6318a88e7da95c9909619a94f812cda9e5 (diff) | |
| download | meson-3c48bd2d88e94db2c9f6e714b7b320889a5dcb38.zip meson-3c48bd2d88e94db2c9f6e714b7b320889a5dcb38.tar.gz meson-3c48bd2d88e94db2c9f6e714b7b320889a5dcb38.tar.bz2 | |
Revert d9473095f234df54a9a531a859cb745bc349c5c2 because it broke GStreamer.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 20a42f8..4ce8a4a 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] |