diff options
| author | Arnaud Rebillout <arnaud.rebillout@collabora.com> | 2018-11-26 16:44:06 +0700 |
|---|---|---|
| committer | Arun Raghavan <arun@arunraghavan.net> | 2019-06-08 11:57:00 +0200 |
| commit | d71708921829936f34e28a7b6789aed8ac3d0e15 (patch) | |
| tree | b6878134f9326a23ae3ecee53737301ed8db058b | |
| parent | f5c9ef59f3fba3578ef1aaeb7d3d6c7dd762daa2 (diff) | |
| download | pulseaudio-d71708921829936f34e28a7b6789aed8ac3d0e15.tar.gz | |
meson: Build libwebrtc-util as a shared library
As it'sdone in the autotools
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
| -rw-r--r-- | src/modules/echo-cancel/meson.build | 8 | ||||
| -rw-r--r-- | src/tests/meson.build | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/modules/echo-cancel/meson.build b/src/modules/echo-cancel/meson.build index ea984f482..0a3deb902 100644 --- a/src/modules/echo-cancel/meson.build +++ b/src/modules/echo-cancel/meson.build @@ -2,18 +2,20 @@ # link module-echo-cancel with C++ (which it does if there are any C++ deps, # even conditional ones). -# Defining this library as shared fails, as it actually requires a symbol -# from module-echo-cancel.c. Setting it to static solves that. +# This library requires a symbol from module-echo-cancel, hence we need +# '-Wl,--unresolved-symbols=ignore-in-object-files' otherwise it fails +# at link time. libwebrtc_util_sources = [ 'webrtc.cc' ] -libwebrtc_util = static_library('webrtc-util', +libwebrtc_util = shared_library('webrtc-util', libwebrtc_util_sources, cpp_args : [pa_c_args, server_c_args], include_directories : [configinc, topinc], dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, webrtc_dep], + link_args : [ '-Wl,--unresolved-symbols=ignore-in-object-files' ], install : true, install_dir : modlibexecdir, ) diff --git a/src/tests/meson.build b/src/tests/meson.build index a450cb8ac..d5d4a91d4 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -142,7 +142,7 @@ endforeach norun_tests += [ [ 'echo-cancel-test', echo_cancel_test_sources, - module_echo_cancel_deps + [ libpulse_dep, libpulsecore_dep ], + module_echo_cancel_deps + [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ], module_echo_cancel_libs, module_echo_cancel_flags + server_c_args + [ '-DPA_MODULE_NAME=module_echo_cancel', '-DECHO_CANCEL_TEST=1' ] ] ] |