Merge pull request #3615 from ninjaguardian/homebrew-anywhere

[Fix] Detect homebrew directory

Author: oddbookworm

buildconfig/config_darwin.py

@@ -2,6 +2,7 @@
 
 import os
 from distutils.sysconfig import get_python_inc
+from subprocess import check_output, CalledProcessError, DEVNULL
 
 
 try:
@@ -136,16 +137,23 @@ def main(auto_config=False):
     ])
 
     print('Hunting dependencies...')
-    incdirs = ['/usr/local/include', '/opt/homebrew/include']
-    incdirs.extend(['/usr/local/include/SDL2', '/opt/homebrew/include/SDL2', '/opt/local/include/SDL2'])
+
+    homebrew_prefix = '/opt/homebrew'
+    try:
+        homebrew_prefix = check_output(['brew', '--prefix'], text=True, stderr=DEVNULL).strip()
+    except (FileNotFoundError, CalledProcessError):
+        pass
+
+    incdirs = ['/usr/local/include', f'{homebrew_prefix}/include']
+    incdirs.extend(['/usr/local/include/SDL2', f'{homebrew_prefix}/include/SDL2', '/opt/local/include/SDL2'])
 
     incdirs.extend([
        #'/usr/X11/include',
        '/opt/local/include',
        '/opt/local/include/freetype2/freetype']
     )
     #libdirs = ['/usr/local/lib', '/usr/X11/lib', '/opt/local/lib']
-    libdirs = ['/usr/local/lib', '/opt/local/lib', '/opt/homebrew/lib']
+    libdirs = ['/usr/local/lib', '/opt/local/lib', f'{homebrew_prefix}/lib']
 
     for d in DEPS:
         if isinstance(d, (list, tuple)):

meson.build

@@ -282,7 +282,21 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
     install_data(dlls, install_dir: pg_dir, install_tag: 'pg-tag')
 
 else
-    bases = ['/usr/local', '/usr', '/opt/homebrew', '/opt/local']
+    homebrew_prefix = '/opt/homebrew'
+
+    brew_cmd = find_program('brew', required: false)
+
+    if brew_cmd.found()
+        result = run_command(brew_cmd, '--prefix', check: false)
+        if result.returncode() == 0
+            detected_prefix = result.stdout().strip()
+            if detected_prefix != '' and fs.is_dir(detected_prefix)
+                homebrew_prefix = detected_prefix
+            endif
+        endif
+    endif
+
+    bases = ['/usr/local', '/usr', homebrew_prefix, '/opt/local']
     foreach inc_dir : bases
         foreach sub_inc : [
             '',