Update src/SPC/builder/unix/library/postgresql.php

Co-authored-by: Marc <m@pyc.ac>
Remove unnecessary macOS 15 bug CFLAGS from PostgreSQL build configuration
2026-07-03 06:45:39 +08:00 · 2025-10-14 00:08:40 +08:00 · 2025-10-14 00:08:40 +08:00 · 2025-10-14 00:08:40 +08:00 · 2025-10-13 11:28:16 +02:00 · 2025-10-13 11:20:54 +02:00
61 changed files with 1031 additions and 1016 deletions
--- a/.github/workflows/build-unix.yml
+++ b/.github/workflows/build-unix.yml
@@ -136,12 +136,12 @@ jobs:
            macos-x86_64)
              DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download"
              BUILD_CMD="./bin/spc build"
-              RUNS_ON="macos-13"
+              RUNS_ON="macos-15-intel"
              ;;
            macos-aarch64)
              DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download"
              BUILD_CMD="./bin/spc build"
-              RUNS_ON="macos-14"
+              RUNS_ON="macos-15"
              ;;
          esac
          DOWN_CMD="$DOWN_CMD --with-php=${{ inputs.php-version }} --for-extensions=${{ inputs.extensions }} --ignore-cache-sources=php-src"
--- a/.github/workflows/ext-matrix-tests.yml
+++ b/.github/workflows/ext-matrix-tests.yml
@@ -85,9 +85,9 @@ jobs:
          - "8.4"
        operating-system:
          - "ubuntu-latest"
-          #- "macos-13"
+          #- "macos-15-intel"
          #- "debian-arm64-self-hosted"
-          - "macos-14"
+          - "macos-15"

    steps:
      - name: "Checkout"
@@ -99,11 +99,11 @@ jobs:
          OS=""
          if [ "${{ matrix.operating-system }}" = "ubuntu-latest" ]; then
              OS="linux-x86_64"
-          elif [ "${{ matrix.operating-system }}" = "macos-13" ]; then
+          elif [ "${{ matrix.operating-system }}" = "macos-15-intel" ]; then
              OS="macos-x86_64"
          elif [ "${{ matrix.operating-system }}" = "debian-arm64-self-hosted" ]; then
              OS="linux-aarch64"
-          elif [ "${{ matrix.operating-system }}" = "macos-14" ]; then
+          elif [ "${{ matrix.operating-system }}" = "macos-15" ]; then
              OS="macos-aarch64"
          fi
          echo "OS=$OS" >> $GITHUB_ENV
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -27,7 +27,7 @@ jobs:
            os: "ubuntu-latest"
            filename: "spc-linux-x86_64.tar.gz"
          - name: "macos-x86_64"
-            os: "macos-13"
+            os: "macos-15-intel"
            filename: "spc-macos-x86_64.tar.gz"
          - name: "linux-aarch64"
            os: "ubuntu-latest"
@@ -147,11 +147,11 @@ jobs:
          - name: "linux-x86_64"
            os: "ubuntu-latest"
          - name: "macos-x86_64"
-            os: "macos-13"
+            os: "macos-15-intel"
          - name: "linux-aarch64"
            os: "ubuntu-24.04-arm"
          - name: "macos-aarch64"
-            os: "macos-latest"
+            os: "macos-15"
          - name: "windows-x64"
            os: "windows-latest"
    steps:
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ packlib_files.txt
 /bin/*
 !/bin/spc*
 !/bin/setup-runtime*
+!/bin/docker-entrypoint.sh

 # exclude windows build tools
 /php-sdk-binary-tools/
--- a/README-zh.md
+++ b/README-zh.md
@@ -5,309 +5,168 @@
 [![Releases](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/releases)
 [![CI](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/main/LICENSE)
-[![Extensions](https://img.shields.io/badge/Extension%20Counter-75+-yellow.svg?style=flat-square)](https://static-php.dev/zh/guide/extensions.html)

-**static-php-cli**是一个用于静态编译、构建 PHP 解释器的工具，支持众多流行扩展。
-
-目前 static-php-cli 支持 `cli`、`fpm`、`embed`、`micro` 和 `frankenphp` SAPI。
-
-**static-php-cli**也支持将 PHP 代码和 PHP 运行时打包为一个文件并运行。
+**static-php-cli** 是一个用于构建静态、独立 PHP 运行时的强大工具，支持众多流行扩展。

 ## 特性

-static-php-cli（简称 `spc`）有许多特性：
+- :elephant: **支持多 PHP 版本** - 支持 PHP 8.1, 8.2, 8.3, 8.4, 8.5
+- :handbag: **单文件 PHP 可执行文件** - 构建零依赖的独立 PHP
+- :hamburger: **phpmicro 集成** - 构建 **[phpmicro](https://github.com/dixyes/phpmicro)** 自解压可执行文件（将 PHP 二进制文件和源代码合并为一个文件）
+- :pill: **智能环境检查器** - 自动构建环境检查器，具备自动修复功能
+- :zap: **跨平台支持** - 支持 Linux、macOS、FreeBSD 和 Windows
+- :wrench: **可配置补丁** - 可自定义的源代码补丁系统
+- :books: **智能依赖管理** - 自动处理构建依赖
+- 📦 **自包含工具** - 提供使用 [box](https://github.com/box-project/box) 构建的 `spc` 可执行文件
+- :fire: **广泛的扩展支持** - 支持 75+ 流行 [扩展](https://static-php.dev/zh/guide/extensions.html)
+- :floppy_disk: **UPX 压缩** - 减小二进制文件大小 30-50%（仅 Linux/Windows）

- :handbag: 构建独立的单文件 PHP 解释器，无需任何依赖
- :hamburger: 构建 **[phpmicro](https://github.com/dixyes/phpmicro)** 自执行二进制（将 PHP 代码和 PHP 解释器打包为一个文件）
- :pill: 提供一键检查和修复编译环境的 Doctor 模块
- :zap: 支持多个系统：`Linux`、`macOS`、`FreeBSD`、`Windows`
- :wrench: 高度自定义的代码 patch 功能
- :books: 自带编译依赖管理
- 📦 提供由自身编译的独立 `spc` 二进制（使用 spc 和 [box](https://github.com/box-project/box) 构建）
- :fire: 支持大量 [扩展](https://static-php.dev/zh/guide/extensions.html)
- :floppy_disk: 整合 UPX 工具（减小二进制文件体积）
-
-**静态 php-cli:**
+**单文件独立 php-cli：**

 <img width="700" alt="out1" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/01a2e60f-13b0-4242-a645-f7afa4936396">

-**使用 phpmicro 打包 PHP 代码:**
+**使用 phpmicro 将 PHP 代码与 PHP 解释器结合：**

 <img width="700" alt="out2" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/46b7128d-fb72-4169-957e-48564c3ff3e2">

-## 文档
+## 快速开始

-目前 README 编写了基本用法。有关 static-php-cli 所有的功能，请点击这里查看文档：<https://static-php.dev>。
-
-## 直接下载
-
-如果你不想自行编译 PHP，可以从本项目现有的示例 Action 下载 Artifact，也可以从自托管的服务器下载。
-
-| 组合名称                                                                | 组合扩展数                                                                      | 系统          | 备注           |
-|---------------------------------------------------------------------|----------------------------------------------------------------------------|-------------|--------------|
-| [common](https://dl.static-php.dev/static-php-cli/common/)          | [30+](https://dl.static-php.dev/static-php-cli/common/README.txt)          | Linux/macOS | 体积为 7.5MB 左右 |
-| [bulk](https://dl.static-php.dev/static-php-cli/bulk/)              | [50+](https://dl.static-php.dev/static-php-cli/bulk/README.txt)            | Linux/macOS | 体积为 25MB 左右  |
-| [minimal](https://dl.static-php.dev/static-php-cli/minimal/)        | [5](https://dl.static-php.dev/static-php-cli/minimal/README.txt)           | Linux/macOS | 体积为 3MB 左右   |
-| [spc-min](https://dl.static-php.dev/static-php-cli/windows/spc-min) | [5](https://dl.static-php.dev/static-php-cli/windows/spc-min/README.txt)   | Windows     | 体积为 3MB 左右   |
-| [spc-max](https://dl.static-php.dev/static-php-cli/windows/spc-max) | [40+](https://dl.static-php.dev/static-php-cli/windows/spc-max/README.txt) | Windows     | 体积为 8.5MB 左右 |
-
-> Linux 和 Windows 默认启用了 UPX 压缩，可减小 30~50% 的 PHP 二进制体积。
-> macOS 当前不支持 UPX，所以上述预编译的 macOS 版本体积可能较大。
-
-## 使用 static-php-cli 构建 PHP
-
-### 编译环境需求
-
- PHP >= 8.4（这是 spc 自身需要的版本，不是支持的构建版本）
- 扩展：`mbstring,tokenizer,phar`
- 系统安装了 `curl` 和 `git`
-
-是的，本项目采用 PHP 编写，编译前需要一个 PHP 环境，比较滑稽。
-但本项目默认可通过自身构建的 micro 和 static-php 二进制运行，其他只需要包含上面提到的扩展和 PHP 版本大于等于 8.1 即可。
-
-下面是架构支持情况，:octocat: 代表支持 GitHub Action 构建，:computer: 代表支持本地构建，空 代表暂不支持。
-
-|         | x86_64               | aarch64              |
-|---------|----------------------|----------------------|
-| macOS   | :octocat: :computer: | :octocat: :computer: |
-| Linux   | :octocat: :computer: | :octocat: :computer: |
-| Windows | :octocat: :computer: |                      |
-| FreeBSD | :computer:           | :computer:           |
-
-当前支持编译的 PHP 版本：
-
-> :warning: 部分支持，对于新的测试版和旧版本可能存在问题。
-> 
-> :heavy_check_mark: 支持
-> 
-> :x: 不支持
-
-| PHP Version | Status             | Comment                                                 |
-|-------------|--------------------|---------------------------------------------------------|
-| 7.2         | :x:                |                                                         |
-| 7.3         | :x:                | phpmicro 和许多扩展不支持 7.3、7.4 版本                            |
-| 7.4         | :x:                | phpmicro 和许多扩展不支持 7.3、7.4 版本                            |
-| 8.0         | :warning:          | PHP 官方已停止 8.0 的维护，我们不再处理 8.0 相关的 backport 支持            |
-| 8.1         | :heavy_check_mark: | PHP 官方仅对 8.1 提供安全更新，在 8.5 发布后我们不再处理 8.1 相关的 backport 支持 |
-| 8.2         | :heavy_check_mark: |                                                         |
-| 8.3         | :heavy_check_mark: |                                                         |
-| 8.4         | :heavy_check_mark: |                                                         |
-| 8.5 (alpha) | :warning:          | PHP 8.5 目前处于 alpha 阶段                                   |
-
-> 这个表格的支持状态是 static-php-cli 对构建对应版本的支持情况，不是 PHP 官方对该版本的支持情况。
-
-### 支持的扩展
-
-请先根据下方扩展列表选择你要编译的扩展。
-
- [扩展支持列表](https://static-php.dev/zh/guide/extensions.html)
- [编译命令生成器](https://static-php.dev/zh/guide/cli-generator.html)
-
-> 如果这里没有你需要的扩展，可以提交 Issue。
-
-### 在线构建（使用 GitHub Actions）
-
-使用 GitHub Action 可以方便地构建一个静态编译的 PHP，同时可以自行定义要编译的扩展。
-
-1. Fork 本项目。
-2. 进入项目的 Actions，选择 CI。
-3. 选择 `Run workflow`，填入你要编译的 PHP 版本、目标类型、扩展列表。（扩展列表使用英文逗号分割，例如 `bcmath,curl,mbstring`）
-4. 等待大约一段时间后，进入对应的任务中，获取 `Artifacts`。
-
-如果你选择了 `debug`，则会在构建时输出所有日志，包括编译的日志，以供排查错误。
-
-### 本地构建（使用 spc 二进制，推荐）
-
-该项目提供了 static-php-cli 的二进制文件：`spc`。
-您可以使用 `spc` 二进制文件，无需安装任何运行时（用起来就像 golang 程序）。
-目前，`spc` 二进制文件提供的平台有 Linux 和 macOS。
-
-使用以下命令从自托管服务器下载：
+### 1. 下载 spc 二进制文件

 ```bash
-# Download from self-hosted nightly builds (sync with main branch)
-# For Linux x86_64
+# Linux x86_64
 curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
-# For Linux aarch64
+# Linux aarch64
 curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
 # macOS x86_64 (Intel)
 curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
 # macOS aarch64 (Apple)
 curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
-# Windows (x86_64, win10 build 17063 or later)
+# Windows (x86_64, win10 build 17063 或更高版本，请先安装 VS2022)
 curl.exe -fsSL -o spc.exe https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
+```

-# Add execute perm (Linux and macOS only)
+对于 macOS 和 Linux，请先添加执行权限：
+
+```bash
 chmod +x ./spc
-
-# Run (Linux and macOS)
-./spc --version
-# Run (Windows powershell)
-.\spc.exe --version
 ```

-自托管 `spc` 由 GitHub Actions 构建，你也可以从 Actions 直接下载：[此处](https://github.com/crazywhalecc/static-php-cli/actions/workflows/release-build.yml)。
+### 2. 构建静态 PHP

-### 本地构建（使用 git 源码）
+首先，创建一个 `craft.yml` 文件，并从 [扩展列表](https://static-php.dev/zh/guide/extensions.html) 或 [命令生成器](https://static-php.dev/zh/guide/cli-generator.html) 中指定要包含的扩展：

-如果你需要修改 static-php-cli 源码，或者使用 spc 二进制构建有问题，你可以使用 git 源码下载 static-php-cli。
+```yml
+# PHP 版本支持：8.1, 8.2, 8.3, 8.4, 8.5
+php-version: 8.4
+# 在此处放置您的扩展列表
+extensions: "apcu,bcmath,calendar,ctype,curl,dba,dom,exif,fileinfo,filter,gd,iconv,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,readline,redis,session,simplexml,sockets,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib"
+sapi:
+  - cli
+  - micro
+  - fpm
+download-options:
+  prefer-pre-built: true
+```
+
+运行命令：

 ```bash
-# clone 仓库即可
-git clone https://github.com/crazywhalecc/static-php-cli.git
+./spc craft
+
+# 输出完整控制台日志
+./spc craft --debug
 ```

-如果您的系统上尚未安装 php，我们建议你使用内置的 setup-runtime 自动安装 PHP 和 Composer。
+### 3. 静态 PHP 使用

-```bash
-cd static-php-cli
-chmod +x bin/setup-runtime
-# it will download static php (from self-hosted server) and composer (from getcomposer)
-bin/setup-runtime
-# initialize composer deps
-bin/composer install
-# chmod
-chmod +x bin/spc
-bin/spc --version
+现在您可以将 static-php-cli 构建的二进制文件复制到另一台机器上，无需依赖即可运行：
+
+```
+# php-cli
+buildroot/bin/php -v
+
+# phpmicro
+echo '<?php echo "Hello world!\n";' > a.php
+./spc micro:combine a.php -O my-app
+./my-app
+
+# php-fpm
+buildroot/bin/php-fpm -v
 ```

-### 开始构建 PHP
+## 文档

-下面是使用 static-php-cli 的基础用法：
+当前 README 包含基本用法。有关 static-php-cli 的所有功能，
+请访问 <https://static-php.dev>。

-> 如果你使用的是打包好的 `spc` 二进制，你需要将下列命令的 `./bin/spc` 替换为 `./spc`。
+## 直接下载

-```bash
-# 检查环境依赖，并根据尝试自动安装缺失的编译工具
-./bin/spc doctor --auto-fix
+如果您不想构建或想先测试，可以从 [Actions](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-bulk.yml) 下载示例预编译工件，或从自托管服务器下载。

-# 输出目标项目依赖的扩展列表
-./bin/spc dump-extensions /path/to/your/project --format=text
+以下是几个具有不同扩展组合的预编译静态 PHP 二进制文件，
+您可以根据需要直接下载。

-# 拉取所有依赖库
-./bin/spc download --all
-# 只拉取编译指定扩展需要的所有依赖（推荐）
-./bin/spc download --for-extensions="openssl,pcntl,mbstring,pdo_sqlite"
-# 下载依赖时，优先下载有预编译的库（节省编译依赖的时间）
-./bin/spc download --for-extensions="openssl,curl,mbstring,mbregex" --prefer-pre-built
-# 下载编译不同版本的 PHP (--with-php=x.y 或 --with-php=x.y.z，推荐 8.1 ~ 8.3)
-./bin/spc download --for-extensions="openssl,curl,mbstring" --with-php=8.1
+| 组合名称                                                                 | 扩展数量                                                            | 系统           | 备注                 |
+|----------------------------------------------------------------------|----------------------------------------------------------------------------|--------------|--------------------|
+| [common](https://dl.static-php.dev/static-php-cli/common/)           | [30+](https://dl.static-php.dev/static-php-cli/common/README.txt)          | Linux, macOS | 二进制文件大小约为 7.5MB    |
+| [bulk](https://dl.static-php.dev/static-php-cli/bulk/)               | [50+](https://dl.static-php.dev/static-php-cli/bulk/README.txt)            | Linux, macOS | 二进制文件大小约为 25MB     |
+| [gnu-bulk](https://dl.static-php.dev/static-php-cli/gnu-bulk/)       | [50+](https://dl.static-php.dev/static-php-cli/bulk/README.txt)            | Linux, macOS | 使用 glibc 的 bulk 组合 |
+| [minimal](https://dl.static-php.dev/static-php-cli/minimal/)         | [5](https://dl.static-php.dev/static-php-cli/minimal/README.txt)           | Linux, macOS | 二进制文件大小约为 3MB      |
+| [spc-min](https://dl.static-php.dev/static-php-cli/windows/spc-min/) | [5](https://dl.static-php.dev/static-php-cli/windows/spc-min/README.txt)   | Windows      | 二进制文件大小约为 3MB      |
+| [spc-max](https://dl.static-php.dev/static-php-cli/windows/spc-max/) | [40+](https://dl.static-php.dev/static-php-cli/windows/spc-max/README.txt) | Windows      | 二进制文件大小约为 8.5MB    |

-# 构建包含 bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl 扩展的 php-cli 和 micro.sfx
-./bin/spc build "bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl" --build-cli --build-micro
-# 编译线程安全版本 (--enable-zts)
-./bin/spc build "curl,phar" --enable-zts --build-cli
-# 编译后使用 UPX 减小可执行文件体积 (仅 Linux、Windows 可用) (至少压缩至原来的 30~50%)
-./bin/spc build "curl,phar" --enable-zts --build-cli --with-upx-pack
-```
+> Linux 和 Windows 支持对二进制文件进行 UPX 压缩，可以将二进制文件大小减少 30% 到 50%。
+> macOS 不支持 UPX 压缩，因此 mac 的预构建二进制文件大小较大。

-其中，目前支持构建 cli，micro，fpm 和 embed，使用以下参数的一个或多个来指定编译的 SAPI：
+### 在线构建（使用 GitHub Actions）

- `--build-cli`：构建 cli 二进制
- `--build-micro`：构建 phpmicro 自执行二进制
- `--build-fpm`：构建 fpm
- `--build-embed`：构建 embed（libphp）
- `--build-all`：构建所有
+上方直接下载的二进制不能满足需求时，可使用 GitHub Action 可以轻松构建静态编译的 PHP，
+同时自行定义要编译的扩展。

-如果出现了任何错误，可以使用 `--debug` 参数来展示完整的输出日志，以供排查错误：
+1. Fork 本项目。
+2. 进入项目的 Actions 并选择 `CI`。
+3. 选择 `Run workflow`，填入您要编译的 PHP 版本、目标类型和扩展列表。（扩展用逗号分隔，例如 `bcmath,curl,mbstring`）
+4. 等待一段时间后，进入相应的任务并获取 `Artifacts`。

-```bash
-./bin/spc build "openssl,pcntl,mbstring" --debug --build-all
-./bin/spc download --all --debug
-```
-
-## 不同 SAPI 的使用
-
-### 使用 cli
-
-> php-cli 是一个静态的二进制文件，类似 Go、Rust 语言编译后的单个可移植的二进制文件。
-
-采用参数 `--build-cli` 或`--build-all` 参数时，最后编译结果会输出一个 `./php` 的二进制文件，此文件可分发、可直接使用。
-该文件编译后会存放在 `buildroot/bin/` 目录中，名称为 `php`，拷贝出来即可。
-
-```bash
-cd buildroot/bin/
-./php -v                # 检查版本
-./php -m                # 检查编译的扩展
-./php your_code.php     # 运行代码
-./php your_project.phar # 运行打包为 phar 单文件的项目
-```
-
-### 使用 micro
-
-> phpmicro 是一个提供自执行二进制 PHP 的项目，本项目依赖 phpmicro 进行编译自执行二进制。详见 [dixyes/phpmicro](https://github.com/dixyes/phpmicro)。
-
-采用项目参数 `--build-micro` 或 `--build-all` 时，最后编译结果会输出一个 `./micro.sfx` 的文件，此文件需要配合你的 PHP 源码使用。
-该文件编译后会存放在 `buildroot/bin/` 目录中，拷贝出来即可。
-
-使用时应准备好你的项目源码文件，可以是单个 PHP 文件，也可以是 Phar 文件。
-
-```bash
-echo "<?php echo 'Hello world' . PHP_EOL;" > code.php
-cat micro.sfx code.php > single-app && chmod +x single-app
-./single-app
-```
-
-如果打包 PHAR 文件，仅需把 code.php 更换为 phar 文件路径即可。
-你可以使用 [box-project/box](https://github.com/box-project/box) 将你的 CLI 项目打包为 Phar，
-然后将它与 phpmicro 结合，生成独立可执行的二进制文件。
-
-```bash
-# 使用 static-php-cli 生成的 micro.sfx 结合，也可以直接使用 cat 命令结合它们
-bin/spc micro:combine my-app.phar
-cat buildroot/bin/micro.sfx my-app.phar > my-app && chmod +x my-app
-
-# 使用 micro:combine 结合可以将 INI 选项注入到二进制中
-bin/spc micro:combine my-app.phar -I "memory_limit=4G" -I "disable_functions=system" --output my-app-2
-```
-
-> 有些情况下的 phar 文件或 PHP 项目可能无法在 micro 环境下运行。
-
-### 使用 fpm
-
-采用项目参数 `--build-fpm` 或 `--build-all` 时，最后编译结果会输出一个 `./php-fpm` 的文件。
-该文件存放在 `buildroot/bin/` 目录，拷贝出来即可使用。
-
-在正常的 Linux 发行版和 macOS 系统中，安装 php-fpm 后包管理会自动生成默认的 fpm 配置文件。
-因为 php-fpm 必须指定配置文件才可启动，本项目编译的 php-fpm 不会带任何配置文件，所以需自行编写 `php-fpm.conf` 和 `pool.conf` 配置文件。
-
-指定 `php-fpm.conf` 可以使用命令参数 `-y`，例如：`./php-fpm -y php-fpm.conf`。
-
-### 使用 embed
-
-采用项目参数 `--build-embed` 或 `--build-all` 时，最后编译结果会输出一个 `libphp.a`、`php-config` 以及一系列头文件，存放在 `buildroot/`，你可以在你的其他代码中引入它们。
-
-如果你知道 [embed SAPI](https://github.com/php/php-src/tree/master/sapi/embed)，你应该知道如何使用它。对于有可能编译用到引入其他库的问题，你可以使用 `buildroot/bin/php-config` 来获取编译时的配置。
-
-另外，有关如何使用此功能的高级示例，请查看[如何使用它构建 FrankenPHP 的静态版本](https://github.com/php/frankenphp/blob/main/docs/static.md)。
+如果您启用 `debug`，构建时将输出所有日志，包括编译日志，以便故障排除。

 ## 贡献

-如果缺少你需要的扩展，可发起 Issue。如果你对本项目较熟悉，也欢迎为本项目发起 Pull Request。
+如果您需要的扩展缺失，可以创建 issue。
+如果您熟悉本项目，也欢迎发起 pull request。

-另外，添加新扩展的贡献方式，可以参考下方 `进阶`。
+如果您想贡献文档，请直接编辑 `docs/` 目录。

-如果你想贡献文档内容，请直接修改 `docs/` 目录。
+现在有一个 [static-php](https://github.com/static-php) 组织，用于存储与项目相关的仓库。

 ## 赞助本项目

-你可以在 [我的个人赞助页](https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md) 支持我和我的项目。你捐赠的一部分将会被用于维护 **static-php.dev** 服务器。
+您可以从 [GitHub Sponsor](https://github.com/crazywhalecc) 赞助我或我的项目。您捐赠的一部分将用于维护 **static-php.dev** 服务器。

-**特别赞助商**:
+**特别感谢以下赞助商**：

 <a href="https://beyondco.de/"><img src="/docs/public/images/beyondcode-seeklogo.png" width="300" alt="Beyond Code Logo" /></a>

 <a href="https://nativephp.com/"><img src="/docs/public/images/nativephp-logo.svg" width="300" alt="NativePHP Logo" /></a>

-## 开源协议
+## 开源许可证

-本项目采用 MIT License 许可开源，下面是类似的项目：
+本项目本身基于 MIT 许可证，
+一些新添加的扩展和依赖可能来自其他项目，
+这些代码文件的头部也会给出额外的许可证和作者说明。
+
+这些是类似的项目：

 - [dixyes/lwmbs](https://github.com/dixyes/lwmbs)
 - [swoole/swoole-cli](https://github.com/swoole/swoole-cli)

-该项目使用了 [dixyes/lwmbs](https://github.com/dixyes/lwmbs) 中的一些代码，例如 Windows 静态构建目标和 libiconv 库支持。
-lwmbs 使用 [Mulan PSL 2](http://license.coscl.org.cn/MulanPSL2) 许可进行分发。对应文件有关于作者和许可的特殊说明，除此之外，均使用 MIT 授权许可。
+本项目使用了 [dixyes/lwmbs](https://github.com/dixyes/lwmbs) 的一些代码，例如 Windows 静态构建目标和 libiconv 支持。
+lwmbs 基于 [Mulan PSL 2](http://license.coscl.org.cn/MulanPSL2) 许可证。

-因本项目的特殊性，使用项目编译过程中会使用很多其他开源项目，例如 curl、protobuf 等，它们都有各自的开源协议。
-请在编译完成后，使用命令 `bin/spc dump-license` 导出项目使用项目的开源协议，并遵守对应项目的 LICENSE。
+由于本项目的特殊性，
+项目编译过程中会使用许多其他开源项目，如 curl 和 protobuf，
+它们都有自己的开源许可证。
+
+请在编译后使用 `bin/spc dump-license` 命令导出项目中使用的开源许可证，
+并遵守相应项目的 LICENSE。
--- a/README.md
+++ b/README.md
@@ -5,29 +5,22 @@
 [![Releases](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/releases)
 [![CI](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/main/LICENSE)
-[![Extensions](https://img.shields.io/badge/Extension%20Counter-75+-yellow.svg?style=flat-square)](https://static-php.dev/en/guide/extensions.html)

 **static-php-cli** is a powerful tool designed for building static, standalone PHP runtime
 with popular extensions.

-Static PHP built by **static-php-cli** supports `cli`, `fpm`, `embed`, `micro` and `frankenphp` SAPI.
-
-**static-php-cli** also has the ability to package PHP projects
-along with the PHP interpreter into one single executable file.
-
 ## Features

-static-php-cli (you can call it `spc`) has a lot of features:
-
- :handbag: Build single-file php executable, without any dependencies
- :hamburger: Build **[phpmicro](https://github.com/dixyes/phpmicro)** self-extracted executable (glue php binary and php source code into one file)
- :pill: Automatic build environment checker (Doctor module)
+- :elephant: Support multiple PHP versions - PHP 8.1, 8.2, 8.3, 8.4, 8.5
+- :handbag: Build single-file PHP executable with zero dependencies
+- :hamburger:Build **[phpmicro](https://github.com/dixyes/phpmicro)** self-extracting executables (combines PHP binary and source code into one file)
+- :pill: Automatic build environment checker with auto-fix capabilities
 - :zap: `Linux`, `macOS`, `FreeBSD`, `Windows` support
- :wrench: Configurable source code patches
- :books: Build dependency management
- 📦 Provide `spc` own standalone executable (built by spc and [box](https://github.com/box-project/box))
- :fire: Support many popular [extensions](https://static-php.dev/en/guide/extensions.html)
- :floppy_disk: UPX integration (significantly reduces binary size)
+- :wrench: Configurable source code patching
+- :books: Intelligent dependency management
+- 📦 Self-contained `spc` executable (built with [box](https://github.com/box-project/box))
+- :fire: Support 100+ popular [extensions](https://static-php.dev/en/guide/extensions.html)
+- :floppy_disk: UPX compression support (reduces binary size by 30-50%)

 **Single-file standalone php-cli:**

@@ -37,6 +30,72 @@ static-php-cli (you can call it `spc`) has a lot of features:

 <img width="700" alt="out2" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/46b7128d-fb72-4169-957e-48564c3ff3e2">

+## Quickstart
+
+### 1. Download spc binary
+
+```bash
+# For Linux x86_64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
+# For Linux aarch64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
+# macOS x86_64 (Intel)
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
+# macOS aarch64 (Apple)
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
+# Windows (x86_64, win10 build 17063 or later, please install VS2022 first)
+curl.exe -fsSL -o spc.exe https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
+```
+
+For macOS and Linux, add execute permission first:
+
+```bash
+chmod +x ./spc
+```
+
+### 2. Build Static PHP
+
+First, create a `craft.yml` file and specify which extensions you want to include from [extension list](https://static-php.dev/en/guide/extensions.html) or [command generator](https://static-php.dev/en/guide/cli-generator.html):
+
+```yml
+# PHP version support: 8.1, 8.2, 8.3, 8.4, 8.5
+php-version: 8.4
+# Put your extension list here
+extensions: "apcu,bcmath,calendar,ctype,curl,dba,dom,exif,fileinfo,filter,gd,iconv,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,readline,redis,session,simplexml,sockets,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib"
+sapi:
+  - cli
+  - micro
+  - fpm
+download-options:
+  prefer-pre-built: true
+```
+
+Run command:
+
+```bash
+./spc craft
+
+# Output full console log
+./spc craft --debug
+```
+
+### 3. Static PHP usage
+
+Now you can copy binaries built by static-php-cli to another machine and run with no dependencies:
+
+```
+# php-cli
+buildroot/bin/php -v
+
+# phpmicro
+echo '<?php echo "Hello world!\n";' > a.php
+./spc micro:combine a.php -O my-app
+./my-app
+
+# php-fpm
+buildroot/bin/php-fpm -v
+```
+
 ## Documentation

 The current README contains basic usage. For all the features of static-php-cli,
@@ -53,6 +112,7 @@ which can be downloaded directly according to your needs.
 |----------------------------------------------------------------------|----------------------------------------------------------------------------|--------------|--------------------------------|
 | [common](https://dl.static-php.dev/static-php-cli/common/)           | [30+](https://dl.static-php.dev/static-php-cli/common/README.txt)          | Linux, macOS | The binary size is about 7.5MB |
 | [bulk](https://dl.static-php.dev/static-php-cli/bulk/)               | [50+](https://dl.static-php.dev/static-php-cli/bulk/README.txt)            | Linux, macOS | The binary size is about 25MB  |
+| [gnu-bulk](https://dl.static-php.dev/static-php-cli/gnu-bulk/)       | [50+](https://dl.static-php.dev/static-php-cli/bulk/README.txt)            | Linux, macOS | Using shared glibc             |
 | [minimal](https://dl.static-php.dev/static-php-cli/minimal/)         | [5](https://dl.static-php.dev/static-php-cli/minimal/README.txt)           | Linux, macOS | The binary size is about 3MB   |
 | [spc-min](https://dl.static-php.dev/static-php-cli/windows/spc-min/) | [5](https://dl.static-php.dev/static-php-cli/windows/spc-min/README.txt)   | Windows      | The binary size is about 3MB   |
 | [spc-max](https://dl.static-php.dev/static-php-cli/windows/spc-max/) | [40+](https://dl.static-php.dev/static-php-cli/windows/spc-max/README.txt) | Windows      | The binary size is about 8.5MB |
@@ -60,64 +120,10 @@ which can be downloaded directly according to your needs.
 > Linux and Windows supports UPX compression for binaries, which can reduce the size of the binary by 30% to 50%.
 > macOS does not support UPX compression, so the size of the pre-built binaries for mac is larger.

-## Build
-
-### Compilation Requirements
-
-You can say I made a PHP builder written in PHP, pretty funny.
-But static-php-cli runtime only requires an environment above PHP 8.1 and extensions mentioned below.
-
- PHP >= 8.4 (This is the version required by spc itself, not the build version)
- Extension: `mbstring,tokenizer,phar`
- Supported OS with `curl` and `git` installed
-
-Here is the supported OS and arch, where :octocat: represents support for GitHub Action builds,
-:computer: represents support for local manual builds, and blank represents not currently supported.
-
-|         | x86_64               | aarch64              |
-|---------|----------------------|----------------------|
-| macOS   | :octocat: :computer: | :octocat: :computer: |
-| Linux   | :octocat: :computer: | :octocat: :computer: |
-| Windows | :octocat: :computer: |                      |
-| FreeBSD | :computer:           | :computer:           |
-
-Currently supported PHP versions for compilation: 
-
-> :warning: Partial support, there may be issues with newer test versions or older versions.
-> 
-> :heavy_check_mark: supported
-> 
-> :x: not supported
-
-| PHP Version | Status             | Comment                                                                                            |
-|-------------|--------------------|----------------------------------------------------------------------------------------------------|
-| 7.2         | :x:                |                                                                                                    |
-| 7.3         | :x:                | phpmicro and some extensions not supported on 7.x                                                  |
-| 7.4         | :x:                | phpmicro and some extensions not supported on 7.x                                                  |
-| 8.0         | :warning:          | PHP official has stopped maintenance of 8.0, we no longer provide backport support for version 8.0 |
-| 8.1         | :heavy_check_mark: | PHP official has security fixes only, we no longer provide backport support when 8.5 released      |
-| 8.2         | :heavy_check_mark: |                                                                                                    |
-| 8.3         | :heavy_check_mark: |                                                                                                    |
-| 8.4         | :heavy_check_mark: |                                                                                                    |
-| 8.5 (alpha) | :warning:          | PHP 8.5 is in alpha                                                                                |
-
-> This table shows the support status for static-php-cli in building the corresponding version,
-> not the official PHP support status for that version.
-
-### Supported Extensions
-
-Please first select the extension you want to compile based on the extension list below.
-
- [Supported Extension List](https://static-php.dev/en/guide/extensions.html)
- [Command Generator](https://static-php.dev/en/guide/cli-generator.html)
-
-> If an extension you need is missing, you can submit an issue.
-
-Here is the current planned roadmap for extension support: [#152](https://github.com/crazywhalecc/static-php-cli/issues/152) .
-
 ### Build Online (using GitHub Actions)

-Use GitHub Action to easily build a statically compiled PHP,
+When the above direct download binaries cannot meet your needs,
+you can use GitHub Action to easily build a statically compiled PHP,
 and at the same time define the extensions to be compiled by yourself.

 1. Fork me.
@@ -127,184 +133,6 @@ and at the same time define the extensions to be compiled by yourself.

 If you enable `debug`, all logs will be output at build time, including compiled logs, for troubleshooting.

-### Build Locally (using SPC binary, recommended)
-
-This project provides a binary file of static-php-cli: `spc`.
-You can use `spc` binary instead of installing any runtime like golang app.
-Currently, the platforms supported by `spc` binary are Linux and macOS.
-
-Download from self-hosted nightly builds using commands below:
-
-```bash
-# Download from self-hosted nightly builds (sync with main branch)
-# For Linux x86_64
-curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
-# For Linux aarch64
-curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
-# macOS x86_64 (Intel)
-curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
-# macOS aarch64 (Apple)
-curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
-# Windows (x86_64, win10 build 17063 or later)
-curl.exe -fsSL -o spc.exe https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
-
-# Add execute perm (Linux and macOS only)
-chmod +x ./spc
-
-# Run (Linux and macOS)
-./spc --version
-# Run (Windows powershell)
-.\spc.exe --version
-```
-
-Self-hosted `spc` is built by GitHub Actions, you can also download from Actions artifacts [here](https://github.com/crazywhalecc/static-php-cli/actions/workflows/release-build.yml).
-
-### Build Locally (using git source)
-
-If you need to modify the static-php-cli source code, or have problems using the spc binary build, 
-you can download static-php-cli using the git source code.
-
-```bash
-# just clone me!
-git clone https://github.com/crazywhalecc/static-php-cli.git
-```
-
-If you have not installed php on your system, we recommend that you use the built-in setup-runtime to install PHP and Composer automatically.
-
-```bash
-cd static-php-cli
-chmod +x bin/setup-runtime
-# it will download static php (from self-hosted server) and composer (from getcomposer)
-bin/setup-runtime
-# initialize composer deps
-bin/composer install
-# chmod
-chmod +x bin/spc
-bin/spc --version
-```
-
-### Start Building PHP
-
-Basic usage for building php with some extensions:
-
-> If you are using the packaged standalone `spc` binary, you need to replace `bin/spc` with `./spc` or `.\spc.exe` in the following commands.
-
-```bash
-# Check system tool dependencies, auto-fix them if possible
-./bin/spc doctor --auto-fix
-
-# fetch all libraries
-./bin/spc download --all
-# dump a list of extensions required by your project
-./bin/spc dump-extensions /path/to/your/project --format=text
-# only fetch necessary sources by needed extensions (recommended)
-./bin/spc download --for-extensions="openssl,pcntl,mbstring,pdo_sqlite"
-# download pre-built libraries first (save time for compiling dependencies)
-./bin/spc download --for-extensions="openssl,curl,mbstring,mbregex" --prefer-pre-built
-# download different PHP version (--with-php=x.y or --with-php=x.y.z, recommend 8.3 ~ 8.4)
-./bin/spc download --for-extensions="openssl,curl,mbstring" --with-php=8.1
-
-# with bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl extension, build both CLI and phpmicro SAPI
-./bin/spc build "bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl" --build-cli --build-micro
-# build thread-safe (ZTS) version (--enable-zts)
-./bin/spc build "curl,phar" --enable-zts --build-cli
-# build, pack executable with UPX (linux and windows only) (reduce binary size for 30~50%)
-./bin/spc build "curl,phar" --enable-zts --build-cli --with-upx-pack
-```
-
-Now we support `cli`, `micro`, `fpm` and `embed` SAPI. You can use one or more of the following parameters to specify the compiled SAPI:
-
- `--build-cli`: build static cli executable
- `--build-micro`: build static phpmicro self-extracted executable
- `--build-fpm`: build static fpm binary
- `--build-embed`: build embed (libphp)
- `--build-all`: build all
-
-If anything goes wrong, use `--debug` option to display full terminal output:
-
-```bash
-./bin/spc build "openssl,pcntl,mbstring" --debug --build-all
-./bin/spc download --all --debug
-```
-
-## Different SAPI Usage
-
-### Use cli
-
-> php-cli is a single static binary, you can use it like normal php installed on your system.
-
-When using the parameter `--build-cli` or `--build-all`,
-the final compilation result will output a binary file named `./php`,
-which can be distributed and used directly.
-This file will be located in the directory `buildroot/bin/`, copy it out for use.
-
-```bash
-cd buildroot/bin/
-./php -v                # check version
-./php -m                # check extensions
-./php your_code.php     # run your php code
-./php your_project.phar # run your phar (project archive)
-```
-
-### Use micro
-
-> phpmicro is a SelF-extracted eXecutable SAPI module,
-> provided by [phpmicro](https://github.com/dixyes/phpmicro) project.
-> But this project is using a [fork](https://github.com/static-php/phpmicro) of phpmicro, because we need to add some features to it.
-> It can put php runtime and your source code together.
-
-When using the parameter `--build-all` or `--build-micro`,
-the final compilation result will output a file named `./micro.sfx`,
-which needs to be used with your PHP source code like `code.php`.
-This file will be located in the path `buildroot/bin/micro.sfx`, simply copy it out for use.
-
-Prepare your project source code, which can be a single PHP file or a Phar file, for use.
-
-```bash
-echo "<?php echo 'Hello world' . PHP_EOL;" > code.php
-cat micro.sfx code.php > single-app && chmod +x single-app
-./single-app
-```
-
-If you package a PHAR file, just replace `code.php` with the phar file path.
-You can use [box-project/box](https://github.com/box-project/box) to package your CLI project as Phar,
-It is then combined with phpmicro to produce a standalone executable binary.
-
-```bash
-# Use the micro.sfx generated by static-php-cli to combine,
-bin/spc micro:combine my-app.phar
-# or you can directly use the cat command to combine them.
-cat buildroot/bin/micro.sfx my-app.phar > my-app && chmod +x my-app
-
-# Use micro:combine combination to inject INI options into the binary.
-bin/spc micro:combine my-app.phar -I "memory_limit=4G" -I "disable_functions=system" --output my-app-2
-```
-
-> In some cases, PHAR files may not run in a micro environment. Overall, micro is not production ready.
-
-### Use fpm
-
-When using the parameter `--build-all` or `--build-fpm`,
-the final compilation result will output a file named `./php-fpm`,
-This file will be located in the path `buildroot/bin/`, simply copy it out for use.
-
-In common Linux distributions and macOS systems, the package manager will automatically generate a default fpm configuration file after installing php-fpm.
-Because php-fpm must specify a configuration file before running, the php-fpm compiled by this project will not have any configuration files, so you need to write `php-fpm.conf` and `pool.conf` configuration files yourself.
-
-Specifying `php-fpm.conf` can use the command parameter `-y`, for example: `./php-fpm -y php-fpm.conf`.
-
-### Use embed
-
-When using the project parameters `--build-embed` or `--build-all`,
-the final compilation result will output a `libphp.a`, `php-config` and a series of header files,
-stored in `buildroot/`. You can introduce them in your other projects.
-
-If you know [embed SAPI](https://github.com/php/php-src/tree/master/sapi/embed), you should know how to use it.
-You may require the introduction of other libraries during compilation,
-you can use `buildroot/bin/php-config` to obtain the compile-time configuration.
-
-For an advanced example of how to use this feature, take a look at [how to use it to build a static version of FrankenPHP](https://github.com/php/frankenphp/blob/main/docs/static.md).
-
 ## Contribution

 If the extension you need is missing, you can create an issue.
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -e
+TARGET_DIR="/app/pkgroot/$(uname -m)-linux"
+BACKUP_DIR="/app/pkgroot-private"
+# copy private pkgroot to pkgroot if pkgroot is empty
+if [ ! -d "$TARGET_DIR" ] || [ -z "$(ls -A "$TARGET_DIR")" ]; then
+    echo "* Copying private pkgroot to pkgroot ..."
+    rm -rf "$TARGET_DIR"
+    cp -r "$BACKUP_DIR" "$TARGET_DIR"
+fi
+exec "$@"
--- a/bin/setup-runtime
+++ b/bin/setup-runtime
@@ -25,7 +25,7 @@ __DIR__=$(cd "$(dirname "$0")" && pwd)
 __PROJECT__=$(cd "${__DIR__}"/../ && pwd)

 # set download dir
-__PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
+__PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/bulk/php-8.4.12-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
 __COMPOSER_URL__="https://getcomposer.org/download/latest-stable/composer.phar"

 # use china mirror
@@ -45,7 +45,7 @@ done

 case "$mirror" in
 china)
-  __PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
+  __PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/bulk/php-8.4.12-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
  __COMPOSER_URL__="https://mirrors.tencent.com/composer/composer.phar"
  ;;

--- a/bin/spc-alpine-docker
+++ b/bin/spc-alpine-docker
@@ -3,7 +3,7 @@
 set -e

 # This file is using docker to run commands
-SPC_DOCKER_VERSION=v5
+SPC_DOCKER_VERSION=v6

 # Detect docker can run
 if ! which docker >/dev/null; then
@@ -122,6 +122,14 @@ ADD ./src /app/src
 COPY ./composer.* /app/
 ADD ./bin /app/bin
 RUN composer install --no-dev
+ADD ./config /app/config
+RUN bin/spc doctor --auto-fix
+RUN bin/spc install-pkg upx
+
+RUN mv /app/pkgroot/\$(uname -m)-linux /app/pkgroot-private
+ADD bin/docker-entrypoint.sh /bin/docker-entrypoint.sh
+RUN chmod +x /bin/docker-entrypoint.sh
+ENTRYPOINT ["/bin/docker-entrypoint.sh"]
 EOF
 fi

--- a/bin/spc-gnu-docker
+++ b/bin/spc-gnu-docker
@@ -3,7 +3,7 @@
 set -e

 # This file is using docker to run commands
-SPC_DOCKER_VERSION=v5
+SPC_DOCKER_VERSION=v6

 # Detect docker can run
 if ! which docker >/dev/null; then
@@ -113,6 +113,7 @@ ENV PATH="/app/bin:/cmake/bin:/opt/rh/devtoolset-10/root/usr/bin:\$PATH"

 ADD ./config /app/config
 RUN CC=gcc bin/spc doctor --auto-fix --debug
+RUN bin/spc install-pkg upx
 RUN if [ -f /app/buildroot/bin/re2c ]; then \
        cp /app/buildroot/bin/re2c /usr/local/bin/re2c ;\
    fi
@@ -132,6 +133,11 @@ RUN curl -o automake.tgz -fsSL https://ftp.gnu.org/gnu/automake/automake-1.17.ta
    make && \
    make install && \
    ln -sf /usr/local/bin/automake /usr/bin/automake
+
+RUN mv /app/pkgroot/\$(uname -m)-linux /app/pkgroot-private
+ADD bin/docker-entrypoint.sh /bin/docker-entrypoint.sh
+RUN chmod +x /bin/docker-entrypoint.sh
+ENTRYPOINT ["/bin/docker-entrypoint.sh"]
 EOF
 fi

--- a/composer.lock
+++ b/composer.lock
--- a/config/env.ini
+++ b/config/env.ini
@@ -34,6 +34,7 @@
 ;   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_EXTRA_PHP_VARS:                     the extra vars for building php, used in `configure` and `make` command.

 [global]
 ; Build concurrency for make -jN, default is CPU_COUNT, this value are used in every libs.
@@ -103,7 +104,7 @@ SPC_MICRO_PATCHES=cli_checks,disable_huge_page
 ; buildconf command
 SPC_CMD_PREFIX_PHP_BUILDCONF="./buildconf --force"
 ; configure command
-SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --disable-shared --enable-static --disable-all --disable-cgi --disable-phpdbg --with-pic"
+SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --disable-shared --enable-static --disable-all --disable-phpdbg --with-pic"
 ; make command
 SPC_CMD_PREFIX_PHP_MAKE="make -j${SPC_CONCURRENCY}"

@@ -137,7 +138,7 @@ SPC_MICRO_PATCHES=cli_checks,macos_iconv
 ; 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"
+SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-phpdbg"
 ; make command
 SPC_CMD_PREFIX_PHP_MAKE="make -j${SPC_CONCURRENCY}"

--- a/config/ext.json
+++ b/config/ext.json
@@ -414,9 +414,17 @@
            "libmemcached",
            "fastlz"
        ],
+        "lib-suggests": [
+            "zstd"
+        ],
        "ext-depends": [
            "session",
            "zlib"
+        ],
+        "ext-suggests": [
+            "igbinary",
+            "msgpack",
+            "session"
        ]
    },
    "mongodb": {
@@ -751,11 +759,9 @@
        },
        "type": "builtin",
        "arg-type": "custom",
-        "lib-depends": [
-            "libxml2"
-        ],
-        "ext-depends-windows": [
-            "xml"
+        "ext-depends": [
+            "libxml",
+            "session"
        ]
    },
    "sockets": {
@@ -1146,8 +1152,9 @@
        "support": {
            "BSD": "wip"
        },
-        "type": "builtin",
-        "arg-type": "with-path",
+        "type": "external",
+        "source": "ext-zip",
+        "arg-type": "custom",
        "arg-type-windows": "enable",
        "lib-depends-unix": [
            "libzip"
--- a/config/lib.json
+++ b/config/lib.json
@@ -9,12 +9,17 @@
            "lib-base",
            "micro"
        ],
+        "lib-depends-macos": [
+            "lib-base",
+            "micro",
+            "libxml2"
+        ],
        "lib-suggests-linux": [
            "libacl",
            "brotli",
            "watcher"
        ],
-        "lib-suggests-unix": [
+        "lib-suggests-macos": [
            "brotli",
            "watcher"
        ]
@@ -197,6 +202,7 @@
            "openssl",
            "libcares"
        ],
+        "cpp-library": true,
        "provide-pre-built": true,
        "frameworks": [
            "CoreFoundation"
@@ -225,6 +231,7 @@
    },
    "imagemagick": {
        "source": "imagemagick",
+        "cpp-library": true,
        "pkg-configs": [
            "Magick++-7.Q16HDRI",
            "MagickCore-7.Q16HDRI",
@@ -447,6 +454,7 @@
    },
    "libmemcached": {
        "source": "libmemcached",
+        "cpp-library": true,
        "static-libs-unix": [
            "libmemcached.a",
            "libmemcachedprotocol.a",
@@ -591,7 +599,6 @@
        ],
        "lib-suggests-unix": [
            "xz",
-            "icu",
            "zlib"
        ],
        "lib-depends-windows": [
@@ -817,6 +824,7 @@
    },
    "snappy": {
        "source": "snappy",
+        "cpp-library": true,
        "static-libs-unix": [
            "libsnappy.a"
        ],
@@ -862,6 +870,7 @@
    },
    "watcher": {
        "source": "watcher",
+        "cpp-library": true,
        "static-libs-unix": [
            "libwatcher-c.a"
        ],
--- a/config/source.json
+++ b/config/source.json
@@ -263,6 +263,15 @@
            "path": "LICENSE"
        }
    },
+    "ext-zip": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/zip",
+        "filename": "ext-zip.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
    "ext-zstd": {
        "type": "git",
        "path": "php-src/ext/zstd",
@@ -324,7 +333,7 @@
    },
    "grpc": {
        "type": "git",
-        "rev": "v1.68.x",
+        "rev": "v1.75.x",
        "url": "https://github.com/grpc/grpc.git",
        "provide-pre-built": true,
        "license": {
@@ -880,7 +889,7 @@
    "postgresql": {
        "type": "ghtagtar",
        "repo": "postgres/postgres",
-        "match": "REL_16_\\d+",
+        "match": "REL_18_\\d+",
        "license": {
            "type": "file",
            "path": "COPYRIGHT"
--- a/docs/.vitepress/components/CliGenerator.vue
+++ b/docs/.vitepress/components/CliGenerator.vue
@@ -379,6 +379,11 @@ const craftCommandString = computed(() => {
    str += 'debug: true\n';
  }

+  if (preBuilt.value) {
+    str += 'download-options:\n';
+    str += '  prefer-pre-built: true\n';
+  }
+
  str += '{{position_hold}}';

  if (enableUPX.value) {
@@ -387,9 +392,6 @@ const craftCommandString = computed(() => {
  if (zts.value) {
    str += '  enable-zts: true\n';
  }
-  if (preBuilt.value) {
-    str += '  prefer-pre-built: true\n';
-  }

  if (!str.endsWith('{{position_hold}}')) {
    str = str.replace('{{position_hold}}', 'build-options:\n');
--- a/docs/en/guide/index.md
+++ b/docs/en/guide/index.md
@@ -21,19 +21,30 @@ The following is the architecture support situation, where :gear: represents sup
 | Windows | :gear: :computer: |                   |
 | FreeBSD | :computer:        | :computer:        |

-Among them, Linux is currently only tested on Ubuntu, Debian, and Alpine distributions, 
-and other distributions have not been tested, which cannot guarantee successful compilation.
-For untested distributions, local compilation can be done using methods such as Docker to avoid environmental issues.
+Current supported PHP versions for compilation:

-There are two architectures for macOS: `x86_64` and `Arm`, but binaries compiled on one architecture cannot be directly used on the other architecture.
-Rosetta 2 cannot guarantee that programs compiled with `Arm` architecture can fully run on `x86_64` environment.
+> :warning: Partial support, there may be issues with new beta versions and old versions.
+>
+> :heavy_check_mark: Supported
+>
+> :x: Not supported

-Windows currently only supports the x86_64 architecture, and does not support 32-bit x86 or arm64 architecture.
+| PHP Version | Status             | Comment                                                                                                                 |
+|-------------|--------------------|-------------------------------------------------------------------------------------------------------------------------|
+| 7.2         | :x:                |                                                                                                                         |
+| 7.3         | :x:                | phpmicro and many extensions do not support 7.3, 7.4 versions                                                           |
+| 7.4         | :x:                | phpmicro and many extensions do not support 7.3, 7.4 versions                                                           |
+| 8.0         | :warning:          | PHP official has stopped maintaining 8.0, we no longer handle 8.0 related backport support                              |
+| 8.1         | :warning:          | PHP official only provides security updates for 8.1, we no longer handle 8.1 related backport support after 8.5 release |
+| 8.2         | :heavy_check_mark: |                                                                                                                         |
+| 8.3         | :heavy_check_mark: |                                                                                                                         |
+| 8.4         | :heavy_check_mark: |                                                                                                                         |
+| 8.5 (beta)  | :warning:          | PHP 8.5 is currently in beta stage                                                                                      |

-## Supported PHP Version
+> This table shows the support status of static-php-cli for building corresponding versions, not the PHP official support status for that version.

-Currently, static php cli supports PHP versions 8.1 to 8.5, and theoretically supports PHP 8.0 and earlier versions. 
-Simply select the earlier version when downloading.
-However, due to some extensions and special components that have stopped supporting earlier versions of PHP, 
-static-php-cli will not explicitly support earlier versions.
+## PHP Support Versions
+
+Currently, static-php-cli supports PHP versions 8.2 ~ 8.5, and theoretically supports PHP 8.1 and earlier versions, just select the earlier version when downloading.
+However, due to some extensions and special components that have stopped supporting earlier versions of PHP, static-php-cli will not explicitly support earlier versions.
 We recommend that you compile the latest PHP version possible for a better experience.
--- a/docs/en/guide/manual-build.md
+++ b/docs/en/guide/manual-build.md
@@ -289,6 +289,7 @@ You need to specify a compilation target, choose from the following parameters:

 - `--build-cli`: Build a cli sapi (command line interface, which can execute PHP code on the command line)
 - `--build-fpm`: Build a fpm sapi (php-fpm, used in conjunction with other traditional fpm architecture software such as nginx)
+- `--build-cgi`: Build a cgi sapi (cgi, rarely used)
 - `--build-micro`: Build a micro sapi (used to build a standalone executable binary containing PHP code)
 - `--build-embed`: Build an embed sapi (used to embed into other C language programs)
 - `--build-frankenphp`: Build a [FrankenPHP](https://github.com/php/frankenphp) executable
--- a/docs/zh/guide/index.md
+++ b/docs/zh/guide/index.md
@@ -19,16 +19,30 @@ static-php-cli 是一个用于构建静态编译的 PHP 二进制的工具，目
 | Windows | :gear: :computer: |                   |
 | FreeBSD | :computer:        | :computer:        |

-其中，Linux 目前仅在 Ubuntu、Debian、Alpine 发行版测试通过，其他发行版未进行测试，不能保证编译成功。
-对于未经过测试的发行版，可以使用 Docker 等方式本地编译，避免环境导致的问题。
+当前支持编译的 PHP 版本：

-macOS 下支持 x86_64 和 Arm 两种架构，但在其中一个架构上编译的二进制无法直接在另一个架构上使用。
-Rosetta 2 不能保证 Arm 架构编译的程序可以完全运行在 x86_64 环境下。
+> :warning: 部分支持，对于新的测试版和旧版本可能存在问题。
+>
+> :heavy_check_mark: 支持
+>
+> :x: 不支持

-Windows 目前只支持 x86_64 架构，不支持 32 位 x86、不支持 arm64 架构。
+| PHP Version | Status             | Comment                                                 |
+|-------------|--------------------|---------------------------------------------------------|
+| 7.2         | :x:                |                                                         |
+| 7.3         | :x:                | phpmicro 和许多扩展不支持 7.3、7.4 版本                            |
+| 7.4         | :x:                | phpmicro 和许多扩展不支持 7.3、7.4 版本                            |
+| 8.0         | :warning:          | PHP 官方已停止 8.0 的维护，我们不再处理 8.0 相关的 backport 支持            |
+| 8.1         | :warning:          | PHP 官方仅对 8.1 提供安全更新，在 8.5 发布后我们不再处理 8.1 相关的 backport 支持 |
+| 8.2         | :heavy_check_mark: |                                                         |
+| 8.3         | :heavy_check_mark: |                                                         |
+| 8.4         | :heavy_check_mark: |                                                         |
+| 8.5 (beta)  | :warning:          | PHP 8.5 目前处于 beta 阶段                                    |
+
+> 这个表格的支持状态是 static-php-cli 对构建对应版本的支持情况，不是 PHP 官方对该版本的支持情况。

 ## PHP 支持版本

-目前，static-php-cli 对 PHP 8.1 ~ 8.5 版本是支持的，对于 PHP 8.0 及更早版本理论上支持，只需下载时选择早期版本即可。
+目前，static-php-cli 对 PHP 8.2 ~ 8.5 版本是支持的，对于 PHP 8.1 及更早版本理论上支持，只需下载时选择早期版本即可。
 但由于部分扩展和特殊组件已对早期版本的 PHP 停止了支持，所以 static-php-cli 不会明确支持早期版本。
 我们推荐你编译尽可能新的 PHP 版本，以获得更好的体验。
--- a/docs/zh/guide/manual-build.md
+++ b/docs/zh/guide/manual-build.md
@@ -249,6 +249,7 @@ bin/spc doctor --auto-fix

 - `--build-cli`: 构建一个 cli sapi（命令行界面，可在命令行执行 PHP 代码）
 - `--build-fpm`: 构建一个 fpm sapi（php-fpm，用于和其他传统的 fpm 架构的软件如 nginx 配合使用）
+- `--build-cgi`: 构建一个 cgi sapi（cgi，可用于传统的 cgi 架构的软件如 apache 配合使用）
 - `--build-micro`: 构建一个 micro sapi（用于构建一个包含 PHP 代码的独立可执行二进制）
 - `--build-embed`: 构建一个 embed sapi（用于嵌入到其他 C 语言程序中）
 - `--build-frankenphp`: 构建一个 [frankenphp](https://github.com/php/frankenphp) 二进制
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -9,6 +9,7 @@ parameters:
    - '#Attribute class JetBrains\\PhpStorm\\ArrayShape does not exist#'
    - '#Function Swoole\\Coroutine\\run not found.#'
    - '#Static call to instance method ZM\\Logger\\ConsoleColor#'
+    - '#Constant GNU_ARCH not found#'
  dynamicConstantNames:
    - PHP_OS_FAMILY
  excludePaths:
--- a/src/SPC/ConsoleApplication.php
+++ b/src/SPC/ConsoleApplication.php
@@ -34,7 +34,7 @@ use Symfony\Component\Console\Application;
 */
 final class ConsoleApplication extends Application
 {
-    public const string VERSION = '2.7.2';
+    public const string VERSION = '2.7.5';

    public function __construct()
    {
--- a/src/SPC/builder/BuilderBase.php
+++ b/src/SPC/builder/BuilderBase.php
@@ -10,6 +10,7 @@ use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
 use SPC\store\LockFile;
+use SPC\store\pkg\GoXcaddy;
 use SPC\store\SourceManager;
 use SPC\store\SourcePatcher;
 use SPC\util\AttributeMapper;
@@ -127,27 +128,6 @@ abstract class BuilderBase
        return array_filter($this->exts, fn ($ext) => $ext->isBuildStatic());
    }

-    /**
-     * Check if there is a cpp extensions or libraries.
-     */
-    public function hasCpp(): bool
-    {
-        // judge cpp-extension
-        $exts = array_keys($this->getExts(false));
-        foreach ($exts as $ext) {
-            if (Config::getExt($ext, 'cpp-extension', false) === true) {
-                return true;
-            }
-        }
-        $libs = array_keys($this->getLibs());
-        foreach ($libs as $lib) {
-            if (Config::getLib($lib, 'cpp-library', false) === true) {
-                return true;
-            }
-        }
-        return false;
-    }
-
    /**
     * Set libs only mode.
     *
@@ -392,6 +372,9 @@ abstract class BuilderBase
        if (($type & BUILD_TARGET_FRANKENPHP) === BUILD_TARGET_FRANKENPHP) {
            $ls[] = 'frankenphp';
        }
+        if (($type & BUILD_TARGET_CGI) === BUILD_TARGET_CGI) {
+            $ls[] = 'cgi';
+        }
        return implode(', ', $ls);
    }

@@ -504,8 +487,7 @@ abstract class BuilderBase
                throw new WrongUsageException('FrankenPHP SAPI is only available on Linux and macOS!');
            }
            // frankenphp needs package go-xcaddy installed
-            $pkg_dir = PKG_ROOT_PATH . '/go-xcaddy-' . arch2gnu(php_uname('m')) . '-' . osfamily2shortname();
-            if (!file_exists("{$pkg_dir}/bin/go") || !file_exists("{$pkg_dir}/bin/xcaddy")) {
+            if (!GoXcaddy::isInstalled()) {
                global $argv;
                throw new WrongUsageException("FrankenPHP SAPI requires the go-xcaddy package, please install it first: {$argv[0]} install-pkg go-xcaddy");
            }
--- a/src/SPC/builder/Extension.php
+++ b/src/SPC/builder/Extension.php
@@ -10,8 +10,6 @@ use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
-use SPC\toolchain\ToolchainManager;
-use SPC\toolchain\ZigToolchain;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;

@@ -223,12 +221,24 @@ class Extension
    public function patchBeforeSharedMake(): bool
    {
        $config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs()));
-        [$staticLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
-        FileSystem::replaceFileRegex(
-            $this->source_dir . '/Makefile',
-            '/^(.*_SHARED_LIBADD\s*=.*)$/m',
-            '$1 ' . trim($staticLibs)
-        );
+        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
+        $lstdcpp = str_contains($sharedLibs, '-l:libstdc++.a') ? '-l:libstdc++.a' : null;
+        $lstdcpp ??= str_contains($sharedLibs, '-lstdc++') ? '-lstdc++' : '';
+
+        $makefileContent = file_get_contents($this->source_dir . '/Makefile');
+        if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
+            $prefix = $matches[1];
+            $currentLibs = trim($matches[2]);
+            $newLibs = trim("{$currentLibs} {$staticLibs} {$lstdcpp}");
+            $deduplicatedLibs = deduplicate_flags($newLibs);
+
+            FileSystem::replaceFileRegex(
+                $this->source_dir . '/Makefile',
+                '/^(.*_SHARED_LIBADD\s*=.*)$/m',
+                $prefix . $deduplicatedLibs
+            );
+        }
+
        if ($objs = getenv('SPC_EXTRA_RUNTIME_OBJECTS')) {
            FileSystem::replaceFileRegex(
                $this->source_dir . '/Makefile',
@@ -402,26 +412,7 @@ class Extension
     */
    public function buildUnixShared(): void
    {
-        $config = (new SPCConfigUtil($this->builder))->config(
-            [$this->getName()],
-            array_map(fn ($l) => $l->getName(), $this->getLibraryDependencies(recursive: true)),
-            $this->builder->getOption('with-suggested-exts'),
-            $this->builder->getOption('with-suggested-libs'),
-        );
-        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
-        $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
-        $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
-        $env = [
-            'CFLAGS' => $config['cflags'],
-            'CXXFLAGS' => $config['cflags'],
-            'LDFLAGS' => $config['ldflags'],
-            'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
-            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
-        ];
-        if (ToolchainManager::getToolchainClass() === ZigToolchain::class && SPCTarget::getTargetOS() === 'Linux') {
-            $env['SPC_COMPILER_EXTRA'] = '-lstdc++';
-        }
-
+        $env = $this->getSharedExtensionEnv();
        if ($this->patchBeforeSharedPhpize()) {
            logger()->info("Extension [{$this->getName()}] patched before shared phpize");
        }
@@ -436,13 +427,15 @@ class Extension
            logger()->info("Extension [{$this->getName()}] patched before shared configure");
        }

+        $phpvars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
+
        shell()->cd($this->source_dir)
            ->setEnv($env)
            ->appendEnv($this->getExtraEnv())
            ->exec(
                './configure ' . $this->getUnixConfigureArg(true) .
                ' --with-php-config=' . BUILD_BIN_PATH . '/php-config ' .
-                '--enable-shared --disable-static'
+                "--enable-shared --disable-static {$phpvars}"
            );

        if ($this->patchBeforeSharedMake()) {
@@ -493,6 +486,30 @@ class Extension
        return $this->build_static;
    }

+    /**
+     * Returns the environment variables a shared extension needs to be built.
+     * CFLAGS, CXXFLAGS, LDFLAGS and so on.
+     */
+    protected function getSharedExtensionEnv(): array
+    {
+        $config = (new SPCConfigUtil($this->builder))->config(
+            [$this->getName()],
+            array_map(fn ($l) => $l->getName(), $this->getLibraryDependencies(recursive: true)),
+            $this->builder->getOption('with-suggested-exts'),
+            $this->builder->getOption('with-suggested-libs'),
+        );
+        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
+        $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
+        $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
+        return [
+            'CFLAGS' => $config['cflags'],
+            'CXXFLAGS' => $config['cflags'],
+            'LDFLAGS' => $config['ldflags'],
+            'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
+            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
+        ];
+    }
+
    protected function addLibraryDependency(string $name, bool $optional = false): void
    {
        $depLib = $this->builder->getLib($name);
@@ -565,12 +582,12 @@ class Extension
            $added = 0;
            foreach ($ret as $depName => $dep) {
                foreach ($dep->getDependencies(true) as $depdepName => $depdep) {
-                    if (!in_array($depdepName, array_keys($deps), true)) {
+                    if (!array_key_exists($depdepName, $deps)) {
                        $deps[$depdepName] = $depdep;
                        ++$added;
                    }
                }
-                if (!in_array($depName, array_keys($deps), true)) {
+                if (!array_key_exists($depName, $deps)) {
                    $deps[$depName] = $dep;
                }
            }
--- a/src/SPC/builder/extension/dba.php
+++ b/src/SPC/builder/extension/dba.php
@@ -12,7 +12,7 @@ class dba extends Extension
 {
    public function getUnixConfigureArg(bool $shared = false): string
    {
-        $qdbm = $this->builder->getLib('qdbm') ? (' --with-qdbm=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH) : '';
+        $qdbm = $this->builder->getLib('qdbm') ? (' --with-qdbm=' . BUILD_ROOT_PATH) : '';
        return '--enable-dba' . ($shared ? '=shared' : '') . $qdbm;
    }

--- a/src/SPC/builder/extension/grpc.php
+++ b/src/SPC/builder/extension/grpc.php
@@ -56,4 +56,11 @@ class grpc extends Extension
        GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -Wno-strict-prototypes');
        return true;
    }
+
+    protected function getSharedExtensionEnv(): array
+    {
+        $env = parent::getSharedExtensionEnv();
+        $env['CPPFLAGS'] = $env['CXXFLAGS'] . ' -Wno-attributes';
+        return $env;
+    }
 }
--- a/src/SPC/builder/extension/memcached.php
+++ b/src/SPC/builder/extension/memcached.php
@@ -17,6 +17,10 @@ class memcached extends Extension
            '--with-libmemcached-dir=' . BUILD_ROOT_PATH . ' ' .
            '--disable-memcached-sasl ' .
            '--enable-memcached-json ' .
+            ($this->builder->getLib('zstd') ? '--with-zstd ' : '') .
+            ($this->builder->getExt('igbinary') ? '--enable-memcached-igbinary ' : '') .
+            ($this->builder->getExt('session') ? '--enable-memcached-session ' : '') .
+            ($this->builder->getExt('msgpack') ? '--enable-memcached-msgpack ' : '') .
            '--with-system-fastlz';
    }
 }
--- a/src/SPC/builder/extension/simdjson.php
+++ b/src/SPC/builder/extension/simdjson.php
@@ -6,6 +6,8 @@ namespace SPC\builder\extension;

 use SPC\builder\Extension;
 use SPC\store\FileSystem;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
 use SPC\util\CustomExt;

 #[CustomExt('simdjson')]
@@ -17,7 +19,7 @@ class simdjson extends Extension
        FileSystem::replaceFileRegex(
            SOURCE_PATH . '/php-src/ext/simdjson/config.m4',
            '/php_version=(`.*`)$/m',
-            'php_version=' . strval($php_ver)
+            'php_version=' . $php_ver
        );
        FileSystem::replaceFileStr(
            SOURCE_PATH . '/php-src/ext/simdjson/config.m4',
@@ -31,4 +33,18 @@ class simdjson extends Extension
        );
        return true;
    }
+
+    public function getSharedExtensionEnv(): array
+    {
+        $env = parent::getSharedExtensionEnv();
+        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            $extra = getenv('SPC_COMPILER_EXTRA');
+            if (!str_contains((string) $extra, '-lstdc++')) {
+                f_putenv('SPC_COMPILER_EXTRA=' . clean_spaces($extra . ' -lstdc++'));
+            }
+            $env['CFLAGS'] .= ' -Xclang -target-feature -Xclang +evex512';
+            $env['CXXFLAGS'] .= ' -Xclang -target-feature -Xclang +evex512';
+        }
+        return $env;
+    }
 }
--- a/src/SPC/builder/extension/zip.php
+++ b/src/SPC/builder/extension/zip.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('zip')]
+class zip extends Extension
+{
+    public function getUnixConfigureArg(bool $shared = false): string
+    {
+        return !$shared ? '--with-zip=' . BUILD_ROOT_PATH : '--enable-zip=shared';
+    }
+}
--- a/src/SPC/builder/linux/LinuxBuilder.php
+++ b/src/SPC/builder/linux/LinuxBuilder.php
@@ -84,6 +84,7 @@ class LinuxBuilder extends UnixBuilderBase
        $enableMicro = ($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO;
        $enableEmbed = ($build_target & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED;
        $enableFrankenphp = ($build_target & BUILD_TARGET_FRANKENPHP) === BUILD_TARGET_FRANKENPHP;
+        $enableCgi = ($build_target & BUILD_TARGET_CGI) === BUILD_TARGET_CGI;

        // prepare build php envs
        // $musl_flag = SPCTarget::getLibc() === 'musl' ? ' -D__MUSL__' : ' -U__MUSL__';
@@ -94,6 +95,8 @@ class LinuxBuilder extends UnixBuilderBase
            // 'LIBS' => SPCTarget::getRuntimeLibs(), // do not pass static libraries here yet, they may contain polyfills for libc functions!
        ]);

+        $phpvars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
+
        $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
        if ($embed_type !== 'static' && SPCTarget::isStatic()) {
            throw new WrongUsageException(
@@ -102,21 +105,22 @@ class LinuxBuilder extends UnixBuilderBase
            );
        }

-        shell()->cd(SOURCE_PATH . '/php-src')
-            ->exec(
-                $php_configure_env . ' ' .
+        $this->seekPhpSrcLogFileOnException(fn () => shell()->cd(SOURCE_PATH . '/php-src')->exec(
+            $php_configure_env . ' ' .
                getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
                ($enableCli ? '--enable-cli ' : '--disable-cli ') .
                ($enableFpm ? '--enable-fpm ' . ($this->getLib('libacl') !== null ? '--with-fpm-acl ' : '') : '--disable-fpm ') .
                ($enableEmbed ? "--enable-embed={$embed_type} " : '--disable-embed ') .
                ($enableMicro ? '--enable-micro=all-static ' : '--disable-micro ') .
+                ($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
                $config_file_path .
                $config_file_scan_dir .
                $json_74 .
                $zts .
                $maxExecutionTimers .
+                "{$phpvars} " .
                $this->makeStaticExtensionArgs() . ' '
-            );
+        ));

        $this->emitPatchPoint('before-php-make');
        SourcePatcher::patchBeforeMake($this);
@@ -131,6 +135,10 @@ class LinuxBuilder extends UnixBuilderBase
            logger()->info('building fpm');
            $this->buildFpm();
        }
+        if ($enableCgi) {
+            logger()->info('building cgi');
+            $this->buildCgi();
+        }
        if ($enableMicro) {
            logger()->info('building micro');
            $this->buildMicro();
@@ -142,16 +150,22 @@ class LinuxBuilder extends UnixBuilderBase
            }
            $this->buildEmbed();
        }
-        // build dynamic extensions if needed, must happen before building FrankenPHP to make sure we export all necessary, undefined symbols
-        $shared_extensions = array_map('trim', array_filter(explode(',', $this->getOption('build-shared'))));
-        if (!empty($shared_extensions)) {
-            logger()->info('Building shared extensions ...');
-            $this->buildSharedExts();
-        }
        if ($enableFrankenphp) {
            logger()->info('building frankenphp');
            $this->buildFrankenphp();
        }
