Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-03 05:23:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Additional fixes for compiling on trusty

Browse source
This commit is contained in:
Manish Goregaokar 2018-09-03 17:26:04 +05:30
parent 6de148a7e5
commit a2344b326f
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
python/servo/command_base.py
View file

@ -549,10 +549,17 @@ class CommandBase(object):
gstpath = path.join(self.context.topdir, "support", "linux", "gstreamer", "gstreamer") gstpath = path.join(self.context.topdir, "support", "linux", "gstreamer", "gstreamer")
extra_path += [path.join(gstpath, "bin")] extra_path += [path.join(gstpath, "bin")]
libpath = path.join(gstpath, "lib", "x86_64-linux-gnu") libpath = path.join(gstpath, "lib", "x86_64-linux-gnu")
extra_path += [libpath] # we append in the reverse order so that system gstreamer libraries
extra_lib += [libpath] # do not get precedence
extra_path = [libpath] + extra_path
extra_lib = [libpath] + extra_path
append_to_path_env(path.join(libpath, "pkgconfig"), env, "PKG_CONFIG_PATH") append_to_path_env(path.join(libpath, "pkgconfig"), env, "PKG_CONFIG_PATH")
if sys.platform == "linux2":
distro, version, _ = platform.linux_distribution()
if distro == "Ubuntu" and (version == "16.04" or version == "14.04"):
env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true"
if extra_path: if extra_path:
env["PATH"] = "%s%s%s" % (os.pathsep.join(extra_path), os.pathsep, env["PATH"]) env["PATH"] = "%s%s%s" % (os.pathsep.join(extra_path), os.pathsep, env["PATH"])