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-11-22 19:41:00 +00:00
Code Issues Projects Releases Wiki Activity

cargo_wrapper: Fix setting of PKG_CONFIG_PATH and CARGO_TARGET_DIR

Browse source 
Don't need to use an env var for the latter.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1028>
This commit is contained in:
Nirbheek Chauhan 2022-12-28 19:10:22 +05:30 committed by GStreamer Marge Bot
parent 72fa5fa922
commit 851c82df85
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cargo_wrapper.py
View file

@ -72,9 +72,10 @@ if __name__ == "__main__":
cargo_target_dir = opts.build_dir / 'target' cargo_target_dir = opts.build_dir / 'target'
env = os.environ.copy() env = os.environ.copy()
env['CARGO_TARGET_DIR'] = str(cargo_target_dir) if 'PKG_CONFIG_PATH' in env:
pkg_config_path = env['PKG_CONFIG_PATH'].split(os.pathsep)
pkg_config_path = env.get('PKG_CONFIG_PATH', '').split(os.pathsep) else:
pkg_config_path = []
pkg_config_path.append(str(opts.root_dir / 'meson-uninstalled')) pkg_config_path.append(str(opts.root_dir / 'meson-uninstalled'))
env['PKG_CONFIG_PATH'] = os.pathsep.join(pkg_config_path) env['PKG_CONFIG_PATH'] = os.pathsep.join(pkg_config_path)
@ -96,6 +97,7 @@ if __name__ == "__main__":
sys.exit(1) sys.exit(1)
cwd = None cwd = None
cargo_cmd += ['--target-dir', cargo_target_dir]
if not opts.bin: if not opts.bin:
cargo_cmd.extend(['--manifest-path', opts.src_dir / 'Cargo.toml']) cargo_cmd.extend(['--manifest-path', opts.src_dir / 'Cargo.toml'])
cargo_cmd.extend(['--prefix', opts.prefix, '--libdir', cargo_cmd.extend(['--prefix', opts.prefix, '--libdir',