From d16e7d1213e73524b340153abf560c75128e3f62 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 23 Oct 2020 16:00:34 +0200 Subject: [PATCH] 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: --- cargo_wrapper.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/cargo_wrapper.py b/cargo_wrapper.py index 0d208dee..f951c514 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-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: