summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2019-05-13 13:24:42 +0530
committerTim-Philipp Müller <tim@centricular.com>2019-08-08 00:01:09 +0100
commit3a8910f53bc38d826a9f2b9dc92970fd49a21983 (patch)
tree15b08af27dd836b790bfbcddc5085672c816244c
parentf5ed89dc8356b8f4fcaadd3a4524b4e1b88331c8 (diff)
meson: Link to objects instea of static helper library
Otherwise the objects from that static helper library are not included in the gstreamer-1.0 static library. This was supposed to be fixed in Meson, but the pull request hasn't been merged yet: https://github.com/mesonbuild/meson/pull/3939 Closes https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/398
-rw-r--r--gst/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/meson.build b/gst/meson.build
index d29e37082..d19689c43 100644
--- a/gst/meson.build
+++ b/gst/meson.build
@@ -237,6 +237,7 @@ gst_incdirs = [configinc]
gst_gen_sources = [gstenum_h]
libgst = library('gstreamer-1.0', gst_sources,
gstenum_h, gstenum_c, gst_parse_sources, gst_registry_sources,
+ objects : printf_lib.extract_all_objects(),
version : libversion,
soversion : soversion,
darwin_versions : osxversion,
@@ -244,7 +245,6 @@ libgst = library('gstreamer-1.0', gst_sources,
include_directories : [configinc,
# HACK, change include paths in .y and .l in final version.
include_directories('parse')],
- link_with : printf_lib,
install : true,
dependencies : [gobject_dep, gmodule_dep, glib_dep, mathlib, dl_dep] + backtrace_deps
+ platform_deps,