mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #28388 - zhengrenzhe:master, r=jdm
support Apple ARM base mac build and run <!-- Please describe your changes on the following line: --> i fixed build errors on apple m1 macbook, build and running both successful, but because of this issue: https://github.com/servo/surfman/issues/226, the surfman version must be updated locally by cargo [patch.crates-io]. so this pr is waiting for surfman release new version, and related dependencies update the surfman version. @jdm --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #___ (GitHub issue number if applicable) <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
commit
50f8e664ef
5 changed files with 29 additions and 23 deletions
5
Cargo.lock
generated
5
Cargo.lock
generated
|
@ -6148,9 +6148,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "surfman"
|
||||
version = "0.4.0"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "84898d7f74abdd4b956334d71d1ddf60e63bff8fd2fa6c91be8653d50d30cbf3"
|
||||
checksum = "bbbf3b7f873f25cb7791b06a00f0626a141c05f1b95e5b34bc498358876e1a58"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg_aliases",
|
||||
|
@ -6169,6 +6169,7 @@ dependencies = [
|
|||
"metal 0.18.0",
|
||||
"objc",
|
||||
"parking_lot 0.10.2",
|
||||
"raw-window-handle",
|
||||
"wayland-sys 0.24.1",
|
||||
"winapi",
|
||||
"winit",
|
||||
|
|
|
@ -54,7 +54,7 @@ Please select your operating system:
|
|||
|
||||
Xcode version 10.2 or above is recommended.
|
||||
|
||||
##### On macOS (Homebrew)
|
||||
##### On macOS(Intel based or ARM based) (Homebrew)
|
||||
|
||||
NOTE: run these steps after you've cloned the project locally.
|
||||
|
||||
|
|
|
@ -45,5 +45,5 @@ webrender_api = { git = "https://github.com/servo/webrender" }
|
|||
webrender_traits = { path = "../webrender_traits" }
|
||||
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
|
||||
|
||||
[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
|
||||
[target.'cfg(any(target_os="macos", all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64"))))'.dependencies]
|
||||
gaol = "0.2.1"
|
||||
|
|
|
@ -4,12 +4,15 @@
|
|||
|
||||
use crate::pipeline::UnprivilegedPipelineContent;
|
||||
use crate::serviceworker::ServiceWorkerUnprivilegedContent;
|
||||
#[cfg(all(
|
||||
not(target_os = "windows"),
|
||||
not(target_os = "ios"),
|
||||
not(target_os = "android"),
|
||||
not(target_arch = "arm"),
|
||||
not(target_arch = "aarch64")
|
||||
#[cfg(any(
|
||||
target_os = "macos",
|
||||
all(
|
||||
not(target_os = "windows"),
|
||||
not(target_os = "ios"),
|
||||
not(target_os = "android"),
|
||||
not(target_arch = "arm"),
|
||||
not(target_arch = "aarch64")
|
||||
)
|
||||
))]
|
||||
use gaol::profile::{Operation, PathPattern, Profile};
|
||||
use ipc_channel::Error;
|
||||
|
@ -120,7 +123,9 @@ pub fn content_process_sandbox_profile() -> Profile {
|
|||
target_os = "ios",
|
||||
target_os = "android",
|
||||
target_arch = "arm",
|
||||
target_arch = "aarch64",
|
||||
|
||||
// exclude apple arm devices
|
||||
all(target_arch = "aarch64", not(target_os = "macos"))
|
||||
))]
|
||||
pub fn content_process_sandbox_profile() {
|
||||
error!("Sandboxed multiprocess is not supported on this platform.");
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
|
||||
import os
|
||||
import sys
|
||||
import platform
|
||||
|
||||
GSTREAMER_DYLIBS = [
|
||||
("gstapp", "gst-plugins-base"),
|
||||
|
@ -117,35 +118,34 @@ def windows_plugins(uwp):
|
|||
return [x + ".dll" for x in dlls]
|
||||
|
||||
|
||||
def macos_libnice():
|
||||
return os.path.join('/', 'usr', 'local', 'opt', 'libnice', 'lib')
|
||||
def macos_lib_dir():
|
||||
# homebrew use /opt/homebrew on macos ARM, use /usr/local on Intel
|
||||
if platform.machine() == 'arm64':
|
||||
return os.path.join('/', 'opt', 'homebrew', 'lib')
|
||||
return os.path.join('/', 'usr', 'local', 'lib')
|
||||
|
||||
|
||||
def macos_dylibs():
|
||||
return [
|
||||
os.path.join(
|
||||
"/usr/local/opt",
|
||||
path,
|
||||
"lib",
|
||||
macos_lib_dir(),
|
||||
"lib" + name + "-1.0.0.dylib"
|
||||
) for name, path in GSTREAMER_DYLIBS
|
||||
] + [
|
||||
os.path.join(macos_libnice(), "libnice.dylib"),
|
||||
os.path.join(macos_libnice(), "libnice.10.dylib"),
|
||||
os.path.join(macos_lib_dir(), "libnice.dylib"),
|
||||
os.path.join(macos_lib_dir(), "libnice.10.dylib"),
|
||||
]
|
||||
|
||||
|
||||
def macos_plugins():
|
||||
return [
|
||||
os.path.join(
|
||||
"/usr/local/opt",
|
||||
path,
|
||||
"lib",
|
||||
"gstreamer-1.0",
|
||||
macos_lib_dir(),
|
||||
'gstreamer-1.0',
|
||||
"lib" + name + ".dylib"
|
||||
) for name, path in GSTREAMER_PLUGINS + MACOS_PLUGINS
|
||||
] + [
|
||||
os.path.join(macos_libnice(), "gstreamer-1.0", "libgstnice.dylib"),
|
||||
os.path.join(macos_lib_dir(), "gstreamer-1.0", "libgstnice.dylib"),
|
||||
]
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue