Commit d16e7d12 authored by Guillaume Desmottes's avatar Guillaume Desmottes 🐐

meson: fix PKG_CONFIG_PATH

pkg-config files are now ll in 'build/meson-uninstalled'.

Fix gstreamer!4

Part-of: <!415>
parent ad90efc5
Pipeline #220739 passed with stages
in 13 minutes and 11 seconds
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment