Merge branch 'main' into ext/rdkafka

# Conflicts: # src/globals/test-extensions.php
2026-07-08 01:15:37 +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/env.ini
+++ b/config/env.ini
@@ -0,0 +1,134 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; static-php-cli (spc) env configuration
+;
+; This file is used to set default env vars for static-php-cli build.
+; As dynamic build process, some of these vars can be overwritten by CLI options.
+; And you can also overwrite these vars by setting them in your shell environment.
+;
+; We need to use some pre-defined internal env vars, like `BUILD_ROOT_PATH`, `DOWNLOAD_PATH`, etc.
+; Please note that these vars cannot be defined in this file, they are only be defined before static-php-cli running.
+; Here's a list of these pre-defined internal env vars, these vars are only be defined in the static-php-cli build process if not set in the shell environment:
+;
+;   BUILD_ROOT_PATH:    the root path of the build process. (default: `$(pwd)/buildroot`)
+;   BUILD_INCLUDE_PATH: the path of the include files. (default: `$BUILD_ROOT_PATH/include`)
+;   BUILD_LIB_PATH:     the path of the lib files. (default: `$BUILD_ROOT_PATH/lib`)
+;   BUILD_BIN_PATH:     the path of the bin files. (default: `$BUILD_ROOT_PATH/bin`)
+;   PKG_ROOT_PATH:      the root path of the package files. (default: `$(pwd)/pkgroot`)
+;   SOURCE_PATH:        the path of the source files. (default: `$(pwd)/source`)
+;   DOWNLOAD_PATH:      the path of the download files. (default: `$(pwd)/downloads`)
+;   CPU_COUNT:          the count of the CPU cores. (default: `$(nproc)`)
+;   GNU_ARCH:           the GNU arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`)
+;   MAC_ARCH:           the MAC arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `arm64`)
+;
+; Here's a list of env vars, these value cannot be changed anywhere:
+;
+;   WORKING_DIR:        the working directory of the build process. (default: `$(pwd)`)
+;   ROOT_DIR:           the root directory of static-php-cli. (default: `/path/to/static-php-cli`, when running in phar or micro mode: `phar://path/to/spc.phar`)
+;
+;   * These vars are only be defined in Unix (macOS, Linux, FreeBSD)Builder *
+;   PATH:                               static-php-cli will add `$BUILD_BIN_PATH` to PATH.
+;   PKG_CONFIG:                         static-php-cli will set `$BUILD_BIN_PATH/pkg-config` to PKG_CONFIG.
+;   PKG_CONFIG_PATH:                    static-php-cli will set `$BUILD_LIB_PATH/pkgconfig` to PKG_CONFIG_PATH.
+;   SPC_PHP_DEFAULT_OPTIMIZE_CFLAGS:    the default optimization CFLAGS for compiling php. (if --no-strip option is set: `-g -O0`, else: `-g -Os`)
+;
+;   * These vars are only be defined in LinuxBuilder *
+;   SPC_LINUX_DEFAULT_CC:                   the default compiler for linux. (For alpine linux: `gcc`, default: `$GNU_ARCH-linux-musl-gcc`)
+;   SPC_LINUX_DEFAULT_CXX:                  the default c++ compiler for linux. (For alpine linux: `g++`, default: `$GNU_ARCH-linux-musl-g++`)
+;   SPC_LINUX_DEFAULT_AR:                   the default archiver for linux. (For alpine linux: `ar`, default: `$GNU_ARCH-linux-musl-ar`)
+;   SPC_PHP_DEFAULT_LD_LIBRARY_PATH_CMD:    the default LD_LIBRARY_PATH for php. (linux: `LD_LIBRARY_PATH=/usr/local/musl/$GNU_ARCH-linux-musl/lib`, default: empty)
+
+
+[global]
+; Build concurrency for make -jN, default is CPU_COUNT, this value are used in every libs.
+SPC_CONCURRENCY=${CPU_COUNT}
+; Ignore PHP version check before building some extensions
+SPC_SKIP_PHP_VERSION_CHECK="no"
+; Ignore some check item for bin/spc doctor command, comma separated (e.g. SPC_SKIP_DOCTOR_CHECK_ITEMS="if homebrew has installed")
+SPC_SKIP_DOCTOR_CHECK_ITEMS=""
+
+[windows]
+; php-sdk-binary-tools path
+PHP_SDK_PATH="${WORKING_DIR}\php-sdk-binary-tools"
+; upx executable path
+UPX_EXEC="${PKG_ROOT_PATH}\bin\upx.exe"
+; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
+SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream,cli_static
+
+[linux]
+; include PATH for musl libc.
+SPC_NO_MUSL_PATH=no
+; compiler environments
+CC=${SPC_LINUX_DEFAULT_CC}
+CXX=${SPC_LINUX_DEFAULT_CXX}
+AR=${SPC_LINUX_DEFAULT_AR}
+LD=ld.gold
+; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
+SPC_DEFAULT_C_FLAGS=
+SPC_DEFAULT_CXX_FLAGS=
+; 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=
+; upx executable path
+UPX_EXEC=${PKG_ROOT_PATH}/bin/upx
+; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
+SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream
+
+; *** default build command for building php ***
+; buildconf command
+SPC_CMD_PREFIX_PHP_BUILDCONF="./buildconf --force"
+; configure command
+SPC_CMD_PREFIX_PHP_CONFIGURE="${SPC_PHP_DEFAULT_LD_LIBRARY_PATH_CMD} ./configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-cgi --disable-phpdbg"
+; make command
+SPC_CMD_PREFIX_PHP_MAKE="make -j${CPU_COUNT}"
+
+; *** default build vars for building php ***
+; CFLAGS for configuring php
+SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS}"
+; CPPFLAGS for configuring php
+SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS="-I${BUILD_INCLUDE_PATH}"
+; LDFLAGS for configuring php
+SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
+; LIBS for configuring php
+SPC_CMD_VAR_PHP_CONFIGURE_LIBS="-ldl -lpthread -lm"
+; EXTRA_CFLAGS for `make` php
+SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="${SPC_PHP_DEFAULT_OPTIMIZE_CFLAGS} -fno-ident -fPIE"
+; EXTRA_LIBS for `make` php
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS=""
+; EXTRA_LDFLAGS_PROGRAM for `make` php
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-all-static -Wl,-O1 -pie"
+
+[macos]
+; compiler environments
+CC=clang
+CXX=clang++
+; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
+SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin"
+SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin"
+; 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=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream,macos_iconv
+
+; *** default build command for building php ***
+; buildconf command
+SPC_CMD_PREFIX_PHP_BUILDCONF="./buildconf --force"
+; configure command
+SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-cgi --disable-phpdbg"
+; make command
+SPC_CMD_PREFIX_PHP_MAKE="make -j${CPU_COUNT}"
+
+; *** default build vars for building php ***
+; CFLAGS for configuring php
+SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -Werror=unknown-warning-option"
+; CPPFLAGS for configuring php
+SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS="-I${BUILD_INCLUDE_PATH}"
+; LDFLAGS for configuring php
+SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
+; EXTRA_CFLAGS for `make` php
+SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="${SPC_PHP_DEFAULT_OPTIMIZE_CFLAGS}"
+; EXTRA_LIBS for `make` php
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-lresolv"
+
+[freebsd]
+; compiler environments
+CC=clang
+CXX=clang++
--- a/config/ext.json
+++ b/config/ext.json
@@ -199,6 +199,19 @@
            "gmssl"
        ]
    },
