Merge branch 'main' of https://github.com/crazywhalecc/static-php-cli into zig

2026-07-08 09:25:35 +08:00 · 2025-07-24 10:53:49 +07:00
parent 8f8a493b20 f543b55f19
commit 84e470d213
42 changed files with 591 additions and 467 deletions
--- a/config/env.ini
+++ b/config/env.ini
@@ -73,7 +73,7 @@ SPC_EXTRA_LIBS=""
 ; - musl-native: used for alpine linux, can build `musl` and `musl -dynamic` target.
 ; - gnu-native: used for general linux distros, can build gnu target for the installed glibc version only.

-; LEGACY option to specify the target, switch to SPC_TARGET with zig toolchain instead
+; LEGACY option to specify the target
 SPC_LIBC=musl

 ; Recommended: specify your target here. Zig toolchain will be used.
@@ -91,10 +91,8 @@ CXX=${SPC_LINUX_DEFAULT_CXX}
 AR=${SPC_LINUX_DEFAULT_AR}
 LD=${SPC_LINUX_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
-SPC_DEFAULT_C_FLAGS="-fPIC -Os -Wno-error=date-time"
-SPC_DEFAULT_CXX_FLAGS="-fPIC -Os -Wno-error=date-time"
-; extra libs for building php executable, used in `make` command for building php (this value may changed by extension build process, space separated)
-SPC_EXTRA_LIBS=
+SPC_DEFAULT_C_FLAGS="-fPIC -Os"
+SPC_DEFAULT_CXX_FLAGS="-fPIC -Os"
 ; upx executable path
 UPX_EXEC=${PKG_ROOT_PATH}/bin/upx
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
@@ -132,8 +130,6 @@ CXX=clang++
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
 SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
 SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
-; extra libs for building php executable, used in `make` command for building php (this value may changed by extension build process, space separated)
-SPC_EXTRA_LIBS=
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
 SPC_MICRO_PATCHES=cli_checks,macos_iconv

--- a/config/ext.json
+++ b/config/ext.json
@@ -34,7 +34,7 @@
    },
    "bz2": {
        "type": "builtin",
-        "arg-type-unix": "with-prefix",
+        "arg-type-unix": "with-path",
        "arg-type-windows": "with",
        "lib-depends": [
            "bzip2"
@@ -185,7 +185,7 @@
            "BSD": "wip"
        },
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "lib-depends": [
            "gettext"
        ]
@@ -211,7 +211,7 @@
            "BSD": "wip"
        },
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "lib-depends": [
            "gmp"
        ]
@@ -233,7 +233,7 @@
        },
        "type": "external",
        "source": "grpc",
-        "arg-type-unix": "custom",
+        "arg-type-unix": "enable-path",
        "cpp-extension": true,
        "lib-depends": [
            "grpc"
@@ -244,7 +244,7 @@
            "BSD": "wip"
        },
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "arg-type-windows": "with",
        "lib-depends-unix": [
            "libiconv"
@@ -320,7 +320,7 @@
            "BSD": "wip"
        },
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "lib-depends": [
            "ldap"
        ],
@@ -530,7 +530,7 @@
        },
        "notes": true,
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "lib-depends": [
            "libargon2"
        ]
@@ -572,7 +572,7 @@
            "BSD": "wip"
        },
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "arg-type-windows": "custom",
        "ext-depends": [
            "pdo",
@@ -675,7 +675,7 @@
            "BSD": "wip"
        },
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "lib-depends": [
            "readline"
        ],
@@ -786,7 +786,7 @@
            "BSD": "wip"
        },
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "arg-type-windows": "with",
        "lib-depends": [
            "sqlite"
@@ -812,7 +812,7 @@
        },
        "type": "external",
        "source": "ext-ssh2",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "arg-type-windows": "with",
        "lib-depends": [
            "libssh2"
@@ -938,7 +938,7 @@
            "BSD": "wip"
        },
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "lib-depends": [
            "tidy"
        ]
@@ -954,7 +954,7 @@
        },
        "type": "external",
        "source": "ext-uuid",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "lib-depends": [
            "libuuid"
        ]
@@ -966,7 +966,7 @@
        },
        "type": "external",
        "source": "ext-uv",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "lib-depends": [
            "libuv"
        ],
@@ -1068,7 +1068,7 @@
            "BSD": "wip"
        },
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "lib-depends": [
            "libxslt"
        ],
