Merge pull request #1 from radarhere/homebrew-isolation

Disable platform guessing instead of adding dependencies-prefix

Author: freakboy3742

pyproject.toml

@@ -95,8 +95,8 @@ before-all = ".github/workflows/wheels-dependencies.sh"
 build-verbosity = 1
 
 config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable"
-# Add an explicit dependencies prefix for macOS.
-macos.config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable dependencies-prefix=./build/deps/darwin"
+# Disable platform guessing on macOS
+macos.config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable platform-guessing=disable"
 
 test-command = "cd {project} && .github/workflows/wheels-test.sh"
 test-extras = "tests"

setup.py

@@ -344,11 +344,6 @@ def __iter__(self) -> Iterator[str]:
             for x in ("raqm", "fribidi")
         ]
         + [
-            (
-                "dependencies-prefix",
-                None,
-                "The prefix where build dependencies are located.",
-            ),
             ("disable-platform-guessing", None, "Disable platform guessing on Linux"),
             ("debug", None, "Debug logging"),
         ]
@@ -360,7 +355,6 @@ def check_configuration(option: str, value: str) -> bool | None:
         return True if value in configuration.get(option, []) else None
 
     def initialize_options(self) -> None:
-        self.dependencies_prefix = configuration.get("dependencies-prefix", [])
         self.disable_platform_guessing = self.check_configuration(
             "platform-guessing", "disable"
         )
@@ -570,54 +564,47 @@ def build_extensions(self) -> None:
             )
 
         elif sys.platform == "darwin":
-            if self.dependencies_prefix:
-                # Use the explicitly provided prefixes for dependencies.
-                for prefix in self.dependencies_prefix:
-                    _add_directory(library_dirs, os.path.join(prefix, "lib"))
-                    _add_directory(include_dirs, os.path.join(prefix, "include"))
-            else:
-                # Guess the dependency locations based on homebrew/fink/macports
-                # attempt to make sure we pick freetype2 over other versions
-                _add_directory(include_dirs, "/sw/include/freetype2")
-                _add_directory(include_dirs, "/sw/lib/freetype2/include")
-                # fink installation directories
-                _add_directory(library_dirs, "/sw/lib")
-                _add_directory(include_dirs, "/sw/include")
-                # darwin ports installation directories
-                _add_directory(library_dirs, "/opt/local/lib")
-                _add_directory(include_dirs, "/opt/local/include")
-
-                # if Homebrew is installed, use its lib and include directories
-                try:
-                    prefix = (
-                        subprocess.check_output(["brew", "--prefix"])
-                        .strip()
-                        .decode("latin1")
-                    )
-                except Exception:
-                    # Homebrew not installed
-                    prefix = None
+            # attempt to make sure we pick freetype2 over other versions
+            _add_directory(include_dirs, "/sw/include/freetype2")
+            _add_directory(include_dirs, "/sw/lib/freetype2/include")
+            # fink installation directories
+            _add_directory(library_dirs, "/sw/lib")
+            _add_directory(include_dirs, "/sw/include")
+            # darwin ports installation directories
+            _add_directory(library_dirs, "/opt/local/lib")
+            _add_directory(include_dirs, "/opt/local/include")
 
-                ft_prefix = None
+            # if Homebrew is installed, use its lib and include directories
+            try:
+                prefix = (
+                    subprocess.check_output(["brew", "--prefix"])
+                    .strip()
+                    .decode("latin1")
+                )
+            except Exception:
+                # Homebrew not installed
+                prefix = None
 
-                if prefix:
-                    # add Homebrew's include and lib directories
-                    _add_directory(library_dirs, os.path.join(prefix, "lib"))
-                    _add_directory(include_dirs, os.path.join(prefix, "include"))
-                    _add_directory(
-                        include_dirs, os.path.join(prefix, "opt", "zlib", "include")
-                    )
-                    ft_prefix = os.path.join(prefix, "opt", "freetype")
+            ft_prefix = None
 
-                if ft_prefix and os.path.isdir(ft_prefix):
-                    # freetype might not be linked into Homebrew's prefix
-                    _add_directory(library_dirs, os.path.join(ft_prefix, "lib"))
-                    _add_directory(include_dirs, os.path.join(ft_prefix, "include"))
-                else:
-                    # fall back to freetype from XQuartz if
-                    # Homebrew's freetype is missing
-                    _add_directory(library_dirs, "/usr/X11/lib")
-                    _add_directory(include_dirs, "/usr/X11/include")
+            if prefix:
+                # add Homebrew's include and lib directories
+                _add_directory(library_dirs, os.path.join(prefix, "lib"))
+                _add_directory(include_dirs, os.path.join(prefix, "include"))
+                _add_directory(
+                    include_dirs, os.path.join(prefix, "opt", "zlib", "include")
+                )
+                ft_prefix = os.path.join(prefix, "opt", "freetype")
+
+            if ft_prefix and os.path.isdir(ft_prefix):
+                # freetype might not be linked into Homebrew's prefix
+                _add_directory(library_dirs, os.path.join(ft_prefix, "lib"))
+                _add_directory(include_dirs, os.path.join(ft_prefix, "include"))
+            else:
+                # fall back to freetype from XQuartz if
+                # Homebrew's freetype is missing
+                _add_directory(library_dirs, "/usr/X11/lib")
+                _add_directory(include_dirs, "/usr/X11/include")
 
             # Add the macOS SDK path.
             sdk_path = self.get_macos_sdk_path()