Try without PKG_CONFIG_PATH

Author: cclauss

.github/scripts/ci_build_cairo.py

@@ -162,17 +162,17 @@ def main():
 
             if brew_prefix:
                 # pkg-config files can live in lib/pkgconfig or opt/<pkg>/lib/pkgconfig
-                pkgconfig_paths = [f"{brew_prefix}/lib/pkgconfig", f"{brew_prefix}/opt/lzo/lib/pkgconfig"]
+                # pkgconfig_paths = [f"{brew_prefix}/lib/pkgconfig", f"{brew_prefix}/opt/lzo/lib/pkgconfig"]
                 # merge with any existing PKG_CONFIG_PATH
-                existing_pc = env_vars.get("PKG_CONFIG_PATH", "")
-                merged_pc = ":".join([p for p in pkgconfig_paths if p]) + (f":{existing_pc}" if existing_pc else "")
-                env_vars["PKG_CONFIG_PATH"] = merged_pc
+                # existing_pc = env_vars.get("PKG_CONFIG_PATH", "")
+                # merged_pc = ":".join([p for p in pkgconfig_paths if p]) + (f":{existing_pc}" if existing_pc else "")
+                # env_vars["PKG_CONFIG_PATH"] = merged_pc
 
                 # Ensure compiler & linker flags include brew include/lib
-                # existing_cflags = env_vars.get("CFLAGS", "")
-                # existing_ldflags = env_vars.get("LDFLAGS", "")
-                # env_vars["CFLAGS"] = f"-I{brew_prefix}/include {existing_cflags}".strip()
-                # env_vars["LDFLAGS"] = f"-L{brew_prefix}/lib {existing_ldflags}".strip()
+                existing_cflags = env_vars.get("CFLAGS", "")
+                existing_ldflags = env_vars.get("LDFLAGS", "")
+                env_vars["CFLAGS"] = f"-I{brew_prefix}/include {existing_cflags}".strip()
+                env_vars["LDFLAGS"] = f"-L{brew_prefix}/lib {existing_ldflags}".strip()
 
         # Debugging: log environment keys relevant to detection
         # logger.info(f"env vars for meson: {env_vars}")