From aadf48bd4d8afa86fa702c8709c9bc3753dd20d8 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Thu, 5 Oct 2023 03:12:29 +0200 Subject: Bootstrap pkg-config and cmake on MacOS (#30497) These need to be installed in order to build so we can install them via Homebrew. Do this by simply restoring the Homebrew bootstrapping logic we had in place previously. Fixes #27171. --- python/servo/platform/macos.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'python/servo/platform/macos.py') diff --git a/python/servo/platform/macos.py b/python/servo/platform/macos.py index 1bcb88cab54..34f936a3f21 100644 --- a/python/servo/platform/macos.py +++ b/python/servo/platform/macos.py @@ -55,7 +55,19 @@ class MacOS(Base): return True def _platform_bootstrap(self, _force: bool) -> bool: - return self._platform_bootstrap_gstreamer(False) + installed_something = False + try: + brewfile = os.path.join(util.SERVO_ROOT, "support", "macos", "Brewfile") + output = subprocess.check_output( + ['brew', 'bundle', 'install', "--file", brewfile] + ).decode("utf-8") + print(output) + installed_something = "Installing" in output + except subprocess.CalledProcessError as e: + print("Could not run homebrew. Is it installed?") + raise e + installed_something |= self._platform_bootstrap_gstreamer(False) + return installed_something def _platform_bootstrap_gstreamer(self, force: bool) -> bool: if not force and self.is_gstreamer_installed(cross_compilation_target=None): -- cgit v1.2.3