From: Guillaume Desmottes Date: Wed, 4 Jan 2017 11:10:56 +0000 (+0100) Subject: gst-uninstalled: set PKG_CONFIG_PATH X-Git-Tag: 1.19.3~481^2~383 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d2f4e136f01c75a440589001ee71085bf4af725;p=platform%2Fupstream%2Fgstreamer.git gst-uninstalled: set PKG_CONFIG_PATH Look for -uninstalled pc files and update PKG_CONFIG_PATH with the directories containing those. This feature is useful for users building the GStreamer stack using meson and having to link it to another project which is still using the autotools. Fix a regression from the old gst-uninstalled tool. https://bugzilla.gnome.org/show_bug.cgi?id=776810 --- diff --git a/gst-uninstalled.py b/gst-uninstalled.py index cd11488..1f5bf83 100755 --- a/gst-uninstalled.py +++ b/gst-uninstalled.py @@ -83,6 +83,7 @@ def get_subprocess_env(options): presets = set() encoding_targets = set() + pkg_dirs = set() if '--installed' in subprocess.check_output([mesonintrospect, '-h']).decode(): installed_s = subprocess.check_output([sys.executable, mesonintrospect, options.builddir, '--installed']) @@ -92,12 +93,21 @@ def get_subprocess_env(options): elif path.endswith('.gep'): encoding_targets.add( os.path.abspath(os.path.join(os.path.dirname(path), '..'))) + elif path.endswith('.pc'): + # Is there a -uninstalled pc file for this file? + uninstalled = "{0}-uninstalled.pc".format(path[:-3]) + if os.path.exists(uninstalled): + pkg_dirs.add(os.path.dirname(path)) + for p in presets: prepend_env_var(env, 'GST_PRESET_PATH', p) for t in encoding_targets: prepend_env_var(env, 'GST_ENCODING_TARGET_PATH', t) + for pkg_dir in pkg_dirs: + prepend_env_var(env, "PKG_CONFIG_PATH", pkg_dir) + return env