diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2023-08-01 13:11:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-01 11:11:46 +0000 |
| commit | 6f4f237fbd3ce6029b9e9b5be4c268630ab247df (patch) | |
| tree | a413737493f2c4e348f0cd41a1a6ef5ef3bd2c83 /python/servo/build_commands.py | |
| parent | e153bcb40b9b4a63cb8e14de7f2452140cab67b8 (diff) | |
| download | servo-6f4f237fbd3ce6029b9e9b5be4c268630ab247df.tar.gz servo-6f4f237fbd3ce6029b9e9b5be4c268630ab247df.zip | |
Remove lzma path workaround for MacOS (#30053)
Now that the new version of GStreamer fixes this issue, we can remove
the workarounds for this problem as well as all of the homebrew
bootstrapping logic.
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index a8f8c187d90..c518ba76026 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -460,17 +460,6 @@ def copy_dependencies(binary_path, lib_path, gst_root): if is_system_library(f): continue full_path = resolve_rpath(f, gst_root) - # fixme(mukilan): this is a temporary solution to a bug - # in the official gstreamer packages. Few gstreamer dylibs - # like 'libavcodec.59.dylib' have absolute paths to liblzma - # instead of @rpath based to be relocatable. The homebrew - # prefix is configurable in general and is /opt/homebrew - # on Apple Silicon - if full_path == "/usr/local/opt/xz/lib/liblzma.5.dylib" and ( - not path.exists("/usr/local/opt/xz") - and path.exists("/opt/homebrew/")): - full_path = "/opt/homebrew/lib/liblzma.5.dylib" - need_relinked = set(otool(full_path)) new_path = path.join(lib_path, path.basename(full_path)) if not path.exists(new_path): |