gst-uninstalled: Match plugin path when lib64 is libdir

Fixes setting of GST_PLUGIN_PATH on Fedora 64-bit
This commit is contained in:
Nirbheek Chauhan 2017-04-22 17:58:51 +05:30
parent 43c107d4fe
commit 71cf22cc19

View file

@ -45,6 +45,7 @@ def get_subprocess_env(options):
sharedlib_reg = re.compile(r'\.so|\.dylib|\.dll') sharedlib_reg = re.compile(r'\.so|\.dylib|\.dll')
typelib_reg = re.compile(r'.*\.typelib$') typelib_reg = re.compile(r'.*\.typelib$')
pluginpath_reg = re.compile(r'lib\w*' + os.path.normpath('/gstreamer-1.0/'))
if os.name is 'nt': if os.name is 'nt':
lib_path_envvar = 'PATH' lib_path_envvar = 'PATH'
@ -69,8 +70,7 @@ def get_subprocess_env(options):
elif sharedlib_reg.search(filename): elif sharedlib_reg.search(filename):
if target.get('type') != "shared library": if target.get('type') != "shared library":
continue continue
if pluginpath_reg.search(os.path.normpath(target.get('install_filename'))):
if os.path.normpath("lib/gstreamer-1.0") in os.path.normpath(target.get('install_filename')):
prepend_env_var(env, "GST_PLUGIN_PATH", os.path.join(options.builddir, root)) prepend_env_var(env, "GST_PLUGIN_PATH", os.path.join(options.builddir, root))
continue continue