@@ -1105,7 +1105,7 @@
        },
        "type": "external",
        "source": "yaml",
-        "arg-type-unix": "with-prefix",
+        "arg-type-unix": "with-path",
        "arg-type-windows": "with",
        "lib-depends": [
            "libyaml"
@@ -1116,7 +1116,7 @@
            "BSD": "wip"
        },
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "with-path",
        "arg-type-windows": "enable",
        "lib-depends-unix": [
            "libzip"
--- a/config/lib.json
+++ b/config/lib.json
@@ -35,10 +35,10 @@
    },
    "brotli": {
        "source": "brotli",
-        "static-libs-unix": [
-            "libbrotlidec.a",
-            "libbrotlienc.a",
-            "libbrotlicommon.a"
+        "pkg-configs": [
+            "libbrotlicommon",
+            "libbrotlidec",
+            "libbrotlienc"
        ],
        "static-libs-windows": [
            "brotlicommon.lib",
@@ -89,7 +89,8 @@
            "nghttp3",
            "ngtcp2",
            "zstd",
-            "libcares"
+            "libcares",
+            "ldap"
        ],
        "lib-suggests-windows": [
            "brotli",
@@ -185,14 +186,15 @@
    },
    "grpc": {
        "source": "grpc",
-        "static-libs-unix": [
-            "libgrpc.a",
-            "libcares.a"
+        "pkg-configs": [
+            "grpc"
        ],
        "lib-depends": [
            "zlib",
-            "openssl"
+            "openssl",
+            "libcares"
        ],
+        "provide-pre-built": true,
        "frameworks": [
            "CoreFoundation"
        ]
@@ -200,11 +202,10 @@
    "icu": {
        "source": "icu",
        "cpp-library": true,
-        "static-libs-unix": [
-            "libicui18n.a",
-            "libicuio.a",
-            "libicuuc.a",
-            "libicudata.a"
+        "pkg-configs": [
+            "icu-uc",
+            "icu-i18n",
+            "icu-io"
        ]
    },
    "icu-static-win": {
@@ -221,10 +222,10 @@
    },
    "imagemagick": {
        "source": "imagemagick",
-        "static-libs-unix": [
-            "libMagick++-7.Q16HDRI.a",
-            "libMagickWand-7.Q16HDRI.a",
-            "libMagickCore-7.Q16HDRI.a"
+        "pkg-configs": [
+            "Magick++-7.Q16HDRI",
+            "MagickCore-7.Q16HDRI",
+            "MagickWand-7.Q16HDRI"
        ],
        "lib-depends": [
            "zlib",
@@ -267,9 +268,9 @@
    },
    "ldap": {
        "source": "ldap",
-        "static-libs-unix": [
-            "libldap.a",
-            "liblber.a"
+        "pkg-configs": [
+            "ldap",
+            "lber"
        ],
        "lib-depends": [
            "openssl",
@@ -422,11 +423,11 @@
    },
    "libjxl": {
        "source": "libjxl",
-        "static-libs-unix": [
-            "libjxl.a",
-            "libjxl_cms.a",
-            "libjxl_threads.a",
-            "libhwy.a"
+        "pkg-configs": [
+            "libjxl",
+            "libjxl_cms",
+            "libjxl_threads",
+            "libhwy"
        ],
        "lib-depends": [
            "brotli",
@@ -556,12 +557,12 @@
    },
    "libwebp": {
        "source": "libwebp",
-        "static-libs-unix": [
-            "libwebp.a",
-            "libwebpdecoder.a",
-            "libwebpdemux.a",
-            "libwebpmux.a",
-            "libsharpyuv.a"
+        "pkg-configs": [
+            "libwebp",
+            "libwebpdecoder",
+            "libwebpdemux",
+            "libwebpmux",
+            "libsharpyuv"
        ],
        "static-libs-windows": [
            "libwebp.lib",
@@ -737,8 +738,8 @@
    "openssl": {
        "source": "openssl",
        "static-libs-unix": [
-            "libssl.a",
-            "libcrypto.a"
+            "libcrypto.a",
+            "libssl.a"
        ],
        "static-libs-windows": [
            "libssl.lib",
@@ -753,10 +754,8 @@
    },
    "postgresql": {
        "source": "postgresql",
-        "static-libs-unix": [
-            "libpq.a",
-            "libpgport.a",
-            "libpgcommon.a"
+        "pkg-configs": [
+            "libpq"
        ],
        "lib-depends": [
            "libiconv",