From a507f24694a523438fd527192a393bf34d11e7e0 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 17 Dec 2022 04:44:50 +0530 Subject: [PATCH] meson: Fix pkgconfig detection when specified in machine file When pkgconfig and pkg_config_path are specified in the machine file, we need to parse those and pass them on to the cargo_wrapper. Part-of: --- meson.build | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meson.build b/meson.build index 3e1556e3..8dd390c6 100644 --- a/meson.build +++ b/meson.build @@ -211,6 +211,17 @@ else disable_doc = [] endif +# 'pkgconfig' is the entry in the machine file, if specified +pkg_config = find_program('pkgconfig', required: false) +if pkg_config.found() + extra_env += {'PKG_CONFIG': pkg_config.full_path()} +endif + +pkg_config_path = get_option('pkg_config_path') +if pkg_config_path.length() > 0 + extra_env += {'PKG_CONFIG_PATH': ':'.join(pkg_config_path)} +endif + rs_plugins = custom_target('gst-plugins-rs', build_by_default: true, output: output,