diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2020-10-23 17:00:34 +0300 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2020-10-26 10:50:45 +0300 |
| commit | d16e7d1213e73524b340153abf560c75128e3f62 (patch) | |
| tree | a0377ec7ad88fdcb7c1caa60cada7e2facaa0e0a /cargo_wrapper.py | |
| parent | ad90efc50816cf96ca6dfe7778cb151874f76614 (diff) | |
meson: fix PKG_CONFIG_PATH
pkg-config files are now ll in 'build/meson-uninstalled'.
Fix https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/415>
Diffstat (limited to 'cargo_wrapper.py')
| -rw-r--r-- | cargo_wrapper.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cargo_wrapper.py b/cargo_wrapper.py index 0d208dee5..f951c514d 100644 --- a/cargo_wrapper.py +++ b/cargo_wrapper.py @@ -15,15 +15,8 @@ cargo_target_dir = os.path.join(meson_build_dir, 'target') env = os.environ.copy() env['CARGO_TARGET_DIR'] = cargo_target_dir -# FIXME: hack so cargo will find gst libs when building inside gst-build. -# We should fetch this from meson deps instead of hardcoding the paths, -# when Meson will generate -uninstalled.pc files, they all will be in -# <meson_build_root>/meson-uninstalled/ pkg_config_path = env.get('PKG_CONFIG_PATH', '').split(':') -pkg_config_path.append(os.path.join( - meson_build_root, 'subprojects', 'gstreamer', 'pkgconfig')) -pkg_config_path.append(os.path.join( - meson_build_root, 'subprojects', 'gst-plugins-base', 'pkgconfig')) +pkg_config_path.append(os.path.join(meson_build_root, 'meson-uninstalled')) env['PKG_CONFIG_PATH'] = ':'.join(pkg_config_path) if len(extra_env) > 0: |