diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2018-09-03 17:26:04 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2018-09-11 19:34:38 +0530 |
| commit | a2344b326f2f98ea89308ee8b601dbb076cf7086 (patch) | |
| tree | 0cc7a075d71e76d310b26f4189a4619062100e4e /python/servo/command_base.py | |
| parent | 6de148a7e5b03436da238ae8c38d67b9b0221821 (diff) | |
| download | servo-a2344b326f2f98ea89308ee8b601dbb076cf7086.tar.gz servo-a2344b326f2f98ea89308ee8b601dbb076cf7086.zip | |
Additional fixes for compiling on trusty
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 952e4d692c4..3e2369010a0 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -549,10 +549,17 @@ class CommandBase(object): gstpath = path.join(self.context.topdir, "support", "linux", "gstreamer", "gstreamer") extra_path += [path.join(gstpath, "bin")] libpath = path.join(gstpath, "lib", "x86_64-linux-gnu") - extra_path += [libpath] - extra_lib += [libpath] + # we append in the reverse order so that system gstreamer libraries + # 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") + 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: env["PATH"] = "%s%s%s" % (os.pathsep.join(extra_path), os.pathsep, env["PATH"]) |