+        $shared_extensions = array_map('trim', array_filter(explode(',', $this->getOption('build-shared'))));
+        if (!empty($shared_extensions)) {
+            if (SPCTarget::isStatic()) {
+                throw new WrongUsageException(
+                    "You're building against musl libc statically (the default on Linux), but you're trying to build shared extensions.\n" .
+                    'Static musl libc does not implement `dlopen`, so your php binary is not able to load shared extensions.' . "\n" .
+                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, or use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc`.'
+                );
+            }
+            logger()->info('Building shared extensions...');
+            $this->buildSharedExts();
+        }
    }

    public function testPHP(int $build_target = BUILD_TARGET_NONE)
@@ -165,12 +179,19 @@ class LinuxBuilder extends UnixBuilderBase
     */
    protected function buildCli(): void
    {
+        if ($this->getExt('readline')) {
+            SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src');
+        }
        $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
        $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
        shell()->cd(SOURCE_PATH . '/php-src')
            ->exec('sed -i "s|//lib|/lib|g" Makefile')
            ->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cli");

+        if ($this->getExt('readline')) {
+            SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src', true);
+        }
+
        if (!$this->getOption('no-strip', false)) {
            shell()->cd(SOURCE_PATH . '/php-src/sapi/cli')->exec('strip --strip-unneeded php');
        }
@@ -182,6 +203,25 @@ class LinuxBuilder extends UnixBuilderBase
        $this->deployBinary(BUILD_TARGET_CLI);
    }

+    protected function buildCgi(): void
+    {
+        $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
+        $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
+        shell()->cd(SOURCE_PATH . '/php-src')
+            ->exec('sed -i "s|//lib|/lib|g" Makefile')
+            ->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cgi");
+
+        if (!$this->getOption('no-strip', false)) {
+            shell()->cd(SOURCE_PATH . '/php-src/sapi/cgi')->exec('strip --strip-unneeded php-cgi');
+        }
+        if ($this->getOption('with-upx-pack')) {
+            shell()->cd(SOURCE_PATH . '/php-src/sapi/cgi')
+                ->exec(getenv('UPX_EXEC') . ' --best php-cgi');
+        }
+
+        $this->deployBinary(BUILD_TARGET_CGI);
+    }
+
    /**
     * Build phpmicro sapi
     */
@@ -302,7 +342,7 @@ class LinuxBuilder extends UnixBuilderBase
        $target = "{$libDir}/{$realLibName}";
        if (file_exists($target)) {
            [, $output] = shell()->execWithResult('readelf -d ' . escapeshellarg($target));
-            $output = join("\n", $output);
+            $output = implode("\n", $output);
            if (preg_match('/SONAME.*\[(.+)]/', $output, $sonameMatch)) {
                $currentSoname = $sonameMatch[1];
                if ($currentSoname !== basename($target)) {
--- a/src/SPC/builder/macos/MacOSBuilder.php
+++ b/src/SPC/builder/macos/MacOSBuilder.php
@@ -100,6 +100,7 @@ class MacOSBuilder extends UnixBuilderBase
        $enableMicro = ($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO;
        $enableEmbed = ($build_target & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED;
        $enableFrankenphp = ($build_target & BUILD_TARGET_FRANKENPHP) === BUILD_TARGET_FRANKENPHP;
+        $enableCgi = ($build_target & BUILD_TARGET_CGI) === BUILD_TARGET_CGI;

        // prepare build php envs
        $envs_build_php = SystemUtil::makeEnvVarString([
@@ -117,20 +118,20 @@ class MacOSBuilder extends UnixBuilderBase
        }

        $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
-        shell()->cd(SOURCE_PATH . '/php-src')
-            ->exec(
-                getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
+        $this->seekPhpSrcLogFileOnException(fn () => shell()->cd(SOURCE_PATH . '/php-src')->exec(
+            getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
                ($enableCli ? '--enable-cli ' : '--disable-cli ') .
                ($enableFpm ? '--enable-fpm ' : '--disable-fpm ') .
                ($enableEmbed ? "--enable-embed={$embed_type} " : '--disable-embed ') .
                ($enableMicro ? '--enable-micro ' : '--disable-micro ') .
+                ($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
                $config_file_path .
                $config_file_scan_dir .
                $json_74 .
                $zts .
                $this->makeStaticExtensionArgs() . ' ' .
                $envs_build_php
-            );
+        ));

        $this->emitPatchPoint('before-php-make');
        SourcePatcher::patchBeforeMake($this);
@@ -145,6 +146,10 @@ class MacOSBuilder extends UnixBuilderBase
            logger()->info('building fpm');
            $this->buildFpm();
        }
+        if ($enableCgi) {
+            logger()->info('building cgi');
+            $this->buildCgi();
+        }
        if ($enableMicro) {
            logger()->info('building micro');
            $this->buildMicro();
@@ -156,15 +161,15 @@ class MacOSBuilder extends UnixBuilderBase
            }
            $this->buildEmbed();
        }
+        if ($enableFrankenphp) {
+            logger()->info('building frankenphp');
+            $this->buildFrankenphp();
+        }
        $shared_extensions = array_map('trim', array_filter(explode(',', $this->getOption('build-shared'))));
        if (!empty($shared_extensions)) {
            logger()->info('Building shared extensions ...');
            $this->buildSharedExts();
        }
-        if ($enableFrankenphp) {
-            logger()->info('building frankenphp');
-            $this->buildFrankenphp();
-        }
    }

    public function testPHP(int $build_target = BUILD_TARGET_NONE)
@@ -189,6 +194,19 @@ class MacOSBuilder extends UnixBuilderBase
        $this->deployBinary(BUILD_TARGET_CLI);
    }

+    protected function buildCgi(): void
+    {
+        $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
+
+        $shell = shell()->cd(SOURCE_PATH . '/php-src');
+        $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
+        $shell->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cgi");
+        if (!$this->getOption('no-strip', false)) {
+            $shell->exec('dsymutil -f sapi/cgi/php-cgi')->exec('strip -S sapi/cgi/php-cgi');
+        }
+        $this->deployBinary(BUILD_TARGET_CGI);
+    }
+
    /**
     * Build phpmicro sapi
     */
--- a/src/SPC/builder/unix/UnixBuilderBase.php
+++ b/src/SPC/builder/unix/UnixBuilderBase.php
@@ -6,12 +6,11 @@ namespace SPC\builder\unix;

 use SPC\builder\BuilderBase;
 use SPC\builder\linux\SystemUtil as LinuxSystemUtil;
+use SPC\exception\SPCException;
 use SPC\exception\SPCInternalException;
 use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
-use SPC\store\CurlHook;
-use SPC\store\Downloader;
 use SPC\store\FileSystem;
 use SPC\store\pkg\GoXcaddy;
 use SPC\toolchain\GccNativeToolchain;
@@ -122,6 +121,16 @@ abstract class UnixBuilderBase extends BuilderBase
            }
        }

+        // sanity check for php-cgi
+        if (($build_target & BUILD_TARGET_CGI) === BUILD_TARGET_CGI) {
+            logger()->info('running cgi sanity check');
+            [$ret, $output] = shell()->execWithResult("echo '<?php echo \"<h1>Hello, World!</h1>\";' | " . BUILD_BIN_PATH . '/php-cgi -n');
+            $raw_output = implode('', $output);
+            if ($ret !== 0 || !str_contains($raw_output, 'Hello, World!') || !str_contains($raw_output, 'text/html')) {
+                throw new ValidationException("cgi failed sanity check. code: {$ret}, output: {$raw_output}", validation_module: 'php-cgi sanity check');
+            }
+        }
+
        // sanity check for embed
        if (($build_target & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED) {
            logger()->info('running embed sanity check');
@@ -209,6 +218,7 @@ abstract class UnixBuilderBase extends BuilderBase
            BUILD_TARGET_CLI => SOURCE_PATH . '/php-src/sapi/cli/php',
            BUILD_TARGET_MICRO => SOURCE_PATH . '/php-src/sapi/micro/micro.sfx',
            BUILD_TARGET_FPM => SOURCE_PATH . '/php-src/sapi/fpm/php-fpm',
+            BUILD_TARGET_CGI => SOURCE_PATH . '/php-src/sapi/cgi/php-cgi',
            default => throw new SPCInternalException("Deployment does not accept type {$type}"),
        };
        logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');
@@ -257,6 +267,7 @@ abstract class UnixBuilderBase extends BuilderBase

    protected function buildFrankenphp(): void
    {
+        GlobalEnvManager::addPathIfNotExists(GoXcaddy::getPath());
        $nobrotli = $this->getLib('brotli') === null ? ',nobrotli' : '';
        $nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : '';
        $xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES');
@@ -268,11 +279,8 @@ abstract class UnixBuilderBase extends BuilderBase
            logger()->warning('caddy-cbrotli module is enabled, but brotli library is not built. Disabling caddy-cbrotli.');
            $xcaddyModules = str_replace('--with github.com/dunglas/caddy-cbrotli', '', $xcaddyModules);
        }
-        $releaseInfo = json_decode(Downloader::curlExec(
-            'https://api.github.com/repos/php/frankenphp/releases/latest',
-            hooks: [[CurlHook::class, 'setupGithubToken']],
-        ), true);
-        $frankenPhpVersion = $releaseInfo['tag_name'];
+        [, $out] = shell()->execWithResult('go list -m github.com/dunglas/frankenphp@latest');
+        $frankenPhpVersion = str_replace('github.com/dunglas/frankenphp v', '', $out[0]);
        $libphpVersion = $this->getPHPVersion();
        $dynamic_exports = '';
        if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
@@ -283,11 +291,11 @@ abstract class UnixBuilderBase extends BuilderBase
            }
        }
        $debugFlags = $this->getOption('no-strip') ? '-w -s ' : '';
-        $extLdFlags = "-extldflags '-pie{$dynamic_exports}'";
+        $extLdFlags = "-extldflags '-pie{$dynamic_exports} {$this->arch_ld_flags}'";
        $muslTags = '';
        $staticFlags = '';
        if (SPCTarget::isStatic()) {
-            $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000{$dynamic_exports}'";
+            $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000{$dynamic_exports} {$this->arch_ld_flags}'";
            $muslTags = 'static_build,';
            $staticFlags = '-static-pie';
        }
@@ -295,7 +303,6 @@ abstract class UnixBuilderBase extends BuilderBase
        $config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list);
        $cflags = "{$this->arch_c_flags} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS');
        $libs = $config['libs'];
-        $libs .= PHP_OS_FAMILY === 'Linux' ? ' -lrt' : '';
        // Go's gcc driver doesn't automatically link against -lgcov or -lrt. Ugly, but necessary fix.
        if ((str_contains((string) getenv('SPC_DEFAULT_C_FLAGS'), '-fprofile') ||
                str_contains((string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'), '-fprofile')) &&
@@ -303,24 +310,17 @@ abstract class UnixBuilderBase extends BuilderBase
            $cflags .= ' -Wno-error=missing-profile';
            $libs .= ' -lgcov';
        }
-        $env = [
+        $env = [...[
            'CGO_ENABLED' => '1',
            'CGO_CFLAGS' => clean_spaces($cflags),
            'CGO_LDFLAGS' => "{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs}",
            'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
                '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' . $debugFlags .
                '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .
-                "{$frankenPhpVersion} PHP {$libphpVersion} Caddy'\\\" " .
+                "v{$frankenPhpVersion} PHP {$libphpVersion} Caddy'\\\" " .
                "-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
-        ];
-        foreach (GoXcaddy::getEnvironment() as $key => $value) {
-            if ($key === 'PATH') {
-                GlobalEnvManager::addPathIfNotExists($value);
-            } else {
-                $env[$key] = $value;
-            }
-        }
+        ], ...GoXcaddy::getEnvironment()];
        shell()->cd(BUILD_BIN_PATH)
            ->setEnv($env)
            ->exec("xcaddy build --output frankenphp {$xcaddyModules}");
@@ -333,4 +333,20 @@ abstract class UnixBuilderBase extends BuilderBase
            }
        }
    }
+
+    /**
+     * Seek php-src/config.log when building PHP, add it to exception.
+     */
+    protected function seekPhpSrcLogFileOnException(callable $callback): void
+    {
+        try {
+            $callback();
+        } catch (SPCException $e) {
+            if (file_exists(SOURCE_PATH . '/php-src/config.log')) {
+                $e->addExtraLogFile('php-src config.log', 'php-src.config.log');
+                copy(SOURCE_PATH . '/php-src/config.log', SPC_LOGS_DIR . '/php-src.config.log');
+            }
+            throw $e;
+        }
+    }
 }
--- a/src/SPC/builder/unix/library/imagemagick.php
+++ b/src/SPC/builder/unix/library/imagemagick.php
@@ -12,6 +12,11 @@ trait imagemagick
 {
    protected function build(): void
    {
+        $original_ldflags = $this->builder->arch_ld_flags;
+        if (str_contains($this->builder->arch_ld_flags, '-Wl,--as-needed')) {
+            $this->builder->arch_ld_flags = str_replace('-Wl,--as-needed', '', $original_ldflags);
+        }
+
        $ac = UnixAutoconfExecutor::create($this)
            ->optionalLib('libzip', ...ac_with_args('zip'))
            ->optionalLib('libjpeg', ...ac_with_args('jpeg'))
@@ -32,7 +37,7 @@ trait imagemagick
            );

        // special: linux-static target needs `-static`
-        $ldflags = SPCTarget::isStatic() ? ('-static -ldl') : '-ldl';
+        $ldflags = SPCTarget::isStatic() ? '-static -ldl' : '-ldl';

        // special: macOS needs -iconv
        $libs = SPCTarget::getTargetOS() === 'Darwin' ? '-liconv' : '';
@@ -45,6 +50,8 @@ trait imagemagick

        $ac->configure()->make();

+        $this->builder->arch_ld_flags = $original_ldflags;
+
        $filelist = [
            'ImageMagick.pc',
            'ImageMagick-7.Q16HDRI.pc',
--- a/src/SPC/builder/unix/library/libxml2.php
+++ b/src/SPC/builder/unix/library/libxml2.php
@@ -20,17 +20,17 @@ trait libxml2
                "-DZLIB_INCLUDE_DIR={$this->getIncludeDir()}",
                '-DLIBXML2_WITH_ZLIB=OFF',
            )
-            ->optionalLib('icu', ...cmake_boolean_args('LIBXML2_WITH_ICU'))
            ->optionalLib('xz', ...cmake_boolean_args('LIBXML2_WITH_LZMA'))
            ->addConfigureArgs(
                '-DLIBXML2_WITH_ICONV=ON',
+                '-DLIBXML2_WITH_ICU=OFF', // optional, but discouraged: https://gitlab.gnome.org/GNOME/libxml2/-/blob/master/README.md
                '-DLIBXML2_WITH_PYTHON=OFF',
                '-DLIBXML2_WITH_PROGRAMS=OFF',
                '-DLIBXML2_WITH_TESTS=OFF',
            );

        if ($this instanceof LinuxLibraryBase) {
-            $cmake->addConfigureArgs('-DIconv_IS_BUILD_IN=OFF');
+            $cmake->addConfigureArgs('-DIconv_IS_BUILT_IN=OFF');
        }

        $cmake->build();
--- a/src/SPC/builder/unix/library/ncurses.php
+++ b/src/SPC/builder/unix/library/ncurses.php
@@ -38,7 +38,7 @@ trait ncurses
            ->make();
        $final = FileSystem::scanDirFiles(BUILD_BIN_PATH, relative: true);
        // Remove the new files
-        $new_files = array_diff($final, $filelist);
+        $new_files = array_diff($final, $filelist ?: []);
        foreach ($new_files as $file) {
            @unlink(BUILD_BIN_PATH . '/' . $file);
        }
--- a/src/SPC/builder/unix/library/postgresql.php
+++ b/src/SPC/builder/unix/library/postgresql.php
@@ -4,93 +4,83 @@ declare(strict_types=1);

 namespace SPC\builder\unix\library;

-use SPC\builder\linux\library\LinuxLibraryBase;
-use SPC\exception\BuildFailureException;
 use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
+use SPC\util\PkgConfigUtil;
+use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;

 trait postgresql
 {
+    public function patchBeforeBuild(): bool
+    {
+        // fix aarch64 build on glibc 2.17 (e.g. CentOS 7)
+        if (SPCTarget::getLibcVersion() === '2.17' && GNU_ARCH === 'aarch64') {
+            try {
+                FileSystem::replaceFileStr("{$this->source_dir}/src/port/pg_popcount_aarch64.c", 'HWCAP_SVE', '0');
+                FileSystem::replaceFileStr(
+                    "{$this->source_dir}/src/port/pg_crc32c_armv8_choose.c",
+                    '#if defined(__linux__) && !defined(__aarch64__) && !defined(HWCAP2_CRC32)',
+                    '#if defined(__linux__) && !defined(HWCAP_CRC32)'
+                );
+            } catch (FileSystemException) {
+                // allow file not-existence to make it compatible with old and new version
+            }
+        }
+        // skip the test on platforms where libpq infrastructure may be provided by statically-linked libraries
+        FileSystem::replaceFileStr("{$this->source_dir}/src/interfaces/libpq/Makefile", 'invokes exit\'; exit 1;', 'invokes exit\';');
+        // disable shared libs build
+        FileSystem::replaceFileStr(
+            "{$this->source_dir}/src/Makefile.shlib",
+            [
+                '$(LINK.shared) -o $@ $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)',
+                '$(INSTALL_SHLIB) $< \'$(DESTDIR)$(pkglibdir)/$(shlib)\'',
+                '$(INSTALL_SHLIB) $< \'$(DESTDIR)$(libdir)/$(shlib)\'',
+                '$(INSTALL_SHLIB) $< \'$(DESTDIR)$(bindir)/$(shlib)\'',
+            ],
+            ''
+        );
+        return true;
+    }
+
    protected function build(): void
    {
-        $builddir = BUILD_ROOT_PATH;
-        $envs = '';
-        $packages = 'zlib openssl readline libxml-2.0';
-        $optional_packages = [
-            'zstd' => 'libzstd',
-            'ldap' => 'ldap',
-            'libxslt' => 'libxslt',
-            'icu' => 'icu-i18n',
+        $libs = array_map(fn ($x) => $x->getName(), $this->getDependencies());
+        $spc = new SPCConfigUtil($this->getBuilder(), ['no_php' => true, 'libs_only_deps' => true]);
+        $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs'));
+
+        $env_vars = [
+            'CFLAGS' => $config['cflags'],
+            'CPPFLAGS' => '-DPIC',
+            'LDFLAGS' => $config['ldflags'],
+            'LIBS' => $config['libs'],
        ];
-        $error_exec_cnt = 0;

-        foreach ($optional_packages as $lib => $pkg) {
-            if ($this->getBuilder()->getLib($lib)) {
-                $packages .= ' ' . $pkg;
-                $output = shell()->execWithResult("pkg-config --static {$pkg}");
-                $error_exec_cnt += $output[0] === 0 ? 0 : 1;
-                logger()->info(var_export($output[1], true));
-            }
-        }
-
-        $output = shell()->execWithResult("pkg-config --cflags-only-I --static {$packages}");
-        $error_exec_cnt += $output[0] === 0 ? 0 : 1;
-        $macos_15_bug_cflags = PHP_OS_FAMILY === 'Darwin' ? ' -Wno-unguarded-availability-new' : '';
-        $cflags = '';
-        if (!empty($output[1][0])) {
-            $cflags = $output[1][0];
-            $envs .= ' CPPFLAGS="-DPIC"';
-            $cflags = "{$cflags} -fno-ident{$macos_15_bug_cflags}";
-        }
-        $output = shell()->execWithResult("pkg-config --libs-only-L --static {$packages}");
-        $error_exec_cnt += $output[0] === 0 ? 0 : 1;
-        if (!empty($output[1][0])) {
-            $ldflags = $output[1][0];
-            $envs .= SPCTarget::isStatic() ? " LDFLAGS=\"{$ldflags} -static\" " : " LDFLAGS=\"{$ldflags}\" ";
-        }
-        $output = shell()->execWithResult("pkg-config --libs-only-l --static {$packages}");
-        $error_exec_cnt += $output[0] === 0 ? 0 : 1;
-        if (!empty($output[1][0])) {
-            $libs = $output[1][0];
-            $libcpp = '';
-            if ($this->builder->getLib('icu')) {
-                $libcpp = $this instanceof LinuxLibraryBase ? ' -lstdc++' : ' -lc++';
-            }
-            $envs .= " LIBS=\"{$libs}{$libcpp}\" ";
-        }
-        if ($error_exec_cnt > 0) {
-            throw new BuildFailureException('Failed to get pkg-config information!');
+        if ($ldLibraryPath = getenv('SPC_LD_LIBRARY_PATH')) {
+            $env_vars['LD_LIBRARY_PATH'] = $ldLibraryPath;
        }

        FileSystem::resetDir($this->source_dir . '/build');

-        $version = $this->getVersion();
-        // 16.1 workaround
-        if (version_compare($version, '16.1') >= 0) {
-            # 有静态链接配置  参考文件： src/interfaces/libpq/Makefile
-            shell()->cd($this->source_dir . '/build')
-                ->exec('sed -i.backup "s/invokes exit\'; exit 1;/invokes exit\';/"  ../src/interfaces/libpq/Makefile')
-                ->exec('sed -i.backup "278 s/^/# /"  ../src/Makefile.shlib')
-                ->exec('sed -i.backup "402 s/^/# /"  ../src/Makefile.shlib');
-        } else {
-            throw new BuildFailureException('Unsupported version for postgresql: ' . $version . ' !');
-        }
+        // php source relies on the non-private encoding functions in libpgcommon.a
+        FileSystem::replaceFileStr(
+            "{$this->source_dir}/src/common/Makefile",
+            '$(OBJS_FRONTEND): CPPFLAGS += -DUSE_PRIVATE_ENCODING_FUNCS',
+            '$(OBJS_FRONTEND): CPPFLAGS += -UUSE_PRIVATE_ENCODING_FUNCS -DFRONTEND',
+        );

        // configure
-        shell()->cd($this->source_dir . '/build')->initializeEnv($this)
-            ->appendEnv(['CFLAGS' => $cflags])
+        $shell = shell()->cd("{$this->source_dir}/build")->initializeEnv($this)
+            ->appendEnv($env_vars)
            ->exec(
-                "{$envs} ../configure " .
-                "--prefix={$builddir} " .
-                ($this->builder->getOption('enable-zts') ? '--enable-thread-safety ' : '--disable-thread-safety ') .
+                '../configure ' .
+                "--prefix={$this->getBuildRootPath()} " .
                '--enable-coverage=no ' .
                '--with-ssl=openssl ' .
                '--with-readline ' .
                '--with-libxml ' .
                ($this->builder->getLib('icu') ? '--with-icu ' : '--without-icu ') .
                ($this->builder->getLib('ldap') ? '--with-ldap ' : '--without-ldap ') .
-                // '--without-ldap ' .
                ($this->builder->getLib('libxslt') ? '--with-libxslt ' : '--without-libxslt ') .
                ($this->builder->getLib('zstd') ? '--with-zstd ' : '--without-zstd ') .
                '--without-lz4 ' .
@@ -99,32 +89,29 @@ trait postgresql
                '--without-pam ' .
                '--without-bonjour ' .
                '--without-tcl '
-            )
-            ->exec($envs . ' make -C src/bin/pg_config install')
-            ->exec($envs . ' make -C src/include install')
-            ->exec($envs . ' make -C src/common install')
-            ->exec($envs . ' make -C src/port install')
-            ->exec($envs . ' make -C src/interfaces/libpq install');
+            );
+
+        // patch ldap lib
+        if ($this->builder->getLib('ldap')) {
+            $libs = PkgConfigUtil::getLibsArray('ldap');
+            $libs = clean_spaces(implode(' ', $libs));
+            FileSystem::replaceFileStr($this->source_dir . '/build/config.status', '-lldap', $libs);
+            FileSystem::replaceFileStr($this->source_dir . '/build/src/Makefile.global', '-lldap', $libs);
+        }
+
+        $shell
+            ->exec('make -C src/bin/pg_config install')
+            ->exec('make -C src/include install')
+            ->exec('make -C src/common install')
+            ->exec('make -C src/port install')
+            ->exec('make -C src/interfaces/libpq install');

        // remove dynamic libs
        shell()->cd($this->source_dir . '/build')
-            ->exec("rm -rf {$builddir}/lib/*.so.*")
-            ->exec("rm -rf {$builddir}/lib/*.so")
-            ->exec("rm -rf {$builddir}/lib/*.dylib");
+            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.so.*")
+            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.so")
+            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.dylib");

-        FileSystem::replaceFileStr(BUILD_LIB_PATH . '/pkgconfig/libpq.pc', '-lldap', '-lldap -llber');
-    }
-
-    private function getVersion(): string
-    {
-        try {
-            $file = FileSystem::readFile($this->source_dir . '/meson.build');
-            if (preg_match("/^\\s+version:\\s?'(.*)'/m", $file, $match)) {
-                return $match[1];
-            }
-            return 'unknown';
-        } catch (FileSystemException) {
-            return 'unknown';
-        }
+        FileSystem::replaceFileStr("{$this->getLibDir()}/pkgconfig/libpq.pc", '-lldap', '-lldap -llber');
    }
 }
--- a/src/SPC/builder/unix/library/unixodbc.php
+++ b/src/SPC/builder/unix/library/unixodbc.php
@@ -4,18 +4,29 @@ declare(strict_types=1);

 namespace SPC\builder\unix\library;

+use SPC\exception\WrongUsageException;
 use SPC\util\executor\UnixAutoconfExecutor;

 trait unixodbc
 {
    protected function build(): void
    {
+        $sysconf_selector = match (PHP_OS_FAMILY) {
+            'Darwin' => match (GNU_ARCH) {
+                'x86_64' => '/usr/local/etc',
+                'aarch64' => '/opt/homebrew/etc',
+                default => throw new WrongUsageException('Unsupported architecture: ' . GNU_ARCH),
+            },
+            'Linux' => '/etc',
+            default => throw new WrongUsageException('Unsupported OS: ' . PHP_OS_FAMILY),
+        };
        UnixAutoconfExecutor::create($this)
            ->configure(
                '--disable-debug',
                '--disable-dependency-tracking',
                "--with-libiconv-prefix={$this->getBuildRootPath()}",
                '--with-included-ltdl',
+                "--sysconfdir={$sysconf_selector}",
                '--enable-gui=no',
            )
            ->make();
--- a/src/SPC/command/BuildPHPCommand.php
+++ b/src/SPC/command/BuildPHPCommand.php
@@ -33,6 +33,7 @@ class BuildPHPCommand extends BuildCommand
        $this->addOption('build-fpm', null, null, 'Build fpm SAPI (not available on Windows)');
        $this->addOption('build-embed', null, null, 'Build embed SAPI (not available on Windows)');
        $this->addOption('build-frankenphp', null, null, 'Build FrankenPHP SAPI (not available on Windows)');
+        $this->addOption('build-cgi', null, null, 'Build cgi SAPI (not available on Windows)');
        $this->addOption('build-all', null, null, 'Build all SAPI');
        $this->addOption('no-strip', null, null, 'build without strip, keep symbols to debug');
        $this->addOption('disable-opcache-jit', null, null, 'disable opcache jit');
@@ -274,6 +275,7 @@ class BuildPHPCommand extends BuildCommand
        $rule |= ($this->getOption('build-fpm') ? BUILD_TARGET_FPM : BUILD_TARGET_NONE);
        $rule |= $this->getOption('build-embed') || !empty($shared_extensions) ? BUILD_TARGET_EMBED : BUILD_TARGET_NONE;
        $rule |= ($this->getOption('build-frankenphp') ? (BUILD_TARGET_FRANKENPHP | BUILD_TARGET_EMBED) : BUILD_TARGET_NONE);
+        $rule |= ($this->getOption('build-cgi') ? BUILD_TARGET_CGI : BUILD_TARGET_NONE);
        $rule |= ($this->getOption('build-all') ? BUILD_TARGET_ALL : BUILD_TARGET_NONE);
        return $rule;
    }
--- a/src/SPC/command/CraftCommand.php
+++ b/src/SPC/command/CraftCommand.php
@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace SPC\command;

 use SPC\exception\ValidationException;
+use SPC\store\pkg\GoXcaddy;
+use SPC\store\pkg\Zig;
 use SPC\toolchain\ToolchainManager;
 use SPC\toolchain\ZigToolchain;
 use SPC\util\ConfigValidator;
@@ -63,7 +65,7 @@ class CraftCommand extends BuildCommand
            }
        }
        // install go and xcaddy for frankenphp
-        if (in_array('frankenphp', $craft['sapi'])) {
+        if (in_array('frankenphp', $craft['sapi']) && !GoXcaddy::isInstalled()) {
            $retcode = $this->runCommand('install-pkg', 'go-xcaddy');
            if ($retcode !== 0) {
                $this->output->writeln('<error>craft go-xcaddy failed</error>');
@@ -71,7 +73,7 @@ class CraftCommand extends BuildCommand
            }
        }
        // install zig if requested
-        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+        if (ToolchainManager::getToolchainClass() === ZigToolchain::class && !Zig::isInstalled()) {
            $retcode = $this->runCommand('install-pkg', 'zig');
            if ($retcode !== 0) {
                $this->output->writeln('<error>craft zig failed</error>');
--- a/src/SPC/command/DownloadCommand.php
+++ b/src/SPC/command/DownloadCommand.php
@@ -106,7 +106,7 @@ class DownloadCommand extends BaseCommand
        }

        // retry
-        $retry = intval($this->getOption('retry'));
+        $retry = (int) $this->getOption('retry');
        f_putenv('SPC_DOWNLOAD_RETRIES=' . $retry);

        // Use shallow-clone can reduce git resource download
@@ -265,7 +265,7 @@ class DownloadCommand extends BaseCommand
            f_passthru((PHP_OS_FAMILY === 'Windows' ? 'rmdir /s /q ' : 'rm -rf ') . DOWNLOAD_PATH);
        }
        // unzip command check
-        if (PHP_OS_FAMILY !== 'Windows' && !$this->findCommand('unzip')) {
+        if (PHP_OS_FAMILY !== 'Windows' && !self::findCommand('unzip')) {
            $this->output->writeln('Missing unzip command, you need to install it first !');
            $this->output->writeln('You can use "bin/spc doctor" command to check and install required tools');
            return static::FAILURE;
--- a/src/SPC/doctor/item/LinuxToolCheckList.php
+++ b/src/SPC/doctor/item/LinuxToolCheckList.php
@@ -28,7 +28,7 @@ class LinuxToolCheckList
    public const TOOLS_DEBIAN = [
        'make', 'bison', 're2c', 'flex',
        'git', 'autoconf', 'automake', 'autopoint',
-        'tar', 'unzip', 'gzip',
+        'tar', 'unzip', 'gzip', 'gcc', 'g++',
        'bzip2', 'cmake', 'patch',
        'xz', 'libtoolize', 'which',
        'patchelf',
@@ -37,7 +37,7 @@ class LinuxToolCheckList
    public const TOOLS_RHEL = [
        'perl', 'make', 'bison', 're2c', 'flex',
        'git', 'autoconf', 'automake',
-        'tar', 'unzip', 'gzip', 'gcc',
+        'tar', 'unzip', 'gzip', 'gcc', 'g++',
        'bzip2', 'cmake', 'patch', 'which',
        'xz', 'libtool', 'gettext-devel',
        'patchelf',
@@ -53,7 +53,8 @@ class LinuxToolCheckList
        'base-devel' => 'automake',
        'gettext-devel' => 'gettextize',
        'gettext-dev' => 'gettextize',
-        'perl-IPC-Cmd' => '/usr/share/doc/perl-IPC-Cmd',
+        'perl-IPC-Cmd' => '/usr/share/perl5/vendor_perl/IPC/Cmd.pm',
+        'perl-Time-Piece' => '/usr/lib64/perl5/Time/Piece.pm',
    ];

    /** @noinspection PhpUnused */
@@ -65,7 +66,7 @@ class LinuxToolCheckList
        $required = match ($distro['dist']) {
            'alpine' => self::TOOLS_ALPINE,
            'redhat' => self::TOOLS_RHEL,
-            'centos' => array_merge(self::TOOLS_RHEL, ['perl-IPC-Cmd']),
+            'centos' => array_merge(self::TOOLS_RHEL, ['perl-IPC-Cmd', 'perl-Time-Piece']),
            'arch' => self::TOOLS_ARCH,
            default => self::TOOLS_DEBIAN,
        };
--- a/src/SPC/doctor/item/PkgConfigCheck.php
+++ b/src/SPC/doctor/item/PkgConfigCheck.php
@@ -29,6 +29,18 @@ class PkgConfigCheck
        return CheckResult::ok($pkgconf);
    }

+    #[AsCheckItem('if pkg-config is working', level: 799)]
+    public function checkPkgConfigFunctional(): CheckResult
+    {
+        $pkgconf = PkgConfigUtil::findPkgConfig();
+        // check if pkg-config is functional
+        [$ret, $output] = shell()->execWithResult("{$pkgconf} --version", false);
+        if ($ret === 0) {
+            return CheckResult::ok(implode(' ', $output));
+        }
+        return CheckResult::fail('pkg-config is not functional', 'install-pkgconfig');
+    }
+
    #[AsFixItem('install-pkgconfig')]
    public function installPkgConfig(): bool
    {
--- a/src/SPC/exception/ValidationException.php
+++ b/src/SPC/exception/ValidationException.php
@@ -14,9 +14,9 @@ use SPC\builder\Extension;
 */
 class ValidationException extends SPCException
 {
-    private null|array|string $validation_module = null;
+    private array|string|null $validation_module = null;

-    public function __construct(string $message = '', int $code = 0, ?\Throwable $previous = null, null|array|string $validation_module = null)
+    public function __construct(string $message = '', int $code = 0, ?\Throwable $previous = null, array|string|null $validation_module = null)
    {
        parent::__construct($message, $code, $previous);

--- a/src/SPC/store/Downloader.php
+++ b/src/SPC/store/Downloader.php
@@ -65,19 +65,19 @@ class Downloader
            url: "https://api.github.com/repos/{$source['repo']}/{$type}",
            hooks: [[CurlHook::class, 'setupGithubToken']],
            retries: self::getRetryAttempts()
-        ), true);
+        ), true, 512, JSON_THROW_ON_ERROR);

        $url = null;
-        for ($i = 0; $i < count($data); ++$i) {
-            if (($data[$i]['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
+        foreach ($data as $rel) {
+            if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
                continue;
            }
            if (!($source['match'] ?? null)) {
-                $url = $data[$i]['tarball_url'] ?? null;
+                $url = $rel['tarball_url'] ?? null;
                break;
            }
-            if (preg_match('|' . $source['match'] . '|', $data[$i]['tarball_url'])) {
-                $url = $data[$i]['tarball_url'];
+            if (preg_match('|' . $source['match'] . '|', $rel['tarball_url'])) {
+                $url = $rel['tarball_url'];
                break;
            }
        }
@@ -232,7 +232,8 @@ class Downloader
        $quiet = !defined('DEBUG_MODE') ? '-q --quiet' : '';
        $git = SPC_GIT_EXEC;
        $shallow = defined('GIT_SHALLOW_CLONE') ? '--depth 1 --single-branch' : '';
-        $recursive = ($submodules === null) ? '--recursive' : '';
+        $recursive = ($submodules === null && defined('GIT_SHALLOW_CLONE')) ? '--recursive --shallow-submodules' : null;
+        $recursive ??= $submodules === null ? '--recursive' : '';

        try {
            self::registerCancelEvent(function () use ($download_path) {
@@ -243,8 +244,9 @@ class Downloader
            });
            f_passthru("{$git} clone {$quiet} --config core.autocrlf=false --branch \"{$branch}\" {$shallow} {$recursive} \"{$url}\" \"{$download_path}\"");
            if ($submodules !== null) {
+                $depth_flag = defined('GIT_SHALLOW_CLONE') ? '--depth 1' : '';
                foreach ($submodules as $submodule) {
-                    f_passthru("cd \"{$download_path}\" && {$git} submodule update --init " . escapeshellarg($submodule));
+                    f_passthru("cd \"{$download_path}\" && {$git} submodule update --init {$depth_flag} " . escapeshellarg($submodule));
                }
            }
        } catch (SPCException $e) {
@@ -399,7 +401,7 @@ class Downloader
     * Download source
     *
     * @param string $name source name
-     * @param  null|array{
+     * @param null|array{
     *     type: string,
     *     repo: ?string,
     *     url: ?string,
@@ -414,7 +416,7 @@ class Downloader
     *         path: ?string,
     *         text: ?string
     *     }
-     * }          $source  source meta info: [type, path, rev, url, filename, regex, license]
+     * } $source source meta info: [type, path, rev, url, filename, regex, license]
     * @param bool $force       Whether to force download (default: false)
     * @param int  $download_as Lock source type (default: SPC_LOCK_SOURCE)
     */
--- a/src/SPC/store/FileSystem.php
+++ b/src/SPC/store/FileSystem.php
@@ -274,7 +274,7 @@ class FileSystem
    public static function convertWinPathToMinGW(string $path): string
    {
        if (preg_match('/^[A-Za-z]:/', $path)) {
-            $path = '/' . strtolower(substr($path, 0, 1)) . '/' . str_replace('\\', '/', substr($path, 2));
+            $path = '/' . strtolower($path[0]) . '/' . str_replace('\\', '/', substr($path, 2));
        }
        return $path;
    }
@@ -314,8 +314,13 @@ class FileSystem
            $sub_file = self::convertPath($dir . '/' . $v);
            if (is_dir($sub_file) && $recursive) {
                # 如果是 目录 且 递推 , 则递推添加下级文件
-                $list = array_merge($list, self::scanDirFiles($sub_file, $recursive, $relative));
-            } elseif (is_file($sub_file) || is_dir($sub_file) && !$recursive && $include_dir) {
+                $sub_list = self::scanDirFiles($sub_file, $recursive, $relative);
+                if (is_array($sub_list)) {
+                    foreach ($sub_list as $item) {
+                        $list[] = $item;
+                    }
+                }
+            } elseif (is_file($sub_file) || (is_dir($sub_file) && !$recursive && $include_dir)) {
                # 如果是 文件 或 (是 目录 且 不递推 且 包含目录)
                if (is_string($relative) && mb_strpos($sub_file, $relative) === 0) {
                    $list[] = ltrim(mb_substr($sub_file, mb_strlen($relative)), '/\\');
@@ -440,7 +445,7 @@ class FileSystem
    public static function writeFile(string $path, mixed $content, ...$args): bool|int|string
    {
        $dir = pathinfo(self::convertPath($path), PATHINFO_DIRNAME);
-        if (!is_dir($dir) && !mkdir($dir, 0755, true)) {
+        if (!is_dir($dir) && !mkdir($dir, 0755, true) && !is_dir($dir)) {
            throw new FileSystemException('Write file failed, cannot create parent directory: ' . $dir);
        }
        return file_put_contents($path, $content, ...$args);
--- a/src/SPC/store/pkg/CustomPackage.php
+++ b/src/SPC/store/pkg/CustomPackage.php
@@ -30,10 +30,14 @@ abstract class CustomPackage

    /**
     * Get the environment variables this package needs to be usable.
-     * PATH needs to be appended, rather than replaced.
     */
    abstract public static function getEnvironment(): array;

+    /**
+     * Get the PATH required to use this package.
+     */
+    abstract public static function getPath(): ?string;
+
    abstract public static function isInstalled(): bool;

    /**
--- a/src/SPC/store/pkg/GoXcaddy.php
+++ b/src/SPC/store/pkg/GoXcaddy.php
@@ -13,18 +13,7 @@ class GoXcaddy extends CustomPackage
 {
    public static function isInstalled(): bool
    {
-        $arch = arch2gnu(php_uname('m'));
-        $os = match (PHP_OS_FAMILY) {
-            'Windows' => 'win',
-            'Darwin' => 'macos',
-            'BSD' => 'freebsd',
-            default => 'linux',
-        };
-
-        $packageName = "go-xcaddy-{$arch}-{$os}";
-        $pkgroot = PKG_ROOT_PATH;
-        $folder = "{$pkgroot}/{$packageName}";
-
+        $folder = PKG_ROOT_PATH . '/go-xcaddy';
        return is_dir($folder) && is_file("{$folder}/bin/go") && is_file("{$folder}/bin/xcaddy");
    }

@@ -59,7 +48,7 @@ class GoXcaddy extends CustomPackage
            'macos' => 'darwin',
            default => throw new \InvalidArgumentException('Unsupported OS: ' . $name),
        };
-        $go_version = '1.24.4';
+        $go_version = '1.25.0';
        $config = [
            'type' => 'url',
            'url' => "https://go.dev/dl/go{$go_version}.{$os}-{$arch}.tar.gz",
@@ -70,15 +59,15 @@ class GoXcaddy extends CustomPackage
    public function extract(string $name): void
    {
        $pkgroot = PKG_ROOT_PATH;
-        $go_exec = "{$pkgroot}/{$name}/bin/go";
-        $xcaddy_exec = "{$pkgroot}/{$name}/bin/xcaddy";
+        $go_exec = "{$pkgroot}/go-xcaddy/bin/go";
+        $xcaddy_exec = "{$pkgroot}/go-xcaddy/bin/xcaddy";
        if (file_exists($go_exec) && file_exists($xcaddy_exec)) {
            return;
        }
        $lock = json_decode(FileSystem::readFile(LockFile::LOCK_FILE), true);
        $source_type = $lock[$name]['source_type'];
        $filename = DOWNLOAD_PATH . '/' . ($lock[$name]['filename'] ?? $lock[$name]['dirname']);
-        $extract = $lock[$name]['move_path'] ?? "{$pkgroot}/{$name}";
+        $extract = $lock[$name]['move_path'] ?? "{$pkgroot}/go-xcaddy";

        FileSystem::extractPackage($name, $source_type, $filename, $extract);

@@ -91,9 +80,9 @@ class GoXcaddy extends CustomPackage
        // install xcaddy without using musl tools, xcaddy build requires dynamic linking
        shell()
            ->appendEnv([
-                'PATH' => "{$pkgroot}/{$name}/bin:" . $sanitizedPath,
-                'GOROOT' => "{$pkgroot}/{$name}",
-                'GOBIN' => "{$pkgroot}/{$name}/bin",
+                'PATH' => "{$pkgroot}/go-xcaddy/bin:" . $sanitizedPath,
+                'GOROOT' => "{$pkgroot}/go-xcaddy",
+                'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
                'GOPATH' => "{$pkgroot}/go",
            ])
            ->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
@@ -101,22 +90,17 @@ class GoXcaddy extends CustomPackage

    public static function getEnvironment(): array
    {
-        $arch = arch2gnu(php_uname('m'));
-        $os = match (PHP_OS_FAMILY) {
-            'Windows' => 'win',
-            'Darwin' => 'macos',
-            'BSD' => 'freebsd',
-            default => 'linux',
-        };
-
-        $packageName = "go-xcaddy-{$arch}-{$os}";
+        $packageName = 'go-xcaddy';
        $pkgroot = PKG_ROOT_PATH;
-
        return [
-            'PATH' => "{$pkgroot}/{$packageName}/bin",
            'GOROOT' => "{$pkgroot}/{$packageName}",
            'GOBIN' => "{$pkgroot}/{$packageName}/bin",
            'GOPATH' => "{$pkgroot}/go",
        ];
    }
+
+    public static function getPath(): ?string
+    {
+        return PKG_ROOT_PATH . '/go-xcaddy/bin';
+    }
 }
--- a/src/SPC/store/pkg/Zig.php
+++ b/src/SPC/store/pkg/Zig.php
@@ -103,7 +103,7 @@ class Zig extends CustomPackage
    public function extract(string $name): void
    {
        $pkgroot = PKG_ROOT_PATH;
-        $zig_bin_dir = "{$pkgroot}/{$name}";
+        $zig_bin_dir = "{$pkgroot}/zig";

        $files = ['zig', 'zig-cc', 'zig-c++', 'zig-ar', 'zig-ld.lld', 'zig-ranlib', 'zig-objcopy'];
        $all_exist = true;
@@ -120,7 +120,7 @@ class Zig extends CustomPackage
        $lock = json_decode(FileSystem::readFile(LockFile::LOCK_FILE), true);
        $source_type = $lock[$name]['source_type'];
        $filename = DOWNLOAD_PATH . '/' . ($lock[$name]['filename'] ?? $lock[$name]['dirname']);
-        $extract = "{$pkgroot}/{$name}";
+        $extract = "{$pkgroot}/zig";

        FileSystem::extractPackage($name, $source_type, $filename, $extract);

@@ -129,34 +129,12 @@ class Zig extends CustomPackage

    public static function getEnvironment(): array
    {
-        $arch = arch2gnu(php_uname('m'));
-        $os = match (PHP_OS_FAMILY) {
-            'Windows' => 'win',
-            'Darwin' => 'macos',
-            'BSD' => 'freebsd',
-            default => 'linux',
-        };
-
-        $packageName = "zig-{$arch}-{$os}";
-        $path = PKG_ROOT_PATH . "/{$packageName}";
-
-        return [
-            'PATH' => $path,
-        ];
+        return [];
    }

-    private static function getPath(): string
+    public static function getPath(): ?string
    {
-        $arch = arch2gnu(php_uname('m'));
-        $os = match (PHP_OS_FAMILY) {
-            'Windows' => 'win',
-            'Darwin' => 'macos',
-            'BSD' => 'freebsd',
-            default => 'linux',
-        };
-
-        $packageName = "zig-{$arch}-{$os}";
-        return PKG_ROOT_PATH . "/{$packageName}";
+        return PKG_ROOT_PATH . '/zig';
    }

    private function createZigCcScript(string $bin_dir): void
--- a/src/SPC/store/scripts/zig-cc.sh
+++ b/src/SPC/store/scripts/zig-cc.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash

 SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
-BUILDROOT_ABS="$(realpath "$SCRIPT_DIR/../../buildroot/include" 2>/dev/null || true)"
+BUILDROOT_ABS="$(realpath "$SCRIPT_DIR/../../../buildroot/include" 2>/dev/null || true)"
 PARSED_ARGS=()

 while [[ $# -gt 0 ]]; do
@@ -19,9 +19,15 @@ while [[ $# -gt 0 ]]; do
            ARG_ABS="$(realpath "$ARG" 2>/dev/null || true)"
            [[ "$ARG_ABS" == "$BUILDROOT_ABS" ]] && PARSED_ARGS+=("-I$ARG") || PARSED_ARGS+=("-isystem$ARG")
            ;;
-        -march=*|-mcpu=*) # replace -march=x86-64 with -march=x86_64
+        -march=*|-mcpu=*)
            OPT_NAME="${1%%=*}"
            OPT_VALUE="${1#*=}"
+            # Skip armv8- flags entirely as Zig doesn't support them
+            if [[ "$OPT_VALUE" == armv8-* ]]; then
+                shift
+                continue
+            fi
+            # replace -march=x86-64 with -march=x86_64
            OPT_VALUE="${OPT_VALUE//-/_}"
            PARSED_ARGS+=("${OPT_NAME}=${OPT_VALUE}")
            shift
--- a/src/SPC/store/source/PhpSource.php
+++ b/src/SPC/store/source/PhpSource.php
@@ -16,11 +16,11 @@ class PhpSource extends CustomSourceBase
    {
        $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
        if ($major === '8.5') {
-            Downloader::downloadSource('php-src', ['type' => 'url', 'url' => 'https://downloads.php.net/~edorian/php-8.5.0beta1.tar.xz'], $force);
+            Downloader::downloadSource('php-src', ['type' => 'url', 'url' => 'https://github.com/php/php-src/archive/refs/tags/php-8.5.0RC2.tar.gz'], $force);
        } elseif ($major === 'git') {
            Downloader::downloadSource('php-src', ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
        } else {
-            Downloader::downloadSource('php-src', self::getLatestPHPInfo($major), $force);
+            Downloader::downloadSource('php-src', $this->getLatestPHPInfo($major), $force);
        }
    }

@@ -33,7 +33,7 @@ class PhpSource extends CustomSourceBase
        // 查找最新的小版本号
        $info = json_decode(Downloader::curlExec(
            url: "https://www.php.net/releases/index.php?json&version={$major_version}",
-            retries: intval(getenv('SPC_DOWNLOAD_RETRIES') ?: 0)
+            retries: (int) getenv('SPC_DOWNLOAD_RETRIES') ?: 0
        ), true);
        if (!isset($info['version'])) {
            throw new DownloaderException("Version {$major_version} not found.");
--- a/src/SPC/toolchain/ZigToolchain.php
+++ b/src/SPC/toolchain/ZigToolchain.php
@@ -42,10 +42,10 @@ class ZigToolchain implements ToolchainInterface

    public function afterInit(): void
    {
-        if (!is_dir(Zig::getEnvironment()['PATH'])) {
+        if (!Zig::isInstalled()) {
            throw new EnvironmentException('You are building with zig, but zig is not installed, please install zig first. (You can use `doctor` command to install it)');
        }
-        GlobalEnvManager::addPathIfNotExists(Zig::getEnvironment()['PATH']);
+        GlobalEnvManager::addPathIfNotExists(Zig::getPath());
        f_passthru('ulimit -n 2048'); // zig opens extra file descriptors, so when a lot of extensions are built statically, 1024 is not enough
        $cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: '';
        $cxxflags = getenv('SPC_DEFAULT_CXX_FLAGS') ?: '';
@@ -64,6 +64,11 @@ class ZigToolchain implements ToolchainInterface
            $extra_libs = trim($extra_libs . ' -lunwind');
            GlobalEnvManager::putenv("SPC_EXTRA_LIBS={$extra_libs}");
        }
+        $cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
+        $has_avx512 = str_contains($cflags, '-mavx512') || str_contains($cflags, '-march=x86-64-v4');
+        if (!$has_avx512) {
+            GlobalEnvManager::putenv('SPC_EXTRA_PHP_VARS=php_cv_have_avx512=no php_cv_have_avx512vbmi=no');
+        }
    }

    public function getCompilerInfo(): ?string
--- a/src/SPC/util/GlobalEnvManager.php
+++ b/src/SPC/util/GlobalEnvManager.php
@@ -40,7 +40,12 @@ class GlobalEnvManager
        if (is_unix()) {
            self::addPathIfNotExists(BUILD_BIN_PATH);
            self::addPathIfNotExists(PKG_ROOT_PATH . '/bin');
-            self::putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
+            $pkgConfigPath = getenv('PKG_CONFIG_PATH');
+            if ($pkgConfigPath !== false) {
+                self::putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . "/pkgconfig:{$pkgConfigPath}");
+            } else {
+                self::putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
+            }
        }

        $ini = self::readIniFile();
--- a/src/SPC/util/LicenseDumper.php
+++ b/src/SPC/util/LicenseDumper.php
@@ -117,7 +117,7 @@ class LicenseDumper
    /**
     * Loads a source license file from the specified path.
     */
-    private function loadSourceFile(string $source_name, int $index, null|array|string $in_path, ?string $custom_base_path = null): string
+    private function loadSourceFile(string $source_name, int $index, array|string|null $in_path, ?string $custom_base_path = null): string
    {
        if (is_null($in_path)) {
            throw new SPCInternalException("source [{$source_name}] license file is not set, please check config/source.json");
--- a/src/SPC/util/SPCConfigUtil.php
+++ b/src/SPC/util/SPCConfigUtil.php
@@ -6,6 +6,7 @@ namespace SPC\util;

 use SPC\builder\BuilderBase;
 use SPC\builder\BuilderProvider;
+use SPC\builder\Extension;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use Symfony\Component\Console\Input\ArgvInput;
@@ -87,7 +88,7 @@ class SPCConfigUtil
        if (SPCTarget::getTargetOS() === 'Darwin') {
            $libs .= " {$this->getFrameworksString($extensions)}";
        }
-        if ($this->builder->hasCpp()) {
+        if ($this->hasCpp($extensions, $libraries)) {
            $libcpp = SPCTarget::getTargetOS() === 'Darwin' ? '-lc++' : '-lstdc++';
            $libs = str_replace($libcpp, '', $libs) . " {$libcpp}";
        }
@@ -123,6 +124,27 @@ class SPCConfigUtil
        ];
    }

+    private function hasCpp(array $extensions, array $libraries): bool
+    {
+        // judge cpp-extension
+        $builderExtNames = array_keys($this->builder->getExts(false));
+        $exts = array_unique([...$builderExtNames, ...$extensions]);
+
+        foreach ($exts as $ext) {
+            if (Config::getExt($ext, 'cpp-extension', false) === true) {
+                return true;
+            }
+        }
+        $builderLibNames = array_keys($this->builder->getLibs());
+        $libs = array_unique([...$builderLibNames, ...$libraries]);
+        foreach ($libs as $lib) {
+            if (Config::getLib($lib, 'cpp-library', false) === true) {
+                return true;
+            }
+        }
+        return false;
+    }
+
    private function getIncludesString(array $libraries): string
    {
        $base = BUILD_INCLUDE_PATH;
--- a/src/globals/defines.php
+++ b/src/globals/defines.php
@@ -63,7 +63,8 @@ const BUILD_TARGET_MICRO = 2;   // build micro
 const BUILD_TARGET_FPM = 4;     // build fpm
 const BUILD_TARGET_EMBED = 8;   // build embed
 const BUILD_TARGET_FRANKENPHP = 16;   // build frankenphp
-const BUILD_TARGET_ALL = BUILD_TARGET_CLI | BUILD_TARGET_MICRO | BUILD_TARGET_FPM | BUILD_TARGET_EMBED | BUILD_TARGET_FRANKENPHP;    // build all
+const BUILD_TARGET_CGI = 32;   // build cgi
+const BUILD_TARGET_ALL = BUILD_TARGET_CLI | BUILD_TARGET_MICRO | BUILD_TARGET_FPM | BUILD_TARGET_EMBED | BUILD_TARGET_FRANKENPHP | BUILD_TARGET_CGI;    // build all

 // doctor error fix policy
 const FIX_POLICY_DIE = 1;       // die directly
--- a/src/globals/ext-tests/gettext.php
+++ b/src/globals/ext-tests/gettext.php
@@ -4,20 +4,40 @@ declare(strict_types=1);

 assert(function_exists('gettext'));
 assert(function_exists('bindtextdomain'));
+assert(function_exists('bind_textdomain_codeset'));
 assert(function_exists('textdomain'));

-if (!is_dir('locale/en_US/LC_MESSAGES/')) {
-    mkdir('locale/en_US/LC_MESSAGES/', 0755, true);
+foreach (['en_US', 'en_GB'] as $lc) {
+    $dir = "locale/{$lc}/LC_MESSAGES";
+    if (!is_dir($dir)) {
+        mkdir($dir, 0755, true);
+    }
+    $mo = '3hIElQAAAAACAAAAHAAAACwAAAAFAAAAPAAAAAAAAABQAAAABgAAAFEAAAAXAQAAWAAAAAcAAABwAQAAAQAAAAAAAAAAAAAAAgAAAAAAAAAA56S65L6LAFByb2plY3QtSWQtVmVyc2lvbjogUEFDS0FHRSBWRVJTSU9OClJlcG9ydC1Nc2dpZC1CdWdzLVRvOiAKUE8tUmV2aXNpb24tRGF0ZTogWUVBUi1NTy1EQSBITzpNSytaT05FCkxhc3QtVHJhbnNsYXRvcjogRlVMTCBOQU1FIDxFTUFJTEBBRERSRVNTPgpMYW5ndWFnZS1UZWFtOiBMQU5HVUFHRSA8TExAbGkub3JnPgpMYW5ndWFnZTogCk1JTUUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA4Yml0CgBFeGFtcGxlAA==';
+    $path = "{$dir}/test.mo";
+    if (!file_exists($path)) {
+        file_put_contents($path, base64_decode($mo));
+    }
 }
-if (!file_exists('locale/en_US/LC_MESSAGES/test.mo')) {
-    $mo = '3hIElQAAAAACAAAAHAAAACwAAAAFAAAAPAAAAAAAAABQAAAABgAAAFEAAAAXAQAAWAAAAAcAAABwAQAAAQAAAAAAAAAAAAAAAgAAAAAAAAAA56S65L6LAFByb2plY3QtSWQtVmVyc2lvbjogUEFDS0FHRSBWRVJTSU9OClJlcG9ydC1Nc2dpZC1CdWdzLVRvOiAKUE8tUmV2aXNpb24tRGF0ZTogWUVBUi1NTy1EQSBITzpNSStaT05FCkxhc3QtVHJhbnNsYXRvcjogRlVMTCBOQU1FIDxFTUFJTEBBRERSRVNTPgpMYW5ndWFnZS1UZWFtOiBMQU5HVUFHRSA8TExAbGkub3JnPgpMYW5ndWFnZTogCk1JTUUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA4Yml0CgBFeGFtcGxlAA==';
-    file_put_contents('locale/en_US/LC_MESSAGES/test.mo', base64_decode($mo));
-}
-putenv('LANG=en_US');
-assert(setlocale(LC_ALL, 'en_US.utf-8') === 'en_US.utf-8');
+
+// Probe for an available English locale
+$candidates = [
+    'en_US.UTF-8', 'en_US.utf8', 'en_US.utf-8', 'en_US',
+    'en_GB.UTF-8', 'en_GB.utf8', 'en_GB.utf-8', 'en_GB',
+    'English_United States.65001', 'English_United States.1252',
+    'English_United Kingdom.65001', 'English_United Kingdom.1252',
+];
+
+$locale = setlocale(LC_ALL, $candidates);
+assert($locale !== false);
+
+putenv('LC_ALL=' . $locale);
+putenv('LANG=' . $locale);
+putenv('LANGUAGE=' . (stripos($locale, 'US') !== false ? 'en_US:en_GB' : 'en_GB:en_US'));

 $domain = 'test';
 bindtextdomain($domain, 'locale/');
+bind_textdomain_codeset($domain, 'UTF-8');
 textdomain($domain);

-assert(gettext(json_decode('"\u793a\u4f8b"', true)) === 'Example');
+$src = json_decode('"\u793a\u4f8b"', true);
+assert(gettext($src) === 'Example');
--- a/src/globals/functions.php
+++ b/src/globals/functions.php
@@ -245,6 +245,23 @@ function clean_spaces(string $string): string
    return trim(preg_replace('/\s+/', ' ', $string));
 }

+/**
+ * Deduplicate flags in a string. Only the last occurence of each flag will be kept.
+ *                        E.g. `-lintl -lstdc++ -lphp -lstdc++` becomes `-lintl -lphp -lstdc++`
+ *
+ * @param  string $flags the string containing flags to deduplicate
+ * @return string the deduplicated string with no duplicate flags
+ */
+function deduplicate_flags(string $flags): string
+{
+    $tokens = preg_split('/\s+/', trim($flags));
+
+    // Reverse, unique, reverse back - keeps last occurrence of duplicates
+    $deduplicated = array_reverse(array_unique(array_reverse($tokens)));
+
+    return implode(' ', $deduplicated);
+}
+
 /**
 * Register a callback function to handle keyboard interrupts (Ctrl+C).
 *
--- a/src/globals/internal-env.php
+++ b/src/globals/internal-env.php
@@ -22,7 +22,10 @@ define('BUILD_BIN_PATH', FileSystem::convertPath(is_string($a = getenv('BUILD_BI
 // output path for shared extensions
 define('BUILD_MODULES_PATH', FileSystem::convertPath(is_string($a = getenv('BUILD_MODULES_PATH')) ? $a : (BUILD_ROOT_PATH . '/modules')));

-define('PKG_ROOT_PATH', FileSystem::convertPath(is_string($a = getenv('PKG_ROOT_PATH')) ? $a : (WORKING_DIR . '/pkgroot')));
+// pkg arch name
+$_pkg_arch_name = arch2gnu(php_uname('m')) . '-' . strtolower(PHP_OS_FAMILY);
+define('PKG_ROOT_PATH', FileSystem::convertPath(is_string($a = getenv('PKG_ROOT_PATH')) ? $a : (WORKING_DIR . "/pkgroot/{$_pkg_arch_name}")));
+
 define('SOURCE_PATH', FileSystem::convertPath(is_string($a = getenv('SOURCE_PATH')) ? $a : (WORKING_DIR . '/source')));
 define('DOWNLOAD_PATH', FileSystem::convertPath(is_string($a = getenv('DOWNLOAD_PATH')) ? $a : (WORKING_DIR . '/downloads')));
 define('CPU_COUNT', match (PHP_OS_FAMILY) {
--- a/src/globals/patch/musl_static_readline.patch
+++ b/src/globals/patch/musl_static_readline.patch
@@ -0,0 +1,26 @@
+diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c
+index 31212999..d80a21c3 100644
+--- a/ext/readline/readline_cli.c
+++ b/ext/readline/readline_cli.c
+@@ -739,8 +739,8 @@ typedef cli_shell_callbacks_t *(__cdecl *get_cli_shell_callbacks)(void);
+ 	} while(0)
+ 
+ #else
+-/*
+ #ifdef COMPILE_DL_READLINE
+/*
+ This dlsym() is always used as even the CGI SAPI is linked against "CLI"-only
+ extensions. If that is being changed dlsym() should only be used when building
+ this extension sharedto offer compatibility.
+@@ -754,9 +754,9 @@ this extension sharedto offer compatibility.
+ 			(cb) = get_callbacks(); \
+ 		} \
+ 	} while(0)
+-/*#else
+#else
+ #define GET_SHELL_CB(cb) (cb) = php_cli_get_shell_callbacks()
+-#endif*/
+#endif
+ #endif
+ 
+ PHP_MINIT_FUNCTION(cli_readline)
--- a/src/globals/test-extensions.php
+++ b/src/globals/test-extensions.php
@@ -21,21 +21,20 @@ $test_php_version = [
    // 'git',
 ];

-// test os (macos-13, macos-14, macos-15, ubuntu-latest, windows-latest are available)
+// test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
 $test_os = [
-    'macos-13', // bin/spc for x86_64
-    // 'macos-14',  // bin/spc for arm64
+    'macos-15-intel', // bin/spc for x86_64
    'macos-15', // bin/spc for arm64
-    'ubuntu-latest', // bin/spc-alpine-docker for x86_64
-    'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
+    // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
+    // 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
    // 'ubuntu-24.04', // bin/spc for x86_64
-    'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
+    // 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
    // 'ubuntu-24.04-arm', // bin/spc for arm64
    // 'windows-latest', // .\bin\spc.ps1
 ];

 // whether enable thread safe
-$zts = true;
+$zts = false;

 $no_strip = false;

@@ -50,13 +49,13 @@ $prefer_pre_built = false;

 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'bcmath',
+    'Linux', 'Darwin' => 'pdo_pgsql',
    'Windows' => 'bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pdo,pdo_mysql,pdo_sqlite,phar,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip',
 };

 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
 $shared_extensions = match (PHP_OS_FAMILY) {
-    'Linux' => 'zip',
+    'Linux' => '',
    'Darwin' => '',
    'Windows' => '',
 };
@@ -156,17 +155,13 @@ if ($shared_extensions) {
    switch ($argv[2] ?? null) {
        case 'ubuntu-22.04':
        case 'ubuntu-22.04-arm':
+        case 'macos-15':
+        case 'macos-15-intel':
            $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
            break;
        case 'ubuntu-24.04':
        case 'ubuntu-24.04-arm':
            break;
-        case 'macos-13':
-        case 'macos-14':
-        case 'macos-15':
-            $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
-            $no_strip = true;
-            break;
        default:
            $shared_cmd = '';
            break;
--- a/tests/SPC/builder/BuilderTest.php
+++ b/tests/SPC/builder/BuilderTest.php
@@ -62,12 +62,6 @@ class BuilderTest extends TestCase
        $this->assertInstanceOf(Extension::class, $this->builder->getExt('mbregex'));
    }

-    public function testHasCpp()
-    {
-        // mbregex doesn't have cpp
-        $this->assertFalse($this->builder->hasCpp());
-    }
-
    public function testMakeExtensionArgs()
    {
        $this->assertStringContainsString('--enable-mbstring', $this->builder->makeStaticExtensionArgs());
@@ -160,7 +154,7 @@ class BuilderTest extends TestCase
            [BUILD_TARGET_MICRO, 'micro'],
            [BUILD_TARGET_EMBED, 'embed'],
            [BUILD_TARGET_FRANKENPHP, 'frankenphp'],
-            [BUILD_TARGET_ALL, 'cli, micro, fpm, embed, frankenphp'],
+            [BUILD_TARGET_ALL, 'cli, micro, fpm, embed, frankenphp, cgi'],
            [BUILD_TARGET_CLI | BUILD_TARGET_EMBED, 'cli, embed'],
        ];
    }
Author	SHA1	Message	Date
Jerry Ma	c5ae719b9c	Update src/SPC/builder/unix/library/postgresql.php Co-authored-by: Marc <m@pyc.ac>	2025-10-14 00:08:40 +08:00
crazywhalecc	7b6e707e24	Remove unnecessary macOS 15 bug CFLAGS from PostgreSQL build configuration	2025-10-14 00:08:40 +08:00
crazywhalecc	0114700dad	Fix PostgreSQL build compatibility for aarch64 on glibc 2.17 and update test configurations	2025-10-14 00:08:40 +08:00
Marc	ec9364db69	use latest zip version for building shared (#917 )	2025-10-13 11:28:16 +02:00
Marc	033e29985e	Merge branch 'main' into feature/shared-exts	2025-10-13 11:20:54 +02:00
Marc	61cba2342d	Drop macos-13 from actions runner (#922 )	2025-10-13 11:20:37 +02:00
Marc	a3acad4ef3	Update config/source.json	2025-10-13 10:59:31 +02:00
Marc	1e13eb4abe	Merge branch 'main' into ci/macos-15-intel	2025-10-13 10:38:48 +02:00
Jerry Ma	1bac06fe3c	Remove more macOS 14 case from shared extensions switch Yeah. Copied by tab.	2025-10-13 08:27:40 +08:00
Marc	762a768969	Merge branch 'main' into feature/shared-exts	2025-10-12 23:23:25 +02:00
Marc	d0a6e3a860	update pgsql version to 18.0, php 8.5 to RC2 (#916 )	2025-10-12 22:59:09 +02:00
henderkes	995187d258	extra information for steps	2025-10-12 22:32:27 +02:00
henderkes	5333a04e1c	clarification	2025-10-12 22:27:38 +02:00
henderkes	19be5263b5	add error	2025-10-12 22:26:06 +02:00
crazywhalecc	6e79401ab5	Add missing libs for suggested option defined	2025-10-13 00:21:13 +08:00
crazywhalecc	903036f1c0	Bump version	2025-10-13 00:00:31 +08:00
crazywhalecc	6bd3eea0fe	Use SPCConfigUtil for postgresql build, refactor patches	2025-10-12 23:54:59 +08:00
crazywhalecc	f28a3cf5a3	Drop macos-13 from actions runner	2025-10-12 22:33:22 +08:00
Marc	c828c2c6e4	Merge branch 'main' into feature/shared-exts	2025-10-12 11:35:57 +02:00
Marc	ae1193ab16	Merge branch 'main' into pgsql-18	2025-10-12 11:28:49 +02:00
Marc	6d6a29368e	fix building of shared extensions (grpc, simdjson, soap) (#905 )	2025-10-12 11:24:32 +02:00
crazywhalecc	897cb00351	Use failsafe for SPC_EXTRA_PHP_VARS	2025-10-12 16:42:38 +08:00
henderkes	8a1689b79d	don't fail build without ldap	2025-10-11 13:20:20 +02:00
henderkes	018dfae15e	suggestions	2025-10-11 10:38:51 +02:00
Marc	c83e803c85	Merge branch 'main' into pgsql-18	2025-10-10 18:47:48 +02:00
henderkes	fa4d33671d	update to RC2	2025-10-10 18:35:15 +02:00
Marc	e6408b4693	Fix static linux cli `-a` not working issue (#893 )	2025-10-08 11:37:27 +02:00
henderkes	3467c9d291	patch correct file	2025-10-06 22:53:41 +02:00
henderkes	15cd8543f1	arm64 fix	2025-10-06 22:50:37 +02:00
henderkes	864db0ebc5	fix macos finally I hope	2025-10-06 22:49:28 +02:00
henderkes	9ee623112d	attempt to fix macOS?	2025-10-06 22:43:03 +02:00
henderkes	d789b1a472	fix musl toolchain (needs LD_LIBRARY_PATH)	2025-10-06 22:31:23 +02:00
henderkes	17a25b44e2	attempt fix for aarch64 #2	2025-10-06 22:26:00 +02:00
henderkes	781260f3fc	attempt fix for aarch64	2025-10-06 22:11:17 +02:00
henderkes	6c43fa55b1	don't use -static, shared libraries cannot link against static musl libc and linking isn't done for static libraries yet	2025-10-06 21:37:36 +02:00
henderkes	c4440668bb	make sure -DFRONTEND is used	2025-10-06 21:28:57 +02:00
henderkes	e437bf2ffe	don't test macos 13	2025-10-06 21:05:05 +02:00
henderkes	0f2d2d5734	test pgsql without macos 13	2025-10-06 21:03:57 +02:00
henderkes	a49ae05599	use latest zip version for building shared	2025-10-06 21:00:45 +02:00
henderkes	8ae2755dbe	update php 8.5 to rc1	2025-10-06 20:14:52 +02:00
henderkes	3966bd5f0a	update pgsql version to 18.0	2025-10-06 20:06:37 +02:00
Marc	384ba54c79	update extension count (#914 )	2025-10-04 08:56:30 +02:00
Marc	26dbc922eb	update extension count we now sit at 101 🎉	2025-10-04 08:39:45 +02:00
henderkes	31a4498056	bring back simdjson tests, extension headers do not properly guard for avx512 symbols	2025-09-30 15:07:22 +02:00
henderkes	044275d909	typo	2025-09-30 14:22:38 +02:00
henderkes	c5316f9231	-v3 doesn't have avx512 yet	2025-09-30 14:21:31 +02:00
henderkes	2d1a61d184	explicitly disable avx512 if zig and march not high enough	2025-09-30 14:00:13 +02:00
henderkes	f7744188f4	fix configutil	2025-09-30 00:34:30 +02:00
henderkes	5b6c923eef	snappy is a c++ lib	2025-09-30 00:31:20 +02:00
henderkes	b0b031afb2	add docstring	2025-09-30 00:18:32 +02:00
henderkes	fe09d8c03e	add docstring	2025-09-30 00:17:53 +02:00
henderkes	c2813d5736	move hasCpp to SPCConfigUtil	2025-09-30 00:12:59 +02:00
Marc	8b2b658ced	Merge branch 'main' into fix/grpc-shared	2025-09-29 23:27:58 +02:00
henderkes	e862bacc8a	php 8.5 has beta 3	2025-09-29 21:15:56 +02:00
henderkes	cac57dbf79	php 8.5 has beta 3	2025-09-29 21:15:18 +02:00
crazywhalecc	345fe783cc	Add version table in docs	2025-09-24 15:46:54 +08:00
crazywhalecc	55efe6d65b	Add gnu-bulk	2025-09-24 15:46:54 +08:00
crazywhalecc	dccbc30972	update README	2025-09-24 15:46:54 +08:00
crazywhalecc	f914a82379	Add PHP version, remove duplicate desc	2025-09-24 15:46:54 +08:00
crazywhalecc	18979d8fb6	Simplify README	2025-09-24 15:46:54 +08:00
henderkes	21149f6807	simdjson needs patch	2025-09-23 12:42:29 +02:00
henderkes	93e6dcab1d	cflags and cxxflags separately	2025-09-23 12:01:09 +02:00
henderkes	59dedbea2c	simdjson requires +evex512 (for zig-cc)	2025-09-23 12:00:15 +02:00
henderkes	8bda4fd31e	simdjson requires +evex512	2025-09-23 11:59:30 +02:00
henderkes	8039ea49f9	soap requires libxml and session	2025-09-23 11:56:12 +02:00
henderkes	fc90b4ae23	allow appending pkg_config_path #910	2025-09-22 13:10:48 +02:00
henderkes	e02be69e40	update grpc from 1.68.x to 1.75.x	2025-09-21 21:01:07 +02:00
henderkes	35a90f2769	skip -mcpu or -march=armv8-... flags because zig doesn't support them (stupid grpc build thirdparty hardcode)	2025-09-21 20:32:47 +02:00
henderkes	fa87149631	shallow submodules as well (grpc download goes from 2.9 gb to 900mb)	2025-09-21 19:59:24 +02:00
Marc	8dfe722e14	Merge branch 'main' into fix/grpc-shared	2025-09-19 15:31:25 +02:00
henderkes	dcbfe1e0ab	e-dant/watcher is a c++ library too	2025-09-19 15:29:49 +02:00
Marc	e11946fd10	also install g++ with doctor (not preinstalled on ubuntu, not include… (#904 )	2025-09-19 15:22:17 +02:00
henderkes	44399cd185	remove -Wl,--as-needed for imagemagick build	2025-09-19 09:21:17 +02:00
henderkes	927d7f55ba	make sure -ldl is not taken as needed, problem on EL8	2025-09-18 22:47:01 +02:00
henderkes	e323d7b155	revert to private	2025-09-18 21:41:35 +02:00
henderkes	d0b253c346	not required	2025-09-18 21:36:38 +02:00
henderkes	81430e6853	also use libstdc++.a for grpc?	2025-09-18 21:29:46 +02:00
henderkes	83696e92b7	remove whitespace	2025-09-18 20:12:41 +02:00
henderkes	b0538c09bf	deduplicate those to make it more readable	2025-09-18 20:09:17 +02:00
henderkes	40f89d1dca	is shared_libadd enough?	2025-09-18 19:44:48 +02:00
henderkes	fa2e041cc9	test shared grpc, imagick	2025-09-18 19:01:10 +02:00
Marc	3c614663a3	Merge branch 'main' into fix/grpc-shared	2025-09-18 18:22:42 +02:00
henderkes	b5c7185374	add comment for new method	2025-09-18 18:20:26 +02:00
henderkes	d0a9a3a594	fix return of array	2025-09-18 18:17:48 +02:00
henderkes	2e6329bb86	add cpp-library for imagemagick too	2025-09-18 18:16:42 +02:00
henderkes	d3ba04fc5b	fix grpc shared build (ignores CXXFLAGS, needs CPPFLAGS)	2025-09-18 18:16:41 +02:00
Marc	7a78ea0185	Merge branch 'main' into fix/g++	2025-09-18 17:35:44 +02:00
henderkes	36b04f9eba	also install g++ with doctor (not preinstalled on ubuntu, not included in gcc package)	2025-09-18 17:24:08 +02:00
Marc	79ab6490fd	fix CustomPackage handling (#897 )	2025-09-18 13:37:26 +02:00
henderkes	191d345250	update paths to only install once	2025-09-18 12:41:36 +02:00
henderkes	311ee40ae4	update LinuxToolCheckList.php to install perl-Time-Piece to make openssl work	2025-09-18 11:58:58 +02:00
henderkes	808d224b08	build frankenphp before shared extensions again	2025-09-18 09:07:18 +02:00
Marc	4247883664	Merge branch 'main' into fix-zig	2025-09-18 08:06:23 +02:00
Marc	3198cc40c1	Remove icu backend from libxml2 (#903 )	2025-09-17 10:46:05 +02:00
Marc Henderkes	8680e83af3	fix dba building shared	2025-09-16 14:43:49 +02:00
Marc	0156f33a20	Merge branch 'main' into remove-icu-backend	2025-09-16 13:35:46 +02:00
Marc Henderkes	df8b2dbf16	better patching for libstdc++ when extensions forget they need it	2025-09-16 13:10:10 +02:00
Marc Henderkes	30e174ac95	use any available english locale instead of requiring en_US.utf-8	2025-09-16 13:10:09 +02:00
Marc Henderkes	b9f8f02d98	don't use libicu backend for libxml2 (it's discouraged from being used, the first path always goes through iconv, icu is only the fallback)	2025-09-16 13:10:09 +02:00
henderkes	0b0ae270da	we lost a v somehow	2025-09-10 23:35:17 +07:00
henderkes	893ce31b17	only install pkgs for crafting when necessary	2025-09-10 23:28:20 +07:00
crazywhalecc	e35d6c2651	Oh, we also support windows here	2025-09-09 19:43:08 +08:00
crazywhalecc	8dd0512335	Fix macOS lib-depends	2025-09-09 19:43:08 +08:00
henderkes	5c1194ea92	fix custompackage handling	2025-09-09 12:10:06 +07:00
Marc	953ed83df5	Merge pull request #896 from crazywhalecc/fix-zig Fix zig -isystem overriding	2025-09-08 11:00:03 +02:00
henderkes	c330d02e78	update pkg paths to not double the $arch-$os	2025-09-08 14:18:03 +07:00
henderkes	af6a23011c	fix zig relative directory	2025-09-08 13:33:44 +07:00
Abi أب	882ae07deb	libxml2 arg typo	2025-09-07 22:56:41 +08:00
crazywhalecc	be7c002869	Patch only when building cli	2025-09-07 16:10:50 +08:00
crazywhalecc	e621e4a5a1	test	2025-09-07 15:38:38 +08:00
crazywhalecc	bd815d4ea2	Fix static linux cli `-a` not working issue	2025-09-07 14:10:28 +08:00
crazywhalecc	4bc30b0b6f	Add php-src/config.log for SPCException	2025-09-07 11:50:51 +08:00
Marc	8d303348d9	Merge pull request #883 from crazywhalecc/sapi/cgi Add cgi support for macOS and Linux	2025-09-05 11:52:26 +02:00
Marc	2a2f4120b9	Merge pull request #889 from crazywhalecc/franken use our toolchain for go mod	2025-09-05 11:47:15 +02:00
Marc	15f8887f14	Update config/lib.json	2025-09-05 16:25:15 +07:00
crazywhalecc	fe945ab3ea	Merge branch 'main' into sapi/cgi # Conflicts: # composer.lock	2025-09-05 17:15:28 +08:00
crazywhalecc	e2b6f4cedd	Merge branch 'main' into sapi/cgi	2025-09-05 17:14:27 +08:00
Jerry Ma	d82c86cf62	Fix docker doctor fix pkgroot volume overwrite bug (#882 ) * Fix docker doctor fix pkgroot volume overwrite bug * cs fix * Remove pkgroot-private * Use arch-specified pkgroot * Update setup-runtime php version * Add docker-entrypoint.sh * Update dependencies * cs fix * test	2025-09-05 17:13:40 +08:00
henderkes	9df2867175	just always require libxml2 until we rework sapis to require their own stuff	2025-09-05 15:52:07 +07:00
henderkes	5c803d1553	fix cs	2025-09-05 15:31:30 +07:00
henderkes	d45b1853f8	fix cs	2025-09-05 15:28:51 +07:00
henderkes	1ac621fb9c	use our toolchain for go mod	2025-09-05 15:20:24 +07:00
crazywhalecc	4e74ac1937	test	2025-09-05 15:02:45 +08:00
crazywhalecc	959734ac31	cs fix	2025-09-05 11:17:45 +08:00
crazywhalecc	166f3de52f	Merge branch 'main' into feat/cgi	2025-09-05 11:17:34 +08:00
crazywhalecc	e3adfff16f	Update dependencies	2025-09-05 11:14:56 +08:00
crazywhalecc	7cbc374278	Add docker-entrypoint.sh	2025-09-05 11:04:42 +08:00
crazywhalecc	129041402d	Update setup-runtime php version	2025-09-05 11:00:57 +08:00
crazywhalecc	9ac578dfd6	Use arch-specified pkgroot	2025-09-05 11:00:46 +08:00
crazywhalecc	ef709a169b	Remove pkgroot-private	2025-09-05 11:00:25 +08:00
Marc	2eeba33f94	Merge pull request #885 from crazywhalecc/dumb_github switch getting frankenphp version to go mod (bypass rate limits)	2025-09-04 18:15:40 +02:00
henderkes	f4b2b9ae7d	fix cs	2025-09-04 17:45:13 +07:00
henderkes	e44efb2a54	use go mod to bypass github rate limiting	2025-09-04 17:42:17 +07:00
henderkes	598f6d55c5	keep retrying more	2025-09-04 16:28:17 +07:00
crazywhalecc	a2c5c7e6e6	Add cgi SAPI	2025-09-04 14:05:00 +08:00
crazywhalecc	4f6e646812	cs fix	2025-09-04 12:13:57 +08:00
crazywhalecc	a79564f685	Fix docker doctor fix pkgroot volume overwrite bug	2025-09-04 12:03:13 +08:00
crazywhalecc	a77e49cbc9	Stubborn phpstan	2025-09-02 00:17:44 +08:00
crazywhalecc	cefb737fd2	Update version to 2.7.3	2025-09-02 00:17:44 +08:00
crazywhalecc	8c8aba2dd5	Fix unixodbc driver config searching path	2025-09-02 00:17:44 +08:00
Marc	97b18e9121	Merge pull request #877 from crazywhalecc/franken-retries retry fetching frankenphp release info	2025-09-01 15:29:21 +02:00
gemini	ddc9cc2237	Fix cli generator: prefer-pre-built belongs to download-options rather than build-options	2025-09-01 20:44:37 +08:00
DubbleClick	aff803f334	retry fetching frankenphp release info	2025-09-01 19:07:29 +07:00