Merge branch 'main' into ext/rdkafka

# Conflicts: # src/globals/test-extensions.php
2026-07-08 17:35:36 +08:00 · 2024-12-13 15:12:05 +08:00
parent c840165fa8 1bc7bc3421
commit d0fbc5ab2d
110 changed files with 2868 additions and 859 deletions
--- a/config/lib.json
+++ b/config/lib.json
@@ -139,6 +139,20 @@
            "Security"
        ]
    },
+    "grpc": {
+        "source": "grpc",
+        "static-libs-unix": [
+            "libgrpc.a",
+            "libcares.a"
+        ],
+        "lib-depends": [
+            "zlib",
+            "openssl"
+        ],
+        "frameworks": [
+            "CoreFoundation"
+        ]
+    },
    "icu": {
        "source": "icu",
        "cpp-library": true,
@@ -654,7 +668,7 @@
            "liblzma.a"
        ],
        "static-libs-windows": [
-            "liblzma.lib",
+            "lzma.lib",
            "liblzma_a.lib"
        ],
        "headers-unix": [