+    "grpc": {
+        "support": {
+            "Windows": "wip",
+            "BSD": "wip"
+        },
+        "type": "external",
+        "source": "grpc",
+        "arg-type-unix": "custom",
+        "cpp-extension": true,
+        "lib-depends": [
+            "grpc"
+        ]
+    },
    "iconv": {
        "support": {
            "BSD": "wip"
@@ -242,7 +255,8 @@
            "BSD": "wip"
        },
        "notes": true,
-        "type": "builtin",
+        "type": "external",
+        "source": "ext-imap",
        "arg-type": "custom",
        "lib-depends": [
            "imap"
@@ -510,7 +524,7 @@
        },
        "notes": true,
        "type": "builtin",
-        "arg-type": "with-prefix",
+        "arg-type": "custom",
        "lib-depends": [
            "postgresql"
        ]
--- 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": [
--- a/config/source.json
+++ b/config/source.json
@@ -36,9 +36,13 @@
        }
    },
    "bzip2": {
-        "type": "filelist",
-        "url": "https://sourceware.org/pub/bzip2/",
-        "regex": "/href=\"(?<file>bzip2-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+        "alt": {
+            "type": "filelist",
+            "url": "https://sourceware.org/pub/bzip2/",
+            "regex": "/href=\"(?<file>bzip2-(?<version>[^\"]+)\\.tar\\.gz)\"/"
+        },
+        "type": "url",
+        "url": "https://dl.static-php.dev/static-php-cli/deps/bzip2/bzip2-1.0.8.tar.gz",
        "provide-pre-built": true,
        "license": {
            "type": "text",
@@ -119,6 +123,18 @@
            "path": "LICENSE"
        }
    },
+    "ext-imap": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/imap",
+        "path": "php-src/ext/imap",
+        "filename": "imap.tgz",
+        "license": {
+            "type": "file",
+            "path": [
+                "LICENSE"
+            ]
+        }
+    },
    "ext-memcache": {
        "type": "url",
        "url": "https://pecl.php.net/get/memcache",
@@ -228,6 +244,16 @@
            "path": "LICENSE"
        }
    },
+    "grpc": {
+        "type": "git",
+        "rev": "v1.68.x",
+        "url": "https://github.com/grpc/grpc.git",
+        "provide-pre-built": true,
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
    "icu": {
        "type": "ghrel",
        "repo": "unicode-org/icu",
@@ -530,7 +556,7 @@
    "micro": {
        "type": "git",
        "path": "php-src/sapi/micro",
-        "rev": "master",
+        "rev": "84beta",
        "url": "https://github.com/static-php/phpmicro",
        "license": {
            "type": "file",
@@ -691,10 +717,10 @@
        }
    },
    "redis": {
-        "type": "git",
+        "type": "url",
+        "url": "https://pecl.php.net/get/redis",
        "path": "php-src/ext/redis",
-        "rev": "release/6.0.2",
-        "url": "https://github.com/phpredis/phpredis",
+        "filename": "redis.tgz",
        "license": {
            "type": "file",
            "path": [
@@ -743,13 +769,18 @@
        }
    },
    "swoole": {
-        "type": "ghtar",
        "path": "php-src/ext/swoole",
-        "repo": "swoole/swoole-src",
-        "prefer-stable": true,
+        "type": "git",
+        "rev": "master",
+        "url": "https://github.com/swoole/swoole-src.git",
        "license": {
            "type": "file",
            "path": "LICENSE"
+        },
+        "alt": {
+            "type": "ghtar",
+            "repo": "swoole/swoole-src",
+            "prefer-stable": true
        }
    },
    "swow": {