From 2fd461a032d944141781eaf3ecabb93ede57d88e Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sat, 2 Oct 2021 11:54:00 -0300 Subject: [PATCH] validate:build: Disable static building validate tracer It introduce duplication of symbols and we need to rework the way we implement it Part-of: --- .../validate/gst/validate/meson.build | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/subprojects/gst-devtools/validate/gst/validate/meson.build b/subprojects/gst-devtools/validate/gst/validate/meson.build index a3cd4da043..bc95b9d331 100644 --- a/subprojects/gst-devtools/validate/gst/validate/meson.build +++ b/subprojects/gst-devtools/validate/gst/validate/meson.build @@ -66,16 +66,22 @@ gstvalidate = library('gstvalidate-1.0', c_args : [gst_c_args] + ['-D_GNU_SOURCE'], dependencies : validate_deps) -gstvalidatetracer = library('gstvalidatetracer', - sources: files('gst-validate-runner.c') + gst_validate_enums, - include_directories : [inc_dirs], - install: true, - c_args : [gst_c_args] + ['-D__GST_VALIDATE_PLUGIN', '-D_GNU_SOURCE'], - install_dir : plugins_install_dir, - objects: gstvalidate.extract_objects(gstvalidate_sources), - dependencies : validate_deps) +if not static_build + gstvalidatetracer = library('gstvalidatetracer', + sources: files('gst-validate-runner.c') + gst_validate_enums, + include_directories : [inc_dirs], + install: true, + c_args : [gst_c_args] + ['-D__GST_VALIDATE_PLUGIN', '-D_GNU_SOURCE'], + install_dir : plugins_install_dir, + objects: gstvalidate.extract_objects(gstvalidate_sources), + dependencies : validate_deps) + plugins += gstvalidatetracer + + pkgconfig.generate(gstvalidatetracer, install_dir : plugins_pkgconfig_install_dir) +else + warning('Statically building GstValidate as a tracer is not supported yet.') +endif -plugins += gstvalidatetracer pkg_name = 'gst-validate-1.0' library_def = {'lib': gstvalidate} @@ -123,4 +129,3 @@ validate_dep = declare_dependency(link_with : gstvalidate, meson.override_dependency(pkg_name, validate_dep) -pkgconfig.generate(gstvalidatetracer, install_dir : plugins_pkgconfig_install_dir)