mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-05-24 19:28:24 +00:00
Code Issues Projects Releases Wiki Activity

meson: fix PKG_CONFIG_PATH

Browse source 
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>
This commit is contained in:
Guillaume Desmottes 2020-10-23 16:00:34 +02:00
parent ad90efc508
commit d16e7d1213
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cargo_wrapper.py
View file

@ -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: