diff options
| author | Jordan Petridis <jordan@centricular.com> | 2022-11-29 19:48:03 +0300 |
|---|---|---|
| committer | Jordan Petridis <jordan@centricular.com> | 2022-11-29 21:03:29 +0300 |
| commit | 12c058bc49026fde12458d99ed31acff63979cc6 (patch) | |
| tree | c6b95e448d549717d4205600fd19ca2f78cc5a2c | |
| parent | 76eeaffbb2c35453dd86f4d36a5bc0aedbc54dad (diff) | |
meson: Fix build of static plugins
While we were correctly skipping the plugins that couldn't be
built statically, we were still adding their names to the list
and the .pc list causing them to still get built.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/994>
| -rwxr-xr-x | ci/generate-static-test.py | 2 | ||||
| -rw-r--r-- | meson.build | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ci/generate-static-test.py b/ci/generate-static-test.py index b4c75d8ed..065beb5c5 100755 --- a/ci/generate-static-test.py +++ b/ci/generate-static-test.py @@ -7,7 +7,7 @@ import os from utils import iterate_plugins # the csound version used on ci does not ship a .pc file -IGNORE = ['csound'] +IGNORE = ['csound', 'threadshare'] outdir = sys.argv[1] diff --git a/meson.build b/meson.build index d76f8770b..ce7846e5c 100644 --- a/meson.build +++ b/meson.build @@ -282,13 +282,13 @@ foreach plugin : plugins warning('Static plugin @0@ is known to fail. It will not be included in libgstreamer-full.'.format(plugin_name)) else gst_plugins += dep - endif - pc_files += [plugin_name + '.pc'] - if plugin_name.startswith('gst') - plugin_names += [plugin_name.substring(3)] - else - plugin_names += [plugin_name] + pc_files += [plugin_name + '.pc'] + if plugin_name.startswith('gst') + plugin_names += [plugin_name.substring(3)] + else + plugin_names += [plugin_name] + endif endif endforeach |