diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-03-30 15:31:13 -0400 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.com> | 2020-10-23 10:55:20 -0400 |
commit | 8046eda879da51c4d5e30e402a6f6a30fb212327 (patch) | |
tree | a808460c5e254b8103c0be67eef63fc4490a555c | |
parent | a4f711e9e5ff2c6f6488e20e48a462890f31ffca (diff) |
Meson: Use generated -uninstalled.pc files
-rwxr-xr-x | gst-env.py | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -359,7 +359,6 @@ def get_subprocess_env(options, gst_version): presets = set() encoding_targets = set() - pkg_dirs = set() python_dirs = setup_gdb(options) if '--installed' in subprocess.check_output(meson + ['introspect', '-h']).decode(): installed_s = subprocess.check_output(meson + ['introspect', options.builddir, '--installed']) @@ -388,11 +387,6 @@ def get_subprocess_env(options, gst_version): elif path.endswith('.gep'): encoding_targets.add( os.path.abspath(os.path.join(os.path.dirname(path), '..'))) - elif path.endswith('.pc'): - # Is there a -uninstalled pc file for this file? - uninstalled = "{0}-uninstalled.pc".format(path[:-3]) - if os.path.exists(uninstalled): - pkg_dirs.add(os.path.dirname(path)) if path.endswith('gstomx.conf'): prepend_env_var(env, 'GST_OMX_CONFIG_DIR', os.path.dirname(path), @@ -404,9 +398,6 @@ def get_subprocess_env(options, gst_version): for t in sorted(encoding_targets): prepend_env_var(env, 'GST_ENCODING_TARGET_PATH', t, options.sysroot) - for pkg_dir in sorted(pkg_dirs): - prepend_env_var(env, "PKG_CONFIG_PATH", pkg_dir, options.sysroot) - # Check if meson has generated -uninstalled pkgconfig files meson_uninstalled = pathlib.Path(options.builddir) / 'meson-uninstalled' if meson_uninstalled.is_dir(): |