fix CustomPackage handling (#897)

(it's discouraged from being used, the first path always goes through iconv, icu is only the fallback)

.editorconfig

@@ -10,6 +10,7 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+indent_size = 2
 
-[*.{yml,yaml, vue}]
+[*.{yml,yaml,vue,ts}]
 indent_size = 2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,6 +3,15 @@ name: Bug report
 about: Build PHP or library failed, download failed, doesn't seem to work...
 title: ''
 labels: bug
-assignees: crazywhalecc
-
+body:
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: |
+        Please tell us what you do, what you get and what you expected.
+        Provide with some step-by-step instructions to reproduce the issue.
+        If possible, attach a screenshot or log files in ./log directory.
+    validations:
+      required: true
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,6 +3,6 @@ name: Feature request
 about: Suggest an idea for this project
 title: ''
 labels: new feature
-assignees: ''
+assignees: crazywhalecc
 
 ---

.github/workflows/ext-matrix-tests.yml

@@ -65,7 +65,7 @@ jobs:
           - sqlsrv
           - ssh2
           - swoole
-          - swoole,swoole-hook-pgsql,swoole-hook-mysql,swoole-hook-sqlite
+          - swoole,swoole-hook-pgsql,swoole-hook-mysql,swoole-hook-sqlite,swoole-hook-odbc
           - swow
           - sysvmsg,sysvsem,sysvshm
           - tidy

.github/workflows/release-build.yml

@@ -3,6 +3,10 @@ name: Build SPC Binary
 on:
   push:
     branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+    paths:
+      - '.github/workflows/release-build.yml'
   release:
     types:
       - published
@@ -10,7 +14,7 @@ on:
 
 env:
   PHP_VERSION: 8.4
-  MICRO_VERSION: 8.4.10
+  MICRO_VERSION: 8.4.11
 
 jobs:
   build-release-artifacts:
@@ -117,7 +121,8 @@ jobs:
           files: dist/${{ matrix.operating-system.filename }}
 
       - name: "Deploy to self-hosted OSS"
-        if: github.repository == 'crazywhalecc/static-php-cli'
+        # only run this step if the repository is static-php-cli and the branch is main
+        if: github.repository == 'crazywhalecc/static-php-cli' && github.ref == 'refs/heads/main'
         uses: static-php/upload-s3-action@v1.0.0
         with:
           aws_key_id: ${{ secrets.AWS_KEY_ID }}
@@ -132,3 +137,39 @@ jobs:
         with:
           path: spc${{ env.SUFFIX }}
           name: spc-${{ matrix.operating-system.name }}${{ env.SUFFIX }}
+  test-spc:
+    name: "Test SPC Binary for ${{ matrix.operating-system.name }}"
+    runs-on: ${{ matrix.operating-system.os }}
+    needs: [build-release-artifacts]
+    strategy:
+      matrix:
+        operating-system:
+          - name: "linux-x86_64"
+            os: "ubuntu-latest"
+          - name: "macos-x86_64"
+            os: "macos-13"
+          - name: "linux-aarch64"
+            os: "ubuntu-24.04-arm"
+          - name: "macos-aarch64"
+            os: "macos-latest"
+          - name: "windows-x64"
+            os: "windows-latest"
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
+
+      - name: "Download Artifact"
+        uses: actions/download-artifact@v4
+        env:
+          SUFFIX: ${{ matrix.operating-system.name == 'windows-x64' && '.exe' || '' }}
+        with:
+          name: spc-${{ matrix.operating-system.name }}${{ env.SUFFIX }}
+
+      - name: "Chmod"
+        if: matrix.operating-system.name != 'windows-x64'
+        run: chmod +x spc
+
+      - name: "Run SPC Tests"
+        env:
+          SUFFIX: ${{ matrix.operating-system.name == 'windows-x64' && '.exe' || '' }}
+        run: ./spc${{ env.SUFFIX }} dev:extensions

.github/workflows/tests.yml

@@ -145,6 +145,10 @@ jobs:
         os: ${{ fromJSON(needs.define-matrix.outputs.os) }}
       fail-fast: false
     steps:
+      - name: "Update runner packages"
+        if: ${{ startsWith(matrix.os, 'ubuntu-') }}
+        run: sudo apt-get update && sudo apt-get install -y ca-certificates
+
       - name: "Checkout"
         uses: actions/checkout@v4
 
@@ -202,6 +206,13 @@ jobs:
         if: ${{ !startsWith(matrix.os, 'windows-') }}
         run: php src/globals/test-extensions.php build_embed_cmd ${{ matrix.os }} ${{ matrix.php }}
 
+      - name: "Upload logs"
+        if: ${{ always() && hashFiles('log/**') != '' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-logs-${{ matrix.os }}-${{ matrix.php }}
+          path: log
+
 #      - name: Setup tmate session
 #        if: ${{ failure() }}
 #        uses: mxschmitt/action-tmate@v3

.github/workflows/vitepress-deploy.yml

@@ -21,7 +21,6 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
           cache: yarn
 
       - run: yarn install --frozen-lockfile

.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/
@@ -48,6 +49,12 @@ packlib_files.txt
 package-lock.json
 pnpm-lock.yaml
 
-# craft.log
-craft.log
+# craft
 craft.yml
+
+# SPC logs
+log/
+
+# spc.phar
+spc.phar
+spc.exe

README-zh.md

@@ -76,22 +76,23 @@ static-php-cli（简称 `spc`）有许多特性：
 
 当前支持编译的 PHP 版本：
 
-> :warning: 支持，但 static-php-cli 作者可能不再提供补丁修复
+> :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.2         | :heavy_check_mark: |                                              |
-| 8.3         | :heavy_check_mark: |                                              |
-| 8.4         | :heavy_check_mark: |                                              |
+| 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 官方对该版本的支持情况。
 
@@ -206,6 +207,7 @@ bin/spc --version
 - `--build-micro`：构建 phpmicro 自执行二进制
 - `--build-fpm`：构建 fpm
 - `--build-embed`：构建 embed（libphp）
+- `--build-cgi`: 构建 cgi（不推荐）
 - `--build-all`：构建所有
 
 如果出现了任何错误，可以使用 `--debug` 参数来展示完整的输出日志，以供排查错误：

README.md

@@ -83,7 +83,7 @@ Here is the supported OS and arch, where :octocat: represents support for GitHub
 
 Currently supported PHP versions for compilation: 
 
-> :warning: supported but not maintained by static-php-cli authors
+> :warning: Partial support, there may be issues with newer test versions or older versions.
 > 
 > :heavy_check_mark: supported
 > 
@@ -95,10 +95,11 @@ Currently supported PHP versions for compilation:
 | 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                                                               |
+| 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.
@@ -217,6 +218,7 @@ Now we support `cli`, `micro`, `fpm` and `embed` SAPI. You can use one or more o
 - `--build-micro`: build static phpmicro self-extracted executable
 - `--build-fpm`: build static fpm binary
 - `--build-embed`: build embed (libphp)
+- `--build-cgi`: build cgi binary (not recommended)
 - `--build-all`: build all
 
 If anything goes wrong, use `--debug` option to display full terminal output:

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 "$@"

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"
   ;;
 

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
@@ -104,6 +104,7 @@ RUN apk update; \
         m4 \
         make \
         pkgconfig \
+        re2c \
         wget \
         xz \
         gettext-dev \
@@ -121,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
 

bin/spc-gnu-docker

@@ -3,7 +3,7 @@
 set -e
 
 # This file is using docker to run commands
-SPC_DOCKER_VERSION=v4
+SPC_DOCKER_VERSION=v6
 
 # Detect docker can run
 if ! which docker >/dev/null; then
@@ -102,17 +102,21 @@ RUN curl -o cmake.tgz -#fSL https://github.com/Kitware/CMake/releases/download/v
     tar -xzf cmake.tgz -C /cmake --strip-components 1
 
 WORKDIR /app
-ADD ./src /app/src
 COPY ./composer.* /app/
 ADD ./bin/setup-runtime /app/bin/setup-runtime
 ADD ./bin/spc /app/bin/spc
 RUN /app/bin/setup-runtime
+ADD ./src /app/src
 RUN /app/bin/php /app/bin/composer install --no-dev
 ENV SPC_LIBC=glibc
 ENV PATH="/app/bin:/cmake/bin:/opt/rh/devtoolset-10/root/usr/bin:\$PATH"
 
-ADD ./config/env.ini /app/config/env.ini
+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
 
 RUN curl -o make.tgz -fsSL https://ftp.gnu.org/gnu/make/make-4.4.tar.gz && \
     tar -zxvf make.tgz && \
@@ -129,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
 

composer.json

@@ -16,14 +16,13 @@
         "symfony/console": "^5.4 || ^6 || ^7",
         "symfony/process": "^7.2",
         "symfony/yaml": "^7.2",
-        "zhamao/logger": "^1.0"
+        "zhamao/logger": "^1.1.3"
     },
     "require-dev": {
         "captainhook/captainhook-phar": "^5.23",
         "captainhook/hook-installer": "^1.0",
         "friendsofphp/php-cs-fixer": "^3.60",
         "humbug/box": "^4.5.0 || ^4.6.0",
-        "nunomaduro/collision": "^7.8",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^10.3 || ^9.5"
     },

config/env.ini

@@ -10,6 +10,7 @@
 ;
 ; Here's a list of env vars, these value cannot be changed anywhere:
 ;
+;   SPC_VERSION:        the version of static-php-cli.
 ;   WORKING_DIR:        the working directory of the build process. (default: `$(pwd)`)
 ;   ROOT_DIR:           the root directory of static-php-cli. (default: `/path/to/static-php-cli`, when running in phar or micro mode: `phar://path/to/spc.phar`)
 ;   BUILD_ROOT_PATH:    the root path of the build process. (default: `$(pwd)/buildroot`)
@@ -43,6 +44,8 @@ SPC_SKIP_PHP_VERSION_CHECK="no"
 SPC_SKIP_DOCTOR_CHECK_ITEMS=""
 ; extra modules that xcaddy will include in the FrankenPHP build
 SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES="--with github.com/dunglas/frankenphp/caddy --with github.com/dunglas/mercure/caddy --with github.com/dunglas/vulcain/caddy --with github.com/dunglas/caddy-cbrotli"
+; The display message for php version output (PHP >= 8.4 available)
+PHP_BUILD_PROVIDER="static-php-cli ${SPC_VERSION}"
 
 ; EXTENSION_DIR where the built php will look for extension when a .ini instructs to load them
 ; only useful for builds targeting not pure-static linking
@@ -100,7 +103,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}"
 
@@ -121,6 +124,8 @@ SPC_TARGET=native-macos
 ; compiler environments
 CC=clang
 CXX=clang++
+AR=ar
+LD=ld
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
 SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
 SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
@@ -132,7 +137,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}"
 

config/ext.json

@@ -414,9 +414,17 @@
             "libmemcached",
             "fastlz"
         ],
+        "lib-suggests": [
+            "zstd"
+        ],
         "ext-depends": [
             "session",
             "zlib"
+        ],
+        "ext-suggests": [
+            "igbinary",
+            "msgpack",
+            "session"
         ]
     },
     "mongodb": {
@@ -488,6 +496,7 @@
     "opcache": {
         "type": "builtin",
         "arg-type-unix": "custom",
+        "arg-type-windows": "enable",
         "zend-extension": true
     },
     "openssl": {
@@ -530,9 +539,10 @@
         },
         "notes": true,
         "type": "builtin",
-        "arg-type": "with-path",
+        "arg-type": "custom",
         "lib-depends": [
-            "libargon2"
+            "libargon2",
+            "openssl"
         ]
     },
     "pcntl": {
@@ -692,7 +702,8 @@
         "arg-type": "custom",
         "ext-suggests": [
             "session",
-            "igbinary"
+            "igbinary",
+            "msgpack"
         ],
         "lib-suggests-unix": [
             "zstd",
@@ -839,14 +850,23 @@
             "nghttp2",
             "zlib"
         ],
+        "lib-suggests": [
+            "zstd"
+        ],
+        "lib-suggests-linux": [
+            "zstd",
+            "liburing"
+        ],
         "ext-depends": [
             "openssl",
             "curl"
         ],
         "ext-suggests": [
+            "sockets",
             "swoole-hook-pgsql",
             "swoole-hook-mysql",
-            "swoole-hook-sqlite"
+            "swoole-hook-sqlite",
+            "swoole-hook-odbc"
         ]
     },
     "swoole-hook-mysql": {
@@ -856,11 +876,12 @@
         },
         "notes": true,
         "type": "addon",
-        "arg-type": "custom",
+        "arg-type": "none",
         "ext-depends": [
             "mysqlnd",
             "pdo",
-            "pdo_mysql"
+            "pdo_mysql",
+            "swoole"
         ],
         "ext-suggests": [
             "mysqli"
@@ -874,10 +895,11 @@
         },
         "notes": true,
         "type": "addon",
-        "arg-type": "custom",
+        "arg-type": "none",
         "ext-depends": [
             "pgsql",
-            "pdo"
+            "pdo",
+            "swoole"
         ]
     },
     "swoole-hook-sqlite": {
@@ -887,10 +909,27 @@
         },
         "notes": true,
         "type": "addon",
-        "arg-type": "custom",
+        "arg-type": "none",
         "ext-depends": [
             "sqlite3",
-            "pdo"
+            "pdo",
+            "swoole"
+        ]
+    },
+    "swoole-hook-odbc": {
+        "support": {
+            "Windows": "no",
+            "BSD": "wip"
+        },
+        "notes": true,
+        "type": "addon",
+        "arg-type": "none",
+        "ext-depends": [
+            "pdo",
+            "swoole"
+        ],
+        "lib-depends": [
+            "unixodbc"
         ]
     },
     "swow": {

config/lib.json

@@ -1,9 +1,6 @@
 {
     "lib-base": {
-        "type": "root",
-        "lib-depends-unix": [
-            "pkg-config"
-        ]
+        "type": "root"
     },
     "php": {
         "type": "root",
@@ -12,8 +9,19 @@
             "lib-base",
             "micro"
         ],
+        "lib-depends-macos": [
+            "lib-base",
+            "micro",
+            "libxml2"
+        ],
         "lib-suggests-linux": [
-            "libacl"
+            "libacl",
+            "brotli",
+            "watcher"
+        ],
+        "lib-suggests-macos": [
+            "brotli",
+            "watcher"
         ]
     },
     "micro": {
@@ -444,6 +452,7 @@
     },
     "libmemcached": {
         "source": "libmemcached",
+        "cpp-library": true,
         "static-libs-unix": [
             "libmemcached.a",
             "libmemcachedprotocol.a",
@@ -588,7 +597,6 @@
         ],
         "lib-suggests-unix": [
             "xz",
-            "icu",
             "zlib"
         ],
         "lib-depends-windows": [
@@ -797,6 +805,12 @@
             "depot.h"
         ]
     },
+    "re2c": {
+        "source": "re2c",
+        "bin-unix": [
+            "re2c"
+        ]
+    },
     "readline": {
         "source": "readline",
         "static-libs-unix": [
@@ -913,5 +927,20 @@
             "zstd.h",
             "zstd_errors.h"
         ]
+    },
+    "liburing": {
+        "source": "liburing",
+        "pkg-configs": [
+            "liburing",
+            "liburing-ffi"
+        ],
+        "static-libs-linux": [
+            "liburing.a",
+            "liburing-ffi.a"
+        ],
+        "headers-linux": [
+            "liburing/",
+            "liburing.h"
+        ]
     }
 }

config/pkg.json

@@ -1,4 +1,16 @@
 {
+    "go-xcaddy-aarch64-linux": {
+        "type": "custom"
+    },
+    "go-xcaddy-aarch64-macos": {
+        "type": "custom"
+    },
+    "go-xcaddy-x86_64-linux": {
+        "type": "custom"
+    },
+    "go-xcaddy-x86_64-macos": {
+        "type": "custom"
+    },
     "musl-toolchain-aarch64-linux": {
         "type": "url",
         "url": "https://dl.static-php.dev/static-php-cli/deps/musl-toolchain/aarch64-musl-toolchain.tgz"
@@ -15,6 +27,38 @@
             "nasm-2.16.01/ndisasm.exe": "{php_sdk_path}/bin/ndisasm.exe"
         }
     },
+    "pkg-config-aarch64-linux": {
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-aarch64-linux-musl-1.2.5.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
+    },
+    "pkg-config-aarch64-macos": {
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-aarch64-darwin.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
+    },
+    "pkg-config-x86_64-linux": {
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-x86_64-linux-musl-1.2.5.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
+    },
+    "pkg-config-x86_64-macos": {
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-x86_64-darwin.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
+    },
     "strawberry-perl-x86_64-win": {
         "type": "url",
         "url": "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip"
@@ -43,30 +87,18 @@
             "upx-*-win64/upx.exe": "{pkg_root_path}/bin/upx.exe"
         }
     },
-    "go-xcaddy-x86_64-linux": {
+    "zig-aarch64-linux": {
         "type": "custom"
     },
-    "go-xcaddy-aarch64-linux": {
-        "type": "custom"
-    },
-    "go-xcaddy-x86_64-macos": {
-        "type": "custom"
-    },
-    "go-xcaddy-aarch64-macos": {
+    "zig-aarch64-macos": {
         "type": "custom"
     },
     "zig-x86_64-linux": {
         "type": "custom"
     },
-    "zig-aarch64-linux": {
-        "type": "custom"
-    },
     "zig-x86_64-macos": {
         "type": "custom"
     },
-    "zig-aarch64-macos": {
-        "type": "custom"
-    },
     "zig-x86_64-win": {
         "type": "custom"
     }

config/source.json

@@ -733,7 +733,7 @@
     "micro": {
         "type": "git",
         "path": "php-src/sapi/micro",
-        "rev": "84beta",
+        "rev": "php-85-win",
         "url": "https://github.com/static-php/phpmicro",
         "license": {
             "type": "file",
@@ -932,6 +932,20 @@
             "path": "LICENSE"
         }
     },
+    "re2c": {
+        "type": "ghrel",
+        "repo": "skvadrik/re2c",
+        "match": "re2c.+\\.tar\\.xz",
+        "prefer-stable": true,
+        "alt": {
+            "type": "url",
+            "url": "https://dl.static-php.dev/static-php-cli/deps/re2c/re2c-4.3.tar.xz"
+        },
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "readline": {
         "type": "filelist",
         "url": "https://ftp.gnu.org/pub/gnu/readline/",
@@ -998,6 +1012,7 @@
         "path": "php-src/ext/swoole",
         "type": "ghtar",
         "repo": "swoole/swoole-src",
+        "match": "v6\\.+",
         "prefer-stable": true,
         "license": {
             "type": "file",
@@ -1121,5 +1136,14 @@
             "type": "file",
             "path": "LICENSE"
         }
+    },
+    "liburing": {
+        "type": "ghtar",
+        "repo": "axboe/liburing",
+        "prefer-stable": true,
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
     }
 }

docs/.vitepress/config.ts

@@ -51,6 +51,14 @@ export default {
     footer: {
       message: 'Released under the MIT License.',
       copyright: 'Copyright © 2023-present crazywhalecc'
-    }
+    },
+    search: {
+      provider: 'algolia',
+      options: {
+        appId: 'IHJHUB1SF1',
+        apiKey: '8266d31cc2ffbd0e059f1c6e5bdaf8fc',
+        indexName: 'static-php docs',
+      },
+    },
   }
 }

docs/en/guide/extension-notes.md

@@ -46,6 +46,14 @@ If you use `swoole,swoole-hook-sqlite`, you will enable the coroutine mode of Sw
 swoole-hook-sqlite conflicts with the `pdo_sqlite` extension. If you want to use Swoole and `pdo_sqlite`, please delete the pdo_sqlite extension and enable `swoole` and `swoole-hook-sqlite`.
 This extension contains an implementation of the coroutine environment for `pdo_sqlite`.
 
+## swoole-hook-odbc
+
+swoole-hook-odbc is not an extension, it's a Hook feature of Swoole.
+If you use `swoole,swoole-hook-odbc`, you will enable the coroutine mode of Swoole's `odbc` extension.
+
+swoole-hook-odbc conflicts with the `pdo_odbc` extension. If you want to use Swoole and `pdo_odbc`, please delete the `pdo_odbc` extension and enable `swoole` and `swoole-hook-odbc`.
+This extension contains an implementation of the coroutine environment for `pdo_odbc`.
+
 ## swow
 
 1. Only PHP 8.0+ is supported.

docs/en/guide/index.md

@@ -32,7 +32,7 @@ Windows currently only supports the x86_64 architecture, and does not support 32
 
 ## Supported PHP Version
 
-Currently, static php cli supports PHP versions 8.1 to 8.4, and theoretically supports PHP 8.0 and earlier versions. 
+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.

docs/en/guide/manual-build.md

@@ -172,7 +172,7 @@ If the build is successful, you will see the `buildroot/bin` directory in the cu
 If the build fails, you can use the `--debug` parameter to view detailed error information, 
 or use the `--with-clean` to clear the old compilation results and recompile.
 
-If the build still fails to use the above method, please submit an issue and attach your `craft.yml` and `craft.log`.
+If the build still fails to use the above method, please submit an issue and attach your `craft.yml` and `./log` archive.
 
 ## Step-by-step build command
 
@@ -242,8 +242,8 @@ Also, it is available when downloading with the `--for-extensions` option.
 
 
 ```bash
-# Specifying to download a beta version of PHP8.3
-bin/spc download --all -U "php-src:https://downloads.php.net/~eric/php-8.3.0beta1.tar.gz"
+# Specifying to download a alpha version of PHP 8.5
+bin/spc download --all -U "php-src:https://downloads.php.net/~edorian/php-8.5.0alpha2.tar.xz"
 
 # Specifying to download an older version of the curl library
 bin/spc download --all -U "curl:https://curl.se/download/curl-7.88.1.tar.gz"
@@ -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

docs/zh/guide/extension-notes.md

@@ -43,6 +43,14 @@ swoole-hook-sqlite 不是一个扩展，而是 Swoole 的 Hook 特性。
 swoole-hook-sqlite 与 `pdo_sqlite` 扩展冲突。如需使用 Swoole 和 `pdo_sqlite`，请删除 pdo_sqlite 扩展，启用 `swoole` 和 `swoole-hook-sqlite` 即可。
 该扩展包含了 `pdo_sqlite` 的协程环境的实现。
 
+## swoole-hook-odbc
+
+swoole-hook-odbc 不是一个扩展，而是 Swoole 的 Hook 特性。
+如果你在编译时添加了 `swoole,swoole-hook-odbc`，你将启用 Swoole 的 `odbc` 扩展的协程模式。
+
+swoole-hook-odbc 与 `pdo_odbc` 扩展冲突。如需使用 Swoole 和 `pdo_odbc`，请删除 `pdo_odbc` 扩展，启用 `swoole` 和 `swoole-hook-odbc` 即可。
+该扩展包含了 `pdo_odbc` 的协程环境的实现。
+
 ## swow
 
 1. swow 仅支持 PHP 8.0+ 版本。

docs/zh/guide/index.md

@@ -29,6 +29,6 @@ Windows 目前只支持 x86_64 架构，不支持 32 位 x86、不支持 arm64
 
 ## PHP 支持版本
 
-目前，static-php-cli 对 PHP 8.1 ~ 8.4 版本是支持的，对于 PHP 8.0 及更早版本理论上支持，只需下载时选择早期版本即可。
+目前，static-php-cli 对 PHP 8.1 ~ 8.5 版本是支持的，对于 PHP 8.0 及更早版本理论上支持，只需下载时选择早期版本即可。
 但由于部分扩展和特殊组件已对早期版本的 PHP 停止了支持，所以 static-php-cli 不会明确支持早期版本。
 我们推荐你编译尽可能新的 PHP 版本，以获得更好的体验。

docs/zh/guide/manual-build.md

@@ -149,7 +149,7 @@ bin/spc craft --debug
 
 如果中途构建出错，你可以使用 `--debug` 参数查看详细的错误信息，或者使用 `--with-clean` 参数清除旧的编译结果，重新编译。
 
-如使用以上方式仍构建失败，请提交一个 issue，附上你的 `craft.yml`、`craft.log`。
+如使用以上方式仍构建失败，请提交一个 issue，附上你的 `craft.yml` 文件、`log/` 目录的压缩包。
 
 ## 分步构建命令
 
@@ -209,8 +209,8 @@ bin/spc download --from-zip=/path/to/your/download.zip
 让下载器强制使用你指定的链接下载此 source 的包。使用方法为 `{source-name}:{url}` 即可，可同时重写多个库的下载地址。在使用 `--for-extensions` 选项下载时同样可用。
 
 ```bash
-# 例如：指定下载测试版的 PHP8.3
-bin/spc download --all -U "php-src:https://downloads.php.net/~eric/php-8.3.0beta1.tar.gz"
+# 例如：指定下载 Alpha 版的 PHP8.5
+bin/spc download --all -U "php-src:https://downloads.php.net/~edorian/php-8.5.0alpha2.tar.xz"
 
 # 指定下载旧版本的 curl 库
 bin/spc download --all -U "curl:https://curl.se/download/curl-7.88.1.tar.gz"
@@ -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) 二进制

phpstan.neon

@@ -8,6 +8,8 @@ parameters:
     - '#class Fiber#'
     - '#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:

src/SPC/ConsoleApplication.php

@@ -34,7 +34,7 @@ use Symfony\Component\Console\Application;
  */
 final class ConsoleApplication extends Application
 {
-    public const VERSION = '2.7.0';
+    public const string VERSION = '2.7.4';
 
     public function __construct()
     {

src/SPC/builder/BuilderBase.php

@@ -4,18 +4,16 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
-use PharIo\FileSystem\File;
-use SPC\exception\ExceptionHandler;
-use SPC\exception\FileSystemException;
+use SPC\exception\BuildFailureException;
 use SPC\exception\InterruptException;
-use SPC\exception\RuntimeException;
 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\CustomExt;
+use SPC\util\AttributeMapper;
 
 abstract class BuilderBase
 {
@@ -46,20 +44,14 @@ abstract class BuilderBase
     /**
      * Convert libraries to class
      *
-     * @param  array<string>       $sorted_libraries Libraries to build (if not empty, must sort first)
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
+     * @param array<string> $sorted_libraries Libraries to build (if not empty, must sort first)
+     *
      * @internal
      */
     abstract public function proveLibs(array $sorted_libraries);
 
     /**
      * Set-Up libraries
-     *
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
      */
     public function setupLibs(): void
     {
@@ -70,12 +62,11 @@ abstract class BuilderBase
             match ($status) {
                 LIB_STATUS_OK => logger()->info('lib [' . $lib::NAME . '] setup success, took ' . round(microtime(true) - $starttime, 2) . ' s'),
                 LIB_STATUS_ALREADY => logger()->notice('lib [' . $lib::NAME . '] already built'),
-                LIB_STATUS_BUILD_FAILED => logger()->error('lib [' . $lib::NAME . '] build failed'),
                 LIB_STATUS_INSTALL_FAILED => logger()->error('lib [' . $lib::NAME . '] install failed'),
                 default => logger()->warning('lib [' . $lib::NAME . '] build status unknown'),
             };
             if (in_array($status, [LIB_STATUS_BUILD_FAILED, LIB_STATUS_INSTALL_FAILED])) {
-                throw new RuntimeException('Library [' . $lib::NAME . '] setup failed.');
+                throw new BuildFailureException('Library [' . $lib::NAME . '] setup failed.');
             }
         }
     }
@@ -139,9 +130,6 @@ abstract class BuilderBase
 
     /**
      * Check if there is a cpp extensions or libraries.
-     *
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function hasCpp(): bool
     {
@@ -174,15 +162,10 @@ abstract class BuilderBase
     /**
      * Verify the list of "ext" extensions for validity and declare an Extension object to check the dependencies of the extensions.
      *
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws \ReflectionException
-     * @throws \Throwable|WrongUsageException
      * @internal
      */
     public function proveExts(array $static_extensions, array $shared_extensions = [], bool $skip_check_deps = false, bool $skip_extract = false): void
     {
-        CustomExt::loadCustomExt();
         // judge ext
         foreach ($static_extensions as $ext) {
             // if extension does not support static build, throw exception
@@ -213,7 +196,7 @@ abstract class BuilderBase
         }
 
         foreach ([...$static_extensions, ...$shared_extensions] as $extension) {
-            $class = CustomExt::getExtClass($extension);
+            $class = AttributeMapper::getExtensionClassByName($extension) ?? Extension::class;
             /** @var Extension $ext */
             $ext = new $class($extension, $this);
             if (in_array($extension, $static_extensions)) {
@@ -248,9 +231,7 @@ abstract class BuilderBase
     abstract public function testPHP(int $build_target = BUILD_TARGET_NONE);
 
     /**
-     * @throws WrongUsageException
-     * @throws RuntimeException
-     * @throws FileSystemException
+     * Build shared extensions.
      */
     public function buildSharedExts(): void
     {
@@ -273,9 +254,8 @@ abstract class BuilderBase
                 }
                 $ext->buildShared();
             }
-        } catch (RuntimeException $e) {
+        } finally {
             FileSystem::replaceFileLineContainsString(BUILD_BIN_PATH . '/php-config', 'extension_dir=', $extension_dir_line);
-            throw $e;
         }
         FileSystem::replaceFileLineContainsString(BUILD_BIN_PATH . '/php-config', 'extension_dir=', $extension_dir_line);
         FileSystem::replaceFileStr(BUILD_LIB_PATH . '/php/build/phpize.m4', '# test "[$]$1" = "no" && $1=yes', 'test "[$]$1" = "no" && $1=yes');
@@ -284,19 +264,16 @@ abstract class BuilderBase
     /**
      * Generate extension enable arguments for configure.
      * e.g. --enable-mbstring
-     *
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function makeStaticExtensionArgs(): string
     {
         $ret = [];
         foreach ($this->getExts() as $ext) {
-            $arg = $ext->getConfigureArg();
+            $arg = null;
             if ($ext->isBuildShared() && !$ext->isBuildStatic()) {
                 if (
                     (Config::getExt($ext->getName(), 'type') === 'builtin' &&
-                    !file_exists(SOURCE_PATH . '/php-src/ext/' . $ext->getName() . '/config.m4')) ||
+                        !file_exists(SOURCE_PATH . '/php-src/ext/' . $ext->getName() . '/config.m4')) ||
                     Config::getExt($ext->getName(), 'build-with-php') === true
                 ) {
                     $arg = $ext->getConfigureArg(true);
@@ -304,6 +281,7 @@ abstract class BuilderBase
                     continue;
                 }
             }
+            $arg ??= $ext->getConfigureArg();
             logger()->info($ext->getName() . ' is using ' . $arg);
             $ret[] = trim($arg);
         }
@@ -321,9 +299,6 @@ abstract class BuilderBase
 
     /**
      * Get PHP Version ID from php-src/main/php_version.h
-     *
-     * @throws RuntimeException
-     * @throws WrongUsageException
      */
     public function getPHPVersionID(): int
     {
@@ -336,20 +311,25 @@ abstract class BuilderBase
             return intval($match[1]);
         }
 
-        throw new RuntimeException('PHP version file format is malformed, please remove it and download again');
+        throw new WrongUsageException('PHP version file format is malformed, please remove "./source/php-src" dir and download/extract again');
     }
 
-    public function getPHPVersion(): string
+    public function getPHPVersion(bool $exception_on_failure = true): string
     {
         if (!file_exists(SOURCE_PATH . '/php-src/main/php_version.h')) {
+            if (!$exception_on_failure) {
+                return 'unknown';
+            }
             throw new WrongUsageException('PHP source files are not available, you need to download them first');
         }
         $file = file_get_contents(SOURCE_PATH . '/php-src/main/php_version.h');
         if (preg_match('/PHP_VERSION "(.*)"/', $file, $match) !== 0) {
             return $match[1];
         }
-
-        throw new RuntimeException('PHP version file format is malformed, please remove it and download again');
+        if (!$exception_on_failure) {
+            return 'unknown';
+        }
+        throw new WrongUsageException('PHP version file format is malformed, please remove it and download again');
     }
 
     /**
@@ -366,7 +346,7 @@ abstract class BuilderBase
             }
             $file = LockFile::getLockFullPath($lock);
         }
-        if (preg_match('/php-(\d+\.\d+\.\d+(?:RC\d+)?)\.tar\.(?:gz|bz2|xz)/', $file, $match)) {
+        if (preg_match('/php-(\d+\.\d+\.\d+(?:RC\d+|alpha\d+|beta\d+)?)\.tar\.(?:gz|bz2|xz)/', $file, $match)) {
             return $match[1];
         }
         return false;
@@ -413,6 +393,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);
     }
 
@@ -496,7 +479,7 @@ abstract class BuilderBase
         foreach ($patches as $patch) {
             try {
                 if (!file_exists($patch)) {
-                    throw new RuntimeException("Additional patch script file {$patch} not found!");
+                    throw new WrongUsageException("Additional patch script file {$patch} not found!");
                 }
                 logger()->debug('Running additional patch script: ' . $patch);
                 require $patch;
@@ -509,11 +492,6 @@ abstract class BuilderBase
                 exit($e->getCode());
             } catch (\Throwable $e) {
                 logger()->critical('Patch script ' . $patch . ' failed to run.');
-                if ($this->getOption('debug')) {
-                    ExceptionHandler::getInstance()->handle($e);
-                } else {
-                    logger()->critical('Please check with --debug option to see more details.');
-                }
                 throw $e;
             }
         }
@@ -530,8 +508,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");
             }

src/SPC/builder/BuilderProvider.php

@@ -8,8 +8,7 @@ use SPC\builder\freebsd\BSDBuilder;
 use SPC\builder\linux\LinuxBuilder;
 use SPC\builder\macos\MacOSBuilder;
 use SPC\builder\windows\WindowsBuilder;
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
+use SPC\exception\ExceptionHandler;
 use SPC\exception\WrongUsageException;
 use Symfony\Component\Console\Input\InputInterface;
 
@@ -20,11 +19,6 @@ class BuilderProvider
 {
     private static ?BuilderBase $builder = null;
 
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
     public static function makeBuilderByInput(InputInterface $input): BuilderBase
     {
         ini_set('memory_limit', '4G');
@@ -36,12 +30,13 @@ class BuilderProvider
             'BSD' => new BSDBuilder($input->getOptions()),
             default => throw new WrongUsageException('Current OS "' . PHP_OS_FAMILY . '" is not supported yet'),
         };
+
+        // bind the builder to ExceptionHandler
+        ExceptionHandler::bindBuilder(self::$builder);
+
         return self::$builder;
     }
 
-    /**
-     * @throws WrongUsageException
-     */
     public static function getBuilder(): BuilderBase
     {
         if (self::$builder === null) {

src/SPC/builder/Extension.php

@@ -4,11 +4,15 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
+use SPC\exception\EnvironmentException;
 use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
+use SPC\exception\SPCException;
+use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
+use SPC\toolchain\ClangNativeToolchain;
+use SPC\toolchain\GccNativeToolchain;
 use SPC\toolchain\ToolchainManager;
 use SPC\toolchain\ZigToolchain;
 use SPC\util\SPCConfigUtil;
@@ -24,21 +28,16 @@ class Extension
 
     protected string $source_dir;
 
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
     public function __construct(protected string $name, protected BuilderBase $builder)
     {
         $ext_type = Config::getExt($this->name, 'type');
         $unix_only = Config::getExt($this->name, 'unix-only', false);
         $windows_only = Config::getExt($this->name, 'windows-only', false);
         if (PHP_OS_FAMILY !== 'Windows' && $windows_only) {
-            throw new RuntimeException("{$ext_type} extension {$name} is not supported on Linux and macOS platform");
+            throw new EnvironmentException("{$ext_type} extension {$name} is not supported on Linux and macOS platform");
         }
         if (PHP_OS_FAMILY === 'Windows' && $unix_only) {
-            throw new RuntimeException("{$ext_type} extension {$name} is not supported on Windows platform");
+            throw new EnvironmentException("{$ext_type} extension {$name} is not supported on Windows platform");
         }
         // set source_dir for builtin
         if ($ext_type === 'builtin') {
@@ -46,7 +45,7 @@ class Extension
         } elseif ($ext_type === 'external') {
             $source = Config::getExt($this->name, 'source');
             if ($source === null) {
-                throw new RuntimeException("{$ext_type} extension {$name} source not found");
+                throw new ValidationException("{$ext_type} extension {$name} source not found", validation_module: "Extension [{$name}] loader");
             }
             $source_path = Config::getSource($source)['path'] ?? null;
             $source_path = $source_path === null ? SOURCE_PATH . '/' . $source : SOURCE_PATH . '/' . $source_path;
@@ -63,9 +62,6 @@ class Extension
 
     /**
      * 获取开启该扩展的 PHP 编译添加的参数
-     *
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function getConfigureArg(bool $shared = false): string
     {
@@ -80,9 +76,6 @@ class Extension
 
     /**
      * 根据 ext 的 arg-type 获取对应开启的参数，一般都是 --enable-xxx 和 --with-xxx
-     *
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function getEnableArg(bool $shared = false): string
     {
@@ -112,10 +105,6 @@ class Extension
 
     /**
      * 检查下依赖就行了，作用是导入依赖给 Extension 对象，今后可以对库依赖进行选择性处理
-     *
-     * @throws RuntimeException
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function checkDependency(): static
     {
@@ -183,6 +172,14 @@ class Extension
         return false;
     }
 
+    /**
+     * Patch code before ./configure.bat for Windows
+     */
+    public function patchBeforeWindowsConfigure(): bool
+    {
+        return false;
+    }
+
     /**
      * Patch code before make
      * If you need to patch some code, overwrite this
@@ -251,8 +248,6 @@ class Extension
      *                i.e.; pdo_pgsql would return:
      *
      * `-d "extension=pgsql" -d "extension=pdo_pgsql"`
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function getSharedExtensionLoadString(): string
     {
@@ -260,12 +255,15 @@ class Extension
         $order = [];
 
         $resolve = function ($extension) use (&$resolve, &$loaded, &$order) {
+            if (!$extension instanceof Extension) {
+                return;
+            }
             if (isset($loaded[$extension->getName()])) {
                 return;
             }
             $loaded[$extension->getName()] = true;
 
-            foreach ($this->dependencies as $dependency) {
+            foreach ($extension->dependencies as $dependency) {
                 $resolve($dependency);
             }
 
@@ -277,6 +275,9 @@ class Extension
         $ret = '';
         foreach ($order as $ext) {
             if ($ext instanceof self && $ext->isBuildShared()) {
+                if (Config::getExt($ext->getName(), 'type', false) === 'addon') {
+                    continue;
+                }
                 if (Config::getExt($ext->getName(), 'zend-extension', false) === true) {
                     $ret .= " -d \"zend_extension={$ext->getName()}\"";
                 } else {
@@ -292,20 +293,16 @@ class Extension
         return $ret;
     }
 
-    /**
-     * @throws RuntimeException
-     */
     public function runCliCheckUnix(): void
     {
         // Run compile check if build target is cli
         // If you need to run some check, overwrite this or add your assert in src/globals/ext-tests/{extension_name}.php
-        // If check failed, throw RuntimeException
         $sharedExtensions = $this->getSharedExtensionLoadString();
         [$ret, $out] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' --ri "' . $this->getDistName() . '"');
         if ($ret !== 0) {
-            throw new RuntimeException(
-                'extension ' . $this->getName() . ' failed runtime check: php-cli returned ' . $ret . "\n" .
-                join("\n", $out)
+            throw new ValidationException(
+                "extension {$this->getName()} failed compile check: php-cli returned {$ret}",
+                validation_module: 'Extension ' . $this->getName() . ' sanity check'
             );
         }
 
@@ -319,23 +316,21 @@ class Extension
 
             [$ret, $out] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' -r "' . trim($test) . '"');
             if ($ret !== 0) {
-                var_dump($out);
-                throw new RuntimeException('extension ' . $this->getName() . ' failed sanity check');
+                throw new ValidationException(
+                    "extension {$this->getName()} failed sanity check. Code: {$ret}, output: " . implode("\n", $out),
+                    validation_module: 'Extension ' . $this->getName() . ' function check'
+                );
             }
         }
     }
 
-    /**
-     * @throws RuntimeException
-     */
     public function runCliCheckWindows(): void
     {
         // Run compile check if build target is cli
         // If you need to run some check, overwrite this or add your assert in src/globals/ext-tests/{extension_name}.php
-        // If check failed, throw RuntimeException
         [$ret] = cmd()->execWithResult(BUILD_ROOT_PATH . '/bin/php.exe -n --ri "' . $this->getDistName() . '"', false);
         if ($ret !== 0) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret);
+            throw new ValidationException("extension {$this->getName()} failed compile check: php-cli returned {$ret}", validation_module: "Extension {$this->getName()} sanity check");
         }
 
         if (file_exists(FileSystem::convertPath(ROOT_DIR . '/src/globals/ext-tests/' . $this->getName() . '.php'))) {
@@ -348,7 +343,10 @@ class Extension
 
             [$ret] = cmd()->execWithResult(BUILD_ROOT_PATH . '/bin/php.exe -n -r "' . trim($test) . '"');
             if ($ret !== 0) {
-                throw new RuntimeException('extension ' . $this->getName() . ' failed sanity check');
+                throw new ValidationException(
+                    "extension {$this->getName()} failed function check",
+                    validation_module: "Extension {$this->getName()} function check"
+                );
             }
         }
     }
@@ -360,50 +358,50 @@ class Extension
 
     /**
      * Build shared extension
-     *
-     * @throws WrongUsageException
-     * @throws RuntimeException
      */
-    public function buildShared(): void
+    public function buildShared(array $visited = []): void
     {
-        if (Config::getExt($this->getName(), 'type') === 'builtin' || Config::getExt($this->getName(), 'build-with-php') === true) {
+        try {
+            if (Config::getExt($this->getName(), 'type') === 'builtin' || Config::getExt($this->getName(), 'build-with-php') === true) {
+                if (file_exists(BUILD_MODULES_PATH . '/' . $this->getName() . '.so')) {
+                    logger()->info('Shared extension [' . $this->getName() . '] was already built by php-src/configure (' . $this->getName() . '.so)');
+                    return;
+                }
+                if (Config::getExt($this->getName(), 'build-with-php') === true) {
+                    logger()->warning('Shared extension [' . $this->getName() . '] did not build with php-src/configure (' . $this->getName() . '.so)');
+                    logger()->warning('Try deleting your build and source folders and running `spc build`` again.');
+                    return;
+                }
+            }
             if (file_exists(BUILD_MODULES_PATH . '/' . $this->getName() . '.so')) {
-                logger()->info('Shared extension [' . $this->getName() . '] was already built by php-src/configure (' . $this->getName() . '.so)');
+                logger()->info('Shared extension [' . $this->getName() . '] was already built, skipping (' . $this->getName() . '.so)');
                 return;
             }
-            if (Config::getExt($this->getName(), 'build-with-php') === true) {
-                logger()->warning('Shared extension [' . $this->getName() . '] did not build with php-src/configure (' . $this->getName() . '.so)');
-                logger()->warning('Try deleting your build and source folders and running `spc build`` again.');
+            logger()->info('Building extension [' . $this->getName() . '] as shared extension (' . $this->getName() . '.so)');
+            foreach ($this->dependencies as $dependency) {
+                if (!$dependency instanceof Extension) {
+                    continue;
+                }
+                if (!$dependency->isBuildStatic() && !in_array($dependency->getName(), $visited)) {
+                    logger()->info('extension ' . $this->getName() . ' requires extension ' . $dependency->getName());
+                    $dependency->buildShared([...$visited, $this->getName()]);
+                }
+            }
+            if (Config::getExt($this->getName(), 'type') === 'addon') {
                 return;
             }
+            match (PHP_OS_FAMILY) {
+                'Darwin', 'Linux' => $this->buildUnixShared(),
+                default => throw new WrongUsageException(PHP_OS_FAMILY . ' build shared extensions is not supported yet'),
+            };
+        } catch (SPCException $e) {
+            $e->bindExtensionInfo(['extension_name' => $this->getName()]);
+            throw $e;
         }
-        if (file_exists(BUILD_MODULES_PATH . '/' . $this->getName() . '.so')) {
-            logger()->info('Shared extension [' . $this->getName() . '] was already built, skipping (' . $this->getName() . '.so)');
-        }
-        logger()->info('Building extension [' . $this->getName() . '] as shared extension (' . $this->getName() . '.so)');
-        foreach ($this->dependencies as $dependency) {
-            if (!$dependency instanceof Extension) {
-                continue;
-            }
-            if (!$dependency->isBuildStatic()) {
-                logger()->info('extension ' . $this->getName() . ' requires extension ' . $dependency->getName());
-                $dependency->buildShared();
-            }
-        }
-        match (PHP_OS_FAMILY) {
-            'Darwin', 'Linux' => $this->buildUnixShared(),
-            default => throw new WrongUsageException(PHP_OS_FAMILY . ' build shared extensions is not supported yet'),
-        };
     }
 
     /**
      * Build shared extension for Unix
-     *
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     * @throws \ReflectionException
-     * @throws \Throwable
      */
     public function buildUnixShared(): void
     {
@@ -423,8 +421,24 @@ class Extension
             '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++';
+        if (str_contains($env['LIBS'], '-lstdc++') && SPCTarget::getTargetOS() === 'Linux') {
+            if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+                $env['SPC_COMPILER_EXTRA'] = '-lstdc++';
+            } elseif (ToolchainManager::getToolchainClass() === GccNativeToolchain::class || ToolchainManager::getToolchainClass() === ClangNativeToolchain::class) {
+                try {
+                    $content = FileSystem::readFile($this->source_dir . '/config.m4');
+                    if ($content && !str_contains($content, 'PHP_ADD_LIBRARY(stdc++')) {
+                        $pattern = '/(PHP_NEW_EXTENSION\(' . $this->name . ',.*\))/m';
+                        $replacement = "$1\nPHP_ADD_LIBRARY(stdc++, 1, " . strtoupper($this->name) . '_SHARED_LIBADD)';
+                        FileSystem::replaceFileRegex(
+                            $this->source_dir . '/config.m4',
+                            $pattern,
+                            $replacement
+                        );
+                    }
+                } catch (FileSystemException) {
+                }
+            }
         }
 
         if ($this->patchBeforeSharedPhpize()) {
@@ -498,15 +512,12 @@ class Extension
         return $this->build_static;
     }
 
-    /**
-     * @throws RuntimeException
-     */
     protected function addLibraryDependency(string $name, bool $optional = false): void
     {
         $depLib = $this->builder->getLib($name);
         if (!$depLib) {
             if (!$optional) {
-                throw new RuntimeException("extension {$this->name} requires library {$name}");
+                throw new WrongUsageException("extension {$this->name} requires library {$name}");
             }
             logger()->info("enabling {$this->name} without library {$name}");
         } else {
@@ -514,15 +525,12 @@ class Extension
         }
     }
 
-    /**
-     * @throws RuntimeException
-     */
     protected function addExtensionDependency(string $name, bool $optional = false): void
     {
         $depExt = $this->builder->getExt($name);
         if (!$depExt) {
             if (!$optional) {
-                throw new RuntimeException("{$this->name} requires extension {$name}");
+                throw new WrongUsageException("{$this->name} requires extension {$name} which is not included");
             }
             logger()->info("enabling {$this->name} without extension {$name}");
         } else {

src/SPC/builder/LibraryBase.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
+use SPC\exception\SPCException;
+use SPC\exception\SPCInternalException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\Downloader;
@@ -27,23 +27,17 @@ abstract class LibraryBase
 
     protected bool $patched = false;
 
-    /**
-     * @throws RuntimeException
-     */
     public function __construct(?string $source_dir = null)
     {
         if (static::NAME === 'unknown') {
-            throw new RuntimeException('no unknown!!!!!');
+            throw new SPCInternalException('Please set the NAME constant in ' . static::class);
         }
-        $this->source_dir = $source_dir ?? (SOURCE_PATH . '/' . Config::getLib(static::NAME, 'source'));
+        $this->source_dir = $source_dir ?? (SOURCE_PATH . DIRECTORY_SEPARATOR . Config::getLib(static::NAME, 'source'));
     }
 
     /**
      * Try to install or build this library.
-     * @param  bool                $force If true, force install or build
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
+     * @param bool $force If true, force install or build
      */
     public function setup(bool $force = false): int
     {
@@ -107,10 +101,6 @@ abstract class LibraryBase
 
     /**
      * Calculate dependencies for current library.
-     *
-     * @throws RuntimeException
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function calcDependency(): void
     {
@@ -131,9 +121,6 @@ abstract class LibraryBase
 
     /**
      * Get config static libs.
-     *
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function getStaticLibs(): array
     {
@@ -142,9 +129,6 @@ abstract class LibraryBase
 
     /**
      * Get config headers.
-     *
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function getHeaders(): array
     {
@@ -153,19 +137,12 @@ abstract class LibraryBase
 
     /**
      * Get binary files.
-     *
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function getBinaryFiles(): array
     {
         return Config::getLib(static::NAME, 'bin', []);
     }
 
-    /**
-     * @throws WrongUsageException
-     * @throws FileSystemException
-     */
     public function tryInstall(array $lock, bool $force_install = false): int
     {
         $install_file = $lock['filename'];
@@ -177,7 +154,7 @@ abstract class LibraryBase
                 FileSystem::extractPackage($install_file, $lock['source_type'], DOWNLOAD_PATH . '/' . $install_file, BUILD_ROOT_PATH);
                 $this->install();
                 return LIB_STATUS_OK;
-            } catch (FileSystemException|RuntimeException $e) {
+            } catch (SPCException $e) {
                 logger()->error('Failed to extract pre-built library [' . static::NAME . ']: ' . $e->getMessage());
                 return LIB_STATUS_INSTALL_FAILED;
             }
@@ -194,10 +171,6 @@ abstract class LibraryBase
      * BUILD_STATUS_OK if build success
      * BUILD_STATUS_ALREADY if already built
      * BUILD_STATUS_FAILED if build failed
-     *
-     * @throws RuntimeException
-     * @throws FileSystemException
-     * @throws WrongUsageException
      */
     public function tryBuild(bool $force_build = false): int
     {
@@ -288,6 +261,16 @@ abstract class LibraryBase
         return false;
     }
 
+    /**
+     * Patch code before windows configure.bat
+     * If you need to patch some code, overwrite this
+     * return true if you patched something, false if not
+     */
+    public function patchBeforeWindowsConfigure(): bool
+    {
+        return false;
+    }
+
     /**
      * Patch code before make
      * If you need to patch some code, overwrite this
@@ -309,8 +292,6 @@ abstract class LibraryBase
 
     /**
      * Build this library.
-     *
-     * @throws RuntimeException
      */
     abstract protected function build();
 
@@ -323,7 +304,7 @@ abstract class LibraryBase
         }
         $replace_items = json_decode(file_get_contents($replace_item_file), true);
         if (!is_array($replace_items)) {
-            throw new RuntimeException('Invalid placeholder file: ' . $replace_item_file);
+            throw new SPCInternalException("Invalid placeholder file: {$replace_item_file}");
         }
         $placeholders = get_pack_replace();
         // replace placeholders in BUILD_ROOT_PATH
@@ -341,8 +322,6 @@ abstract class LibraryBase
 
     /**
      * Add lib dependency
-     *
-     * @throws RuntimeException
      */
     protected function addLibraryDependency(string $name, bool $optional = false): void
     {
@@ -352,7 +331,7 @@ abstract class LibraryBase
             return;
         }
         if (!$optional) {
-            throw new RuntimeException(static::NAME . " requires library {$name}");
+            throw new WrongUsageException(static::NAME . " requires library {$name} but it is not included");
         }
         logger()->debug('enabling ' . static::NAME . " without {$name}");
     }

src/SPC/builder/extension/bz2.php

@@ -6,18 +6,12 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\builder\macos\MacOSBuilder;
-use SPC\exception\FileSystemException;
-use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('bz2')]
 class bz2 extends Extension
 {
-    /**
-     * @throws FileSystemException
-     * @throws WrongUsageException
-     */
     public function patchBeforeConfigure(): bool
     {
         $frameworks = $this->builder instanceof MacOSBuilder ? ' ' . $this->builder->getFrameworks(true) . ' ' : '';

src/SPC/builder/extension/curl.php

@@ -8,17 +8,13 @@ use SPC\builder\Extension;
 use SPC\builder\linux\LinuxBuilder;
 use SPC\builder\macos\MacOSBuilder;
 use SPC\builder\windows\WindowsBuilder;
-use SPC\exception\FileSystemException;
-use SPC\exception\WrongUsageException;
+use SPC\exception\PatchException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('curl')]
 class curl extends Extension
 {
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeBuildconf(): bool
     {
         logger()->info('patching before-configure for curl checks');
@@ -46,10 +42,6 @@ class curl extends Extension
         return true;
     }
 
-    /**
-     * @throws FileSystemException
-     * @throws WrongUsageException
-     */
     public function patchBeforeConfigure(): bool
     {
         $frameworks = $this->builder instanceof MacOSBuilder ? ' ' . $this->builder->getFrameworks(true) . ' ' : '';
@@ -61,7 +53,7 @@ class curl extends Extension
     public function patchBeforeMake(): bool
     {
         $patched = parent::patchBeforeMake();
-        $extra_libs = getenv('SPC_EXTRA_LIBS');
+        $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
         if ($this->builder instanceof WindowsBuilder && !str_contains($extra_libs, 'secur32.lib')) {
             $extra_libs .= ' secur32.lib';
             putenv('SPC_EXTRA_LIBS=' . trim($extra_libs));
@@ -105,7 +97,7 @@ class curl extends Extension
         );
 
         if ($patched === null) {
-            throw new \RuntimeException('Failed to patch config.m4 due to a regex error');
+            throw new PatchException('shared extension curl patcher', 'Failed to patch config.m4 due to a regex error');
         }
 
         FileSystem::writeFile($file, $patched);

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;
     }
 

src/SPC/builder/extension/dom.php

@@ -5,16 +5,12 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('dom')]
 class dom extends Extension
 {
-    /**
-     * @throws RuntimeException
-     */
     public function getUnixConfigureArg(bool $shared = false): string
     {
         $arg = '--enable-dom' . ($shared ? '=shared' : '');

src/SPC/builder/extension/ev.php

@@ -5,16 +5,12 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('ev')]
 class ev extends Extension
 {
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeBuildconf(): bool
     {
         /*

src/SPC/builder/extension/event.php

@@ -6,7 +6,6 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\builder\macos\MacOSBuilder;
-use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
@@ -27,18 +26,12 @@ class event extends Extension
         return $arg;
     }
 
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeConfigure(): bool
     {
         FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/configure', '/-levent_openssl/', $this->getLibFilesString());
         return true;
     }
 
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeMake(): bool
     {
         $patched = parent::patchBeforeMake();

src/SPC/builder/extension/gettext.php

@@ -6,17 +6,12 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\builder\macos\MacOSBuilder;
-use SPC\exception\FileSystemException;
-use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('gettext')]
 class gettext extends Extension
 {
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeBuildconf(): bool
     {
         if ($this->builder instanceof MacOSBuilder) {
@@ -25,10 +20,6 @@ class gettext extends Extension
         return true;
     }
 
-    /**
-     * @throws WrongUsageException
-     * @throws FileSystemException
-     */
     public function patchBeforeConfigure(): bool
     {
         if ($this->builder instanceof MacOSBuilder) {

src/SPC/builder/extension/glfw.php

@@ -5,16 +5,12 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('glfw')]
 class glfw extends Extension
 {
-    /**
-     * @throws RuntimeException
-     */
     public function patchBeforeBuildconf(): bool
     {
         if (file_exists(SOURCE_PATH . '/php-src/ext/glfw')) {

src/SPC/builder/extension/grpc.php

@@ -6,6 +6,7 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\builder\windows\WindowsBuilder;
+use SPC\exception\ValidationException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 use SPC\util\GlobalEnvManager;
@@ -18,7 +19,7 @@ class grpc extends Extension
     public function patchBeforeBuildconf(): bool
     {
         if ($this->builder instanceof WindowsBuilder) {
-            throw new \RuntimeException('grpc extension does not support windows yet');
+            throw new ValidationException('grpc extension does not support windows yet');
         }
         if (file_exists(SOURCE_PATH . '/php-src/ext/grpc')) {
             return false;
@@ -27,7 +28,7 @@ class grpc extends Extension
         if (is_dir($this->source_dir . '/src/php/ext/grpc')) {
             shell()->exec('ln -s ' . $this->source_dir . '/src/php/ext/grpc ' . SOURCE_PATH . '/php-src/ext/grpc');
         } else {
-            throw new \RuntimeException('Cannot find grpc source code');
+            throw new ValidationException('Cannot find grpc source code in ' . $this->source_dir . '/src/php/ext/grpc');
         }
         if (SPCTarget::getTargetOS() === 'Darwin') {
             FileSystem::replaceFileRegex(

src/SPC/builder/extension/imagick.php

@@ -19,7 +19,7 @@ class imagick extends Extension
     protected function splitLibsIntoStaticAndShared(string $allLibs): array
     {
         [$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
-        if (str_contains(getenv('PATH'), 'rh/devtoolset-10')) {
+        if (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
             $static .= ' -l:libstdc++.a';
             $shared = str_replace('-lstdc++', '', $shared);
         }

src/SPC/builder/extension/imap.php

@@ -24,9 +24,6 @@ class imap extends Extension
         return false;
     }
 
-    /**
-     * @throws WrongUsageException
-     */
     public function validate(): void
     {
         if ($this->builder->getOption('enable-zts')) {
@@ -49,7 +46,7 @@ class imap extends Extension
         if (PHP_OS_FAMILY !== 'Linux' || SystemUtil::isMuslDist()) {
             return $patched;
         }
-        $extra_libs = trim(getenv('SPC_EXTRA_LIBS') . ' -lcrypt');
+        $extra_libs = trim((getenv('SPC_EXTRA_LIBS') ?: '') . ' -lcrypt');
         f_putenv('SPC_EXTRA_LIBS=' . $extra_libs);
         return true;
     }

src/SPC/builder/extension/mbregex.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
+use SPC\exception\ValidationException;
 use SPC\util\CustomExt;
 
 #[CustomExt('mbregex')]
@@ -16,11 +16,6 @@ class mbregex extends Extension
         return 'mbstring';
     }
 
-    public function getConfigureArg(bool $shared = false): string
-    {
-        return '';
-    }
-
     /**
      * mbregex is not an extension, we need to overwrite the default check.
      */
@@ -29,7 +24,7 @@ class mbregex extends Extension
         $sharedext = $this->builder->getExt('mbstring')->isBuildShared() ? '-d "extension_dir=' . BUILD_MODULES_PATH . '" -d "extension=mbstring"' : '';
         [$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -n' . $sharedext . ' --ri "mbstring" | grep regex', false);
         if ($ret !== 0) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: compiled php-cli mbstring extension does not contain regex !');
+            throw new ValidationException("Extension {$this->getName()} failed compile check: compiled php-cli mbstring extension does not contain regex !");
         }
     }
 
@@ -37,11 +32,11 @@ class mbregex extends Extension
     {
         [$ret, $out] = cmd()->execWithResult(BUILD_ROOT_PATH . '/bin/php -n  --ri "mbstring"', false);
         if ($ret !== 0) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: compiled php-cli does not contain mbstring !');
+            throw new ValidationException("extension {$this->getName()} failed compile check: compiled php-cli does not contain mbstring !");
         }
         $out = implode("\n", $out);
         if (!str_contains($out, 'regex')) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: compiled php-cli mbstring extension does not contain regex !');
+            throw new ValidationException("extension {$this->getName()} failed compile check: compiled php-cli mbstring extension does not contain regex !");
         }
     }
 }

src/SPC/builder/extension/memcache.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
@@ -17,9 +16,6 @@ class memcache extends Extension
         return '--enable-memcache' . ($shared ? '=shared' : '') . ' --with-zlib-dir=' . BUILD_ROOT_PATH;
     }
 
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeBuildconf(): bool
     {
         FileSystem::replaceFileStr(

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';
     }
 }

src/SPC/builder/extension/mongodb.php

@@ -12,9 +12,9 @@ class mongodb extends Extension
 {
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        $arg = ' --enable-mongodb ';
+        $arg = ' --enable-mongodb' . ($shared ? '=shared' : '') . ' ';
         $arg .= ' --with-mongodb-system-libs=no --with-mongodb-client-side-encryption=no ';
-        $arg .= ' --with-mongodb-sasl=no  ';
+        $arg .= ' --with-mongodb-sasl=no ';
         if ($this->builder->getLib('openssl')) {
             $arg .= '--with-mongodb-ssl=openssl';
         }
@@ -22,6 +22,6 @@ class mongodb extends Extension
         $arg .= $this->builder->getLib('zstd') ? ' --with-mongodb-zstd=yes ' : ' --with-mongodb-zstd=no ';
         // $arg .= $this->builder->getLib('snappy') ? ' --with-mongodb-snappy=yes ' : ' --with-mongodb-snappy=no ';
         $arg .= $this->builder->getLib('zlib') ? ' --with-mongodb-zlib=yes ' : ' --with-mongodb-zlib=bundled ';
-        return $arg;
+        return clean_spaces($arg);
     }
 }

src/SPC/builder/extension/opcache.php

@@ -5,18 +5,14 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
 use SPC\store\SourcePatcher;
 use SPC\util\CustomExt;
+use SPC\util\SPCTarget;
 
 #[CustomExt('opcache')]
 class opcache extends Extension
 {
-    /**
-     * @throws WrongUsageException
-     * @throws RuntimeException
-     */
     public function validate(): void
     {
         if ($this->builder->getPHPVersionID() < 80000 && getenv('SPC_SKIP_PHP_VERSION_CHECK') !== 'yes') {
@@ -26,25 +22,43 @@ class opcache extends Extension
 
     public function patchBeforeBuildconf(): bool
     {
+        $version = $this->builder->getPHPVersion();
         if (file_exists(SOURCE_PATH . '/php-src/.opcache_patched')) {
             return false;
         }
         // if 8.2.0 <= PHP_VERSION < 8.2.23, we need to patch from legacy patch file
-        if (version_compare($this->builder->getPHPVersion(), '8.2.0', '>=') && version_compare($this->builder->getPHPVersion(), '8.2.23', '<')) {
+        if (version_compare($version, '8.2.0', '>=') && version_compare($version, '8.2.23', '<')) {
             SourcePatcher::patchFile('spc_fix_static_opcache_before_80222.patch', SOURCE_PATH . '/php-src');
         }
         // if 8.3.0 <= PHP_VERSION < 8.3.11, we need to patch from legacy patch file
-        elseif (version_compare($this->builder->getPHPVersion(), '8.3.0', '>=') && version_compare($this->builder->getPHPVersion(), '8.3.11', '<')) {
+        elseif (version_compare($version, '8.3.0', '>=') && version_compare($version, '8.3.11', '<')) {
             SourcePatcher::patchFile('spc_fix_static_opcache_before_80310.patch', SOURCE_PATH . '/php-src');
-        } else {
+        }
+        // if 8.3.12 <= PHP_VERSION < 8.5.0-dev, we need to patch from legacy patch file
+        elseif (version_compare($version, '8.5.0-dev', '<')) {
             SourcePatcher::patchMicro(items: ['static_opcache']);
         }
+        // PHP 8.5.0-dev and later supports static opcache without patching
+        else {
+            return false;
+        }
         return file_put_contents(SOURCE_PATH . '/php-src/.opcache_patched', '1') !== false;
     }
 
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        return '--enable-opcache';
+        $phpVersionID = $this->builder->getPHPVersionID();
+        $opcache_jit = ' --enable-opcache-jit';
+        if ((SPCTarget::getTargetOS() === 'Linux' &&
+            SPCTarget::getLibc() === 'musl' &&
+            $this->builder->getOption('enable-zts') &&
+            arch2gnu(php_uname('m')) === 'x86_64' &&
+            $phpVersionID < 80500) ||
+            $this->builder->getOption('disable-opcache-jit')
+        ) {
+            $opcache_jit = ' --disable-opcache-jit';
+        }
+        return '--enable-opcache' . ($shared ? '=shared' : '') . $opcache_jit;
     }
 
     public function getDistName(): string

src/SPC/builder/extension/openssl.php

@@ -27,6 +27,19 @@ class openssl extends Extension
     public function getUnixConfigureArg(bool $shared = false): string
     {
         $openssl_dir = $this->builder->getPHPVersionID() >= 80400 ? '' : ' --with-openssl-dir=' . BUILD_ROOT_PATH;
-        return '--with-openssl=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . $openssl_dir;
+        $args = '--with-openssl=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . $openssl_dir;
+        if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
+            $args .= ' --with-openssl-argon2 OPENSSL_LIBS="-lz"';
+        }
+        return $args;
+    }
+
+    public function getWindowsConfigureArg(bool $shared = false): string
+    {
+        $args = '--with-openssl';
+        if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
+            $args .= ' --with-openssl-argon2';
+        }
+        return $args;
     }
 }

src/SPC/builder/extension/opentelemetry.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\exception\ValidationException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 use SPC\util\GlobalEnvManager;
@@ -15,7 +16,7 @@ class opentelemetry extends Extension
     public function validate(): void
     {
         if ($this->builder->getPHPVersionID() < 80000 && getenv('SPC_SKIP_PHP_VERSION_CHECK') !== 'yes') {
-            throw new \RuntimeException('The opentelemetry extension requires PHP 8.0 or later');
+            throw new ValidationException('The opentelemetry extension requires PHP 8.0 or later');
         }
     }
 

src/SPC/builder/extension/password_argon2.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
+use SPC\exception\ValidationException;
 use SPC\util\CustomExt;
 
 #[CustomExt('password-argon2')]
@@ -20,7 +20,7 @@ class password_argon2 extends Extension
     {
         [$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -n -r "assert(defined(\'PASSWORD_ARGON2I\'));"');
         if ($ret !== 0) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed sanity check');
+            throw new ValidationException('extension ' . $this->getName() . ' failed sanity check', validation_module: 'password_argon2 function check');
         }
     }
 
@@ -42,4 +42,14 @@ class password_argon2 extends Extension
         }
         return $patched;
     }
+
+    public function getConfigureArg(bool $shared = false): string
+    {
+        if ($this->builder->getLib('openssl') !== null) {
+            if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
+                return '--without-password-argon2'; // use --with-openssl-argon2 in openssl extension instead
+            }
+        }
+        return '--with-password-argon2';
+    }
 }

src/SPC/builder/extension/pdo_sqlite.php

@@ -5,16 +5,12 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('pdo_sqlite')]
 class pdo_sqlite extends Extension
 {
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeConfigure(): bool
     {
         FileSystem::replaceFileRegex(

src/SPC/builder/extension/pgsql.php

@@ -5,20 +5,12 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('pgsql')]
 class pgsql extends Extension
 {
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
     public function patchBeforeConfigure(): bool
     {
         FileSystem::replaceFileRegex(
@@ -29,10 +21,6 @@ class pgsql extends Extension
         return true;
     }
 
-    /**
-     * @throws WrongUsageException
-     * @throws RuntimeException
-     */
     public function getUnixConfigureArg(bool $shared = false): string
     {
         if ($this->builder->getPHPVersionID() >= 80400) {
@@ -46,10 +34,6 @@ class pgsql extends Extension
         return '--with-pgsql=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH;
     }
 
-    /**
-     * @throws WrongUsageException
-     * @throws RuntimeException
-     */
     public function getWindowsConfigureArg(bool $shared = false): string
     {
         if ($this->builder->getPHPVersionID() >= 80400) {

src/SPC/builder/extension/protobuf.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\exception\ValidationException;
 use SPC\util\CustomExt;
 
 #[CustomExt('protobuf')]
@@ -13,12 +14,12 @@ class protobuf extends Extension
     public function validate(): void
     {
         if ($this->builder->getPHPVersionID() < 80000 && getenv('SPC_SKIP_PHP_VERSION_CHECK') !== 'yes') {
-            throw new \RuntimeException('The latest protobuf extension requires PHP 8.0 or later');
+            throw new ValidationException('The latest protobuf extension requires PHP 8.0 or later');
         }
         $grpc = $this->builder->getExt('grpc');
         // protobuf conflicts with grpc
         if ($grpc?->isBuildStatic()) {
-            throw new \RuntimeException('protobuf conflicts with grpc, please remove grpc or protobuf extension');
+            throw new ValidationException('protobuf conflicts with grpc, please remove grpc or protobuf extension');
         }
     }
 }

src/SPC/builder/extension/rar.php

@@ -6,16 +6,12 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\builder\macos\MacOSBuilder;
-use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('rar')]
 class rar extends Extension
 {
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeBuildconf(): bool
     {
         // workaround for newer Xcode clang (>= 15.0)

src/SPC/builder/extension/readline.php

@@ -5,16 +5,12 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('readline')]
 class readline extends Extension
 {
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeConfigure(): bool
     {
         FileSystem::replaceFileRegex(

src/SPC/builder/extension/redis.php

@@ -16,9 +16,11 @@ class redis extends Extension
         if ($this->isBuildStatic()) {
             $arg .= $this->builder->getExt('session')?->isBuildStatic() ? ' --enable-redis-session' : ' --disable-redis-session';
             $arg .= $this->builder->getExt('igbinary')?->isBuildStatic() ? ' --enable-redis-igbinary' : ' --disable-redis-igbinary';
+            $arg .= $this->builder->getExt('msgpack')?->isBuildStatic() ? ' --enable-redis-msgpack' : ' --disable-redis-msgpack';
         } else {
             $arg .= $this->builder->getExt('session') ? ' --enable-redis-session' : ' --disable-redis-session';
             $arg .= $this->builder->getExt('igbinary') ? ' --enable-redis-igbinary' : ' --disable-redis-igbinary';
+            $arg .= $this->builder->getExt('msgpack') ? ' --enable-redis-msgpack' : ' --disable-redis-msgpack';
         }
         if ($this->builder->getLib('zstd')) {
             $arg .= ' --enable-redis-zstd --with-libzstd="' . BUILD_ROOT_PATH . '"';

src/SPC/builder/extension/snappy.php

@@ -6,16 +6,12 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\builder\macos\MacOSBuilder;
-use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('snappy')]
 class snappy extends Extension
 {
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeConfigure(): bool
     {
         FileSystem::replaceFileRegex(

src/SPC/builder/extension/sqlsrv.php

@@ -24,7 +24,7 @@ class sqlsrv extends Extension
         return false;
     }
 
-    public function patchBeforeConfigure(): bool
+    public function patchBeforeWindowsConfigure(): bool
     {
         if ($this->pdo_sqlsrv_patched) {
             // revert pdo_sqlsrv patch

src/SPC/builder/extension/ssh2.php

@@ -5,16 +5,12 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('ssh2')]
 class ssh2 extends Extension
 {
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeConfigure(): bool
     {
         FileSystem::replaceFileRegex(

src/SPC/builder/extension/swoole.php

@@ -8,6 +8,8 @@ use SPC\builder\Extension;
 use SPC\builder\macos\MacOSBuilder;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
+use SPC\util\SPCConfigUtil;
+use SPC\util\SPCTarget;
 
 #[CustomExt('swoole')]
 class swoole extends Extension
@@ -43,32 +45,40 @@ class swoole extends Extension
     public function getUnixConfigureArg(bool $shared = false): string
     {
         // enable swoole
-        $arg = '--enable-swoole';
+        $arg = '--enable-swoole' . ($shared ? '=shared' : '');
 
-        // commonly-used feature: coroutine-time, disable-thread-context
-        $arg .= ' --enable-swoole-coro-time --disable-thread-context';
+        // commonly used feature: coroutine-time
+        $arg .= ' --enable-swoole-coro-time --with-pic';
 
-        // required feature: curl, openssl (but curl hook is buggy for php 8.0)
+        $arg .= $this->builder->getOption('enable-zts') ? ' --enable-swoole-thread --disable-thread-context' : ' --disable-swoole-thread --enable-thread-context';
+
+        // required features: curl, openssl (but curl hook is buggy for php 8.0)
         $arg .= $this->builder->getPHPVersionID() >= 80100 ? ' --enable-swoole-curl' : ' --disable-swoole-curl';
         $arg .= ' --enable-openssl';
 
-        // additional feature: c-ares, brotli, nghttp2 (can be disabled, but we enable it by default in config to support full network feature)
+        // additional features that only require libraries
         $arg .= $this->builder->getLib('libcares') ? ' --enable-cares' : '';
-        if (!$shared) {
-            $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : '';
-        }
+        $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : '';
         $arg .= $this->builder->getLib('nghttp2') ? (' --with-nghttp2-dir=' . BUILD_ROOT_PATH) : '';
+        $arg .= $this->builder->getLib('zstd') ? ' --enable-zstd' : '';
+        $arg .= $this->builder->getLib('liburing') ? ' --enable-iouring' : '';
+        $arg .= $this->builder->getExt('sockets') ? ' --enable-sockets' : '';
 
-        // additional feature: swoole-pgsql, it should depend on lib [postgresql], but it will lack of CFLAGS etc.
-        // so this is a tricky way (enable ext [pgsql,pdo] to add postgresql hook and pdo_pgsql support)
-        $arg .= $this->builder->getExt('swoole-hook-pgsql') ? '' : ' --disable-swoole-pgsql';
+        // enable additional features that require the pdo extension, but conflict with pdo_* extensions
+        // to make sure everything works as it should, this is done in fake addon extensions
+        $arg .= $this->builder->getExt('swoole-hook-pgsql') ? ' --enable-swoole-pgsql' : ' --disable-swoole-pgsql';
+        $arg .= $this->builder->getExt('swoole-hook-mysql') ? ' --enable-mysqlnd' : ' --disable-mysqlnd';
+        $arg .= $this->builder->getExt('swoole-hook-sqlite') ? ' --enable-swoole-sqlite' : ' --disable-swoole-sqlite';
 
-        // enable this feature , need remove pdo_sqlite
-        // more info : https://wenda.swoole.com/detail/109023
-        $arg .= $this->builder->getExt('swoole-hook-sqlite') ? '' : ' --disable-swoole-sqlite';
+        if ($this->builder->getExt('swoole-hook-odbc')) {
+            $config = (new SPCConfigUtil($this->builder, ['libs_only_deps' => true]))->config([], ['unixodbc']);
+            $arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"';
+        }
+
+        if (SPCTarget::getTargetOS() === 'Darwin') {
+            $arg .= ' ac_cv_lib_pthread_pthread_barrier_init=no';
+        }
 
-        // enable this feature , need stop pdo_*
-        // $arg .= $this->builder->getLib('unixodbc') ? ' --with-swoole-odbc=unixODBC,'  : ' ';
         return $arg;
     }
 }

src/SPC/builder/extension/swoole_hook_mysql.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
+use SPC\exception\ValidationException;
 use SPC\util\CustomExt;
 
 #[CustomExt('swoole-hook-mysql')]
@@ -16,26 +16,15 @@ class swoole_hook_mysql extends Extension
         return 'swoole';
     }
 
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        // pdo_mysql doesn't need to be disabled
-        // enable swoole-hook-mysql will enable mysqli, pdo, pdo_mysql, we don't need to add any additional options
-        return '';
-    }
-
     public function runCliCheckUnix(): void
     {
-        // skip if not enable swoole
-        if ($this->builder->getExt('swoole') === null) {
-            return;
-        }
         [$ret, $out] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -n' . $this->getSharedExtensionLoadString() . ' --ri "swoole"', false);
         $out = implode('', $out);
         if ($ret !== 0) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret);
+            throw new ValidationException("extension {$this->getName()} failed compile check: php-cli returned {$ret}", validation_module: 'extension swoole_hook_mysql sanity check');
         }
         if (!str_contains($out, 'mysqlnd')) {
-            throw new RuntimeException('swoole mysql hook is not enabled correctly.');
+            throw new ValidationException('swoole mysql hook is not enabled correctly.', validation_module: 'Extension swoole mysql hook availability check');
         }
     }
 }

src/SPC/builder/extension/swoole_hook_odbc.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\exception\ValidationException;
+use SPC\exception\WrongUsageException;
+use SPC\util\CustomExt;
+
+#[CustomExt('swoole-hook-odbc')]
+class swoole_hook_odbc extends Extension
+{
+    public function getDistName(): string
+    {
+        return 'swoole';
+    }
+
+    public function validate(): void
+    {
+        // pdo_pgsql need to be disabled
+        if ($this->builder->getExt('pdo_odbc')?->isBuildStatic()) {
+            throw new WrongUsageException('swoole-hook-odbc provides pdo_odbc, if you enable odbc hook for swoole, you must remove pdo_odbc extension.');
+        }
+    }
+
+    public function runCliCheckUnix(): void
+    {
+        $sharedExtensions = $this->getSharedExtensionLoadString();
+        [$ret, $out] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' --ri "' . $this->getDistName() . '"', false);
+        $out = implode('', $out);
+        if ($ret !== 0) {
+            throw new ValidationException("extension {$this->getName()} failed compile check: php-cli returned {$ret}", validation_module: "Extension {$this->getName()} sanity check");
+        }
+        if (!str_contains($out, 'coroutine_odbc')) {
+            throw new ValidationException('swoole odbc hook is not enabled correctly.', validation_module: 'Extension swoole odbc hook availability check');
+        }
+    }
+}

src/SPC/builder/extension/swoole_hook_pgsql.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
+use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\util\CustomExt;
 
@@ -20,31 +20,27 @@ class swoole_hook_pgsql extends Extension
     public function validate(): void
     {
         // pdo_pgsql need to be disabled
-        if ($this->builder->getExt('pdo_pgsql') !== null) {
+        if ($this->builder->getExt('pdo_pgsql')?->isBuildStatic()) {
             throw new WrongUsageException('swoole-hook-pgsql provides pdo_pgsql, if you enable pgsql hook for swoole, you must remove pdo_pgsql extension.');
         }
     }
 
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        // enable swoole pgsql hook
-        return '--enable-swoole-pgsql';
-    }
-
     public function runCliCheckUnix(): void
     {
-        // skip if not enable swoole
-        if ($this->builder->getExt('swoole') === null) {
-            return;
-        }
         $sharedExtensions = $this->getSharedExtensionLoadString();
-        [$ret, $out] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' --ri "' . $this->getDistName() . '"');
+        [$ret, $out] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' --ri "' . $this->getDistName() . '"', false);
         $out = implode('', $out);
         if ($ret !== 0) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret);
+            throw new ValidationException(
+                "extension {$this->getName()} failed sanity check: php-cli returned {$ret}",
+                validation_module: 'Extension swoole-hook-pgsql sanity check'
+            );
         }
         if (!str_contains($out, 'coroutine_pgsql')) {
-            throw new RuntimeException('swoole pgsql hook is not enabled correctly.');
+            throw new ValidationException(
+                'swoole pgsql hook is not enabled correctly.',
+                validation_module: 'Extension swoole pgsql hook availability check'
+            );
         }
     }
 }

src/SPC/builder/extension/swoole_hook_sqlite.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
+use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\util\CustomExt;
 
@@ -20,31 +20,21 @@ class swoole_hook_sqlite extends Extension
     public function validate(): void
     {
         // pdo_pgsql need to be disabled
-        if ($this->builder->getExt('pdo_sqlite') !== null) {
+        if ($this->builder->getExt('pdo_sqlite')?->isBuildStatic()) {
             throw new WrongUsageException('swoole-hook-sqlite provides pdo_sqlite, if you enable sqlite hook for swoole, you must remove pdo_sqlite extension.');
         }
     }
 
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        // enable swoole pgsql hook
-        return '--enable-swoole-sqlite';
-    }
-
     public function runCliCheckUnix(): void
     {
-        // skip if not enable swoole
-        if ($this->builder->getExt('swoole') === null) {
-            return;
-        }
         $sharedExtensions = $this->getSharedExtensionLoadString();
-        [$ret, $out] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' --ri "' . $this->getDistName() . '"');
+        [$ret, $out] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' --ri "' . $this->getDistName() . '"', false);
         $out = implode('', $out);
         if ($ret !== 0) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret);
+            throw new ValidationException("extension {$this->getName()} failed compile check: php-cli returned {$ret}", validation_module: "Extension {$this->getName()} sanity check");
         }
         if (!str_contains($out, 'coroutine_sqlite')) {
-            throw new RuntimeException('swoole sqlite hook is not enabled correctly.');
+            throw new ValidationException('swoole sqlite hook is not enabled correctly.', validation_module: 'Extension swoole sqlite hook availability check');
         }
     }
 }

src/SPC/builder/extension/swow.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
+use SPC\exception\ValidationException;
 use SPC\util\CustomExt;
 
 #[CustomExt('swow')]
@@ -14,7 +14,7 @@ class swow extends Extension
     public function validate(): void
     {
         if ($this->builder->getPHPVersionID() < 80000 && getenv('SPC_SKIP_PHP_VERSION_CHECK') !== 'yes') {
-            throw new RuntimeException('The latest swow extension requires PHP 8.0 or later');
+            throw new ValidationException('The latest swow extension requires PHP 8.0 or later');
         }
     }
 
@@ -26,9 +26,6 @@ class swow extends Extension
         return $arg;
     }
 
-    /**
-     * @throws RuntimeException
-     */
     public function patchBeforeBuildconf(): bool
     {
         if ($this->builder->getPHPVersionID() >= 80000 && !is_link(SOURCE_PATH . '/php-src/ext/swow')) {

src/SPC/builder/extension/uv.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\exception\ValidationException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
@@ -14,7 +15,7 @@ class uv extends Extension
     public function validate(): void
     {
         if ($this->builder->getPHPVersionID() < 80000 && getenv('SPC_SKIP_PHP_VERSION_CHECK') !== 'yes') {
-            throw new \RuntimeException('The latest uv extension requires PHP 8.0 or later');
+            throw new ValidationException('The latest uv extension requires PHP 8.0 or later');
         }
     }
 

src/SPC/builder/extension/xml.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
+use SPC\exception\SPCInternalException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
@@ -16,9 +16,6 @@ use SPC\util\CustomExt;
 #[CustomExt('simplexml')]
 class xml extends Extension
 {
-    /**
-     * @throws RuntimeException
-     */
     public function getUnixConfigureArg(bool $shared = false): string
     {
         $arg = match ($this->name) {
@@ -27,7 +24,7 @@ class xml extends Extension
             'xmlreader' => '--enable-xmlreader',
             'xmlwriter' => '--enable-xmlwriter',
             'simplexml' => '--enable-simplexml',
-            default => throw new RuntimeException('Not accept non-xml extension'),
+            default => throw new SPCInternalException('Not accept non-xml extension'),
         };
         $arg .= ($shared ? '=shared' : '') . ' --with-libxml="' . BUILD_ROOT_PATH . '"';
         return $arg;
@@ -47,7 +44,7 @@ class xml extends Extension
             'xmlreader' => '--enable-xmlreader',
             'xmlwriter' => '--enable-xmlwriter',
             'simplexml' => '--with-simplexml',
-            default => throw new RuntimeException('Not accept non-xml extension'),
+            default => throw new SPCInternalException('Not accept non-xml extension'),
         };
         $arg .= ' --with-libxml';
         return $arg;

src/SPC/builder/freebsd/BSDBuilder.php

@@ -5,8 +5,6 @@ declare(strict_types=1);
 namespace SPC\builder\freebsd;
 
 use SPC\builder\unix\UnixBuilderBase;
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
@@ -16,11 +14,6 @@ class BSDBuilder extends UnixBuilderBase
     /** @var bool Micro patch phar flag */
     private bool $phar_patched = false;
 
-    /**
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     * @throws FileSystemException
-     */
     public function __construct(array $options = [])
     {
         $this->options = $options;
@@ -32,10 +25,6 @@ class BSDBuilder extends UnixBuilderBase
         f_putenv('CXX=' . $this->getOption('cxx', 'clang++'));
         // set PATH
         f_putenv('PATH=' . BUILD_ROOT_PATH . '/bin:' . getenv('PATH'));
-        // set PKG_CONFIG
-        f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
-        // set PKG_CONFIG_PATH
-        f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig/');
 
         // set arch (default: current)
         $this->setOptionIfNotExist('arch', php_uname('m'));
@@ -56,10 +45,7 @@ class BSDBuilder extends UnixBuilderBase
     /**
      * Just start to build statically linked php binary
      *
-     * @param  int                 $build_target build target
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
+     * @param int $build_target build target
      */
     public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
     {
@@ -132,6 +118,11 @@ class BSDBuilder extends UnixBuilderBase
             }
             $this->buildEmbed();
         }
+        $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();
@@ -148,9 +139,6 @@ class BSDBuilder extends UnixBuilderBase
 
     /**
      * Build cli sapi
-     *
-     * @throws RuntimeException
-     * @throws FileSystemException
      */
     protected function buildCli(): void
     {
@@ -170,10 +158,6 @@ class BSDBuilder extends UnixBuilderBase
 
     /**
      * Build phpmicro sapi
-     *
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
      */
     protected function buildMicro(): void
     {
@@ -209,9 +193,6 @@ class BSDBuilder extends UnixBuilderBase
 
     /**
      * Build fpm sapi
-     *
-     * @throws RuntimeException
-     * @throws FileSystemException
      */
     protected function buildFpm(): void
     {
@@ -230,8 +211,6 @@ class BSDBuilder extends UnixBuilderBase
 
     /**
      * Build embed sapi
-     *
-     * @throws RuntimeException
      */
     protected function buildEmbed(): void
     {

src/SPC/builder/freebsd/SystemUtil.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\freebsd;
 
 use SPC\builder\traits\UnixSystemUtilTrait;
-use SPC\exception\RuntimeException;
+use SPC\exception\EnvironmentException;
 use SPC\exception\WrongUsageException;
 
 class SystemUtil
@@ -15,14 +15,15 @@ class SystemUtil
 
     /**
      * Get Logic CPU Count for macOS
-     *
-     * @throws RuntimeException
      */
     public static function getCpuCount(): int
     {
         [$ret, $output] = shell()->execWithResult('sysctl -n hw.ncpu');
         if ($ret !== 0) {
-            throw new RuntimeException('Failed to get cpu count');
+            throw new EnvironmentException(
+                'Failed to get cpu count from FreeBSD sysctl',
+                'Please ensure you are running this command on a FreeBSD system and have the sysctl command available.'
+            );
         }
 
         return (int) $output[0];
@@ -31,9 +32,8 @@ class SystemUtil
     /**
      * Get Target Arch CFlags
      *
-     * @param  string              $arch Arch Name
-     * @return string              return Arch CFlags string
-     * @throws WrongUsageException
+     * @param  string $arch Arch Name
+     * @return string return Arch CFlags string
      */
     public static function getArchCFlags(string $arch): string
     {

src/SPC/builder/freebsd/library/openssl.php

@@ -22,19 +22,11 @@ declare(strict_types=1);
 namespace SPC\builder\freebsd\library;
 
 use SPC\builder\macos\library\MacOSLibraryBase;
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
 
 class openssl extends BSDLibraryBase
 {
     public const NAME = 'openssl';
 
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
     protected function build(): void
     {
         [$lib,,$destdir] = SEPARATED_PATH;

src/SPC/builder/linux/LinuxBuilder.php

@@ -5,8 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\linux;
 
 use SPC\builder\unix\UnixBuilderBase;
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
+use SPC\exception\PatchException;
 use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
@@ -19,10 +18,6 @@ class LinuxBuilder extends UnixBuilderBase
     /** @var bool Micro patch phar flag */
     private bool $phar_patched = false;
 
-    /**
-     * @throws FileSystemException
-     * @throws WrongUsageException
-     */
     public function __construct(array $options = [])
     {
         $this->options = $options;
@@ -45,10 +40,7 @@ class LinuxBuilder extends UnixBuilderBase
     /**
      * Build PHP from source.
      *
-     * @param  int                 $build_target Build target, use `BUILD_TARGET_*` constants
-     * @throws RuntimeException
-     * @throws FileSystemException
-     * @throws WrongUsageException
+     * @param int $build_target Build target, use `BUILD_TARGET_*` constants
      */
     public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
     {
@@ -66,6 +58,14 @@ class LinuxBuilder extends UnixBuilderBase
         $phpVersionID = $this->getPHPVersionID();
         $json_74 = $phpVersionID < 80000 ? '--enable-json ' : '';
 
+        $opcache_jit = !$this->getOption('disable-opcache-jit', false);
+        if ($opcache_jit && ($phpVersionID >= 80500 || $this->getExt('opcache'))) {
+            // php 8.5 contains opcache extension by default,
+            // if opcache_jit is enabled for 8.5 or opcache enabled,
+            // we need to disable undefined behavior sanitizer.
+            f_putenv('SPC_COMPILER_EXTRA=-fno-sanitize=undefined');
+        }
+
         if ($this->getOption('enable-zts', false)) {
             $maxExecutionTimers = $phpVersionID >= 80100 ? '--enable-zend-max-execution-timers ' : '';
             $zts = '--enable-zts --disable-zend-signals ';
@@ -73,10 +73,7 @@ class LinuxBuilder extends UnixBuilderBase
             $maxExecutionTimers = '';
             $zts = '';
         }
-        $disable_jit = $this->getOption('disable-opcache-jit', false) ? '--disable-opcache-jit ' : '';
-        if (!$disable_jit && $this->getExt('opcache')) {
-            f_putenv('SPC_COMPILER_EXTRA=-fno-sanitize=undefined');
-        }
+
         $config_file_path = $this->getOption('with-config-file-path', false) ?
             ('--with-config-file-path=' . $this->getOption('with-config-file-path') . ' ') : '';
         $config_file_scan_dir = $this->getOption('with-config-file-scan-dir', false) ?
@@ -87,11 +84,13 @@ 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__';
         $php_configure_env = SystemUtil::makeEnvVarString([
             'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
-            'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
+            'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, // . ' -Dsomethinghere', // . $musl_flag,
             'LDFLAGS' => '-L' . BUILD_LIB_PATH,
             // 'LIBS' => SPCTarget::getRuntimeLibs(), // do not pass static libraries here yet, they may contain polyfills for libc functions!
         ]);
@@ -104,22 +103,21 @@ 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 .
-                $disable_jit .
                 $json_74 .
                 $zts .
                 $maxExecutionTimers .
                 $this->makeStaticExtensionArgs() . ' '
-            );
+        ));
 
         $this->emitPatchPoint('before-php-make');
         SourcePatcher::patchBeforeMake($this);
@@ -134,6 +132,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();
@@ -149,6 +151,11 @@ class LinuxBuilder extends UnixBuilderBase
             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();
+        }
     }
 
     public function testPHP(int $build_target = BUILD_TARGET_NONE)
@@ -159,9 +166,6 @@ class LinuxBuilder extends UnixBuilderBase
 
     /**
      * Build cli sapi
-     *
-     * @throws RuntimeException
-     * @throws FileSystemException
      */
     protected function buildCli(): void
     {
@@ -182,12 +186,27 @@ 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
-     *
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
      */
     protected function buildMicro(): void
     {
@@ -222,9 +241,6 @@ class LinuxBuilder extends UnixBuilderBase
 
     /**
      * Build fpm sapi
-     *
-     * @throws FileSystemException
-     * @throws RuntimeException
      */
     protected function buildFpm(): void
     {
@@ -246,8 +262,6 @@ class LinuxBuilder extends UnixBuilderBase
 
     /**
      * Build embed sapi
-     *
-     * @throws RuntimeException
      */
     protected function buildEmbed(): void
     {
@@ -311,7 +325,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)) {
@@ -327,6 +341,8 @@ class LinuxBuilder extends UnixBuilderBase
         if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'static') {
             $AR = getenv('AR') ?: 'ar';
             f_passthru("{$AR} -t " . BUILD_LIB_PATH . "/libphp.a | grep '\\.a$' | xargs -n1 {$AR} d " . BUILD_LIB_PATH . '/libphp.a');
+            // export dynamic symbols
+            SystemUtil::exportDynamicSymbols(BUILD_LIB_PATH . '/libphp.a');
         }
 
         if (!$this->getOption('no-strip', false) && file_exists(BUILD_LIB_PATH . '/' . $realLibName)) {
@@ -335,6 +351,9 @@ class LinuxBuilder extends UnixBuilderBase
         $this->patchPhpScripts();
     }
 
+    /**
+     * Return extra variables for php make command.
+     */
     private function getMakeExtraVars(): array
     {
         $config = (new SPCConfigUtil($this, ['libs_only_deps' => true, 'absolute_libs' => true]))->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
@@ -352,8 +371,6 @@ class LinuxBuilder extends UnixBuilderBase
      * Strip micro.sfx for Linux.
      * The micro.sfx does not support UPX directly, but we can remove UPX-info segment to adapt.
      * This will also make micro.sfx with upx-packed more like a malware fore antivirus :(
-     *
-     * @throws RuntimeException
      */
     private function processMicroUPX(): void
     {
@@ -368,7 +385,7 @@ class LinuxBuilder extends UnixBuilderBase
                 $out[1] = explode(' ', $out[1]);
                 $offset = $out[1][0];
                 if ($ret !== 0 || !str_starts_with($offset, '0x')) {
-                    throw new RuntimeException('Cannot find offset in readelf output');
+                    throw new PatchException('phpmicro UPX patcher', 'Cannot find offset in readelf output');
                 }
                 $offset = hexdec($offset);
                 // remove upx extra wastes

src/SPC/builder/linux/library/imap.php

@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
 use SPC\util\SPCTarget;
 
@@ -13,9 +11,6 @@ class imap extends LinuxLibraryBase
 {
     public const NAME = 'imap';
 
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeBuild(): bool
     {
         $cc = getenv('CC') ?: 'gcc';
@@ -44,9 +39,6 @@ class imap extends LinuxLibraryBase
         return false;
     }
 
-    /**
-     * @throws RuntimeException
-     */
     protected function build(): void
     {
         if ($this->builder->getLib('openssl')) {

src/SPC/builder/linux/library/libffi.php

@@ -4,18 +4,12 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
 use SPC\util\executor\UnixAutoconfExecutor;
 
 class libffi extends LinuxLibraryBase
 {
     public const NAME = 'libffi';
 
-    /**
-     * @throws RuntimeException
-     * @throws FileSystemException
-     */
     public function build(): void
     {
         UnixAutoconfExecutor::create($this)

src/SPC/builder/linux/library/libpng.php

@@ -21,20 +21,12 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
 use SPC\util\executor\UnixAutoconfExecutor;
 
 class libpng extends LinuxLibraryBase
 {
     public const NAME = 'libpng';
 
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
     public function build(): void
     {
         UnixAutoconfExecutor::create($this)

src/SPC/builder/linux/library/liburing.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+use SPC\builder\linux\SystemUtil;
+use SPC\store\FileSystem;
+use SPC\util\executor\UnixAutoconfExecutor;
+use SPC\util\SPCTarget;
+
+class liburing extends LinuxLibraryBase
+{
+    public const NAME = 'liburing';
+
+    public function patchBeforeBuild(): bool
+    {
+        if (!SystemUtil::isMuslDist()) {
+            return false;
+        }
+        FileSystem::replaceFileStr($this->source_dir . '/configure', 'realpath -s', 'realpath');
+        return true;
+    }
+
+    protected function build(): void
+    {
+        $use_libc = SPCTarget::getLibc() !== 'glibc' || version_compare(SPCTarget::getLibcVersion(), '2.30', '>=');
+        $make = UnixAutoconfExecutor::create($this);
+
+        if (!$use_libc) {
+            $make->appendEnv([
+                'CC' => 'gcc', // libc-less version fails to compile with clang or zig
+                'CXX' => 'g++',
+                'AR' => 'ar',
+                'LD' => 'ld',
+            ]);
+        } else {
+            $make->appendEnv([
+                'CFLAGS' => '-D_GNU_SOURCE',
+            ]);
+        }
+
+        $make
+            ->removeConfigureArgs(
+                '--disable-shared',
+                '--enable-static',
+                '--with-pic',
+                '--enable-pic',
+            )
+            ->addConfigureArgs(
+                $use_libc ? '--use-libc' : '',
+            )
+            ->configure()
+            ->make('library', 'install ENABLE_SHARED=0', with_clean: false);
+
+        $this->patchPkgconfPrefix();
+    }
+}

src/SPC/builder/linux/library/openssl.php

@@ -21,24 +21,16 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 
 class openssl extends LinuxLibraryBase
 {
+    use \SPC\builder\traits\openssl;
+
     public const NAME = 'openssl';
 
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
     public function build(): void
     {
-        [,,$destdir] = SEPARATED_PATH;
-
         $extra = '';
         $ex_lib = '-ldl -pthread';
         $arch = getenv('SPC_ARCH');

src/SPC/builder/linux/library/re2c.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+/**
+ * a template library class for unix
+ */
+class re2c extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\re2c;
+
+    public const NAME = 're2c';
+}

src/SPC/builder/macos/MacOSBuilder.php

@@ -6,8 +6,6 @@ namespace SPC\builder\macos;
 
 use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\builder\unix\UnixBuilderBase;
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
@@ -19,11 +17,6 @@ class MacOSBuilder extends UnixBuilderBase
     /** @var bool Micro patch phar flag */
     private bool $phar_patched = false;
 
-    /**
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     * @throws FileSystemException
-     */
     public function __construct(array $options = [])
     {
         $this->options = $options;
@@ -48,9 +41,7 @@ class MacOSBuilder extends UnixBuilderBase
     /**
      * Get dynamically linked macOS frameworks
      *
-     * @param  bool                $asString If true, return as string
-     * @throws FileSystemException
-     * @throws WrongUsageException
+     * @param bool $asString If true, return as string
      */
     public function getFrameworks(bool $asString = false): array|string
     {
@@ -83,10 +74,7 @@ class MacOSBuilder extends UnixBuilderBase
     /**
      * Just start to build statically linked php binary
      *
-     * @param  int                 $build_target build target
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
+     * @param int $build_target build target
      */
     public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
     {
@@ -98,7 +86,8 @@ class MacOSBuilder extends UnixBuilderBase
         $this->emitPatchPoint('before-php-configure');
         SourcePatcher::patchBeforeConfigure($this);
 
-        $json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
+        $phpVersionID = $this->getPHPVersionID();
+        $json_74 = $phpVersionID < 80000 ? '--enable-json ' : '';
         $zts = $this->getOption('enable-zts', false) ? '--enable-zts --disable-zend-signals ' : '';
 
         $config_file_path = $this->getOption('with-config-file-path', false) ?
@@ -111,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([
@@ -128,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);
@@ -156,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();
@@ -171,6 +165,11 @@ class MacOSBuilder extends UnixBuilderBase
             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();
+        }
     }
 
     public function testPHP(int $build_target = BUILD_TARGET_NONE)
@@ -181,9 +180,6 @@ class MacOSBuilder extends UnixBuilderBase
 
     /**
      * Build cli sapi
-     *
-     * @throws RuntimeException
-     * @throws FileSystemException
      */
     protected function buildCli(): void
     {
@@ -198,12 +194,21 @@ 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
-     *
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
      */
     protected function buildMicro(): void
     {
@@ -239,9 +244,6 @@ class MacOSBuilder extends UnixBuilderBase
 
     /**
      * Build fpm sapi
-     *
-     * @throws RuntimeException
-     * @throws FileSystemException
      */
     protected function buildFpm(): void
     {
@@ -257,8 +259,6 @@ class MacOSBuilder extends UnixBuilderBase
 
     /**
      * Build embed sapi
-     *
-     * @throws RuntimeException
      */
     protected function buildEmbed(): void
     {
@@ -270,6 +270,8 @@ class MacOSBuilder extends UnixBuilderBase
         if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'static') {
             $AR = getenv('AR') ?: 'ar';
             f_passthru("{$AR} -t " . BUILD_LIB_PATH . "/libphp.a | grep '\\.a$' | xargs -n1 {$AR} d " . BUILD_LIB_PATH . '/libphp.a');
+            // export dynamic symbols
+            SystemUtil::exportDynamicSymbols(BUILD_LIB_PATH . '/libphp.a');
         }
         $this->patchPhpScripts();
     }

src/SPC/builder/macos/SystemUtil.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\macos;
 
 use SPC\builder\traits\UnixSystemUtilTrait;
-use SPC\exception\RuntimeException;
+use SPC\exception\EnvironmentException;
 use SPC\exception\WrongUsageException;
 
 class SystemUtil
@@ -15,25 +15,25 @@ class SystemUtil
 
     /**
      * Get Logic CPU Count for macOS
-     *
-     * @throws RuntimeException
      */
     public static function getCpuCount(): int
     {
-        [$ret, $output] = shell()->execWithResult('sysctl -n hw.ncpu', false);
+        $cpu = exec('sysctl -n hw.ncpu', $output, $ret);
         if ($ret !== 0) {
-            throw new RuntimeException('Failed to get cpu count');
+            throw new EnvironmentException(
+                'Failed to get cpu count from macOS sysctl',
+                'Please ensure you are running this command on a macOS system and have the sysctl command available.'
+            );
         }
 
-        return (int) $output[0];
+        return (int) $cpu;
     }
 
     /**
      * Get Target Arch CFlags
      *
-     * @param  string              $arch Arch Name
-     * @return string              return Arch CFlags string
-     * @throws WrongUsageException
+     * @param  string $arch Arch Name
+     * @return string return Arch CFlags string
      */
     public static function getArchCFlags(string $arch): string
     {

src/SPC/builder/macos/library/MacOSLibraryBase.php

@@ -8,8 +8,6 @@ use SPC\builder\BuilderBase;
 use SPC\builder\LibraryBase;
 use SPC\builder\macos\MacOSBuilder;
 use SPC\builder\traits\UnixLibraryTrait;
-use SPC\exception\FileSystemException;
-use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 
 abstract class MacOSLibraryBase extends LibraryBase
@@ -28,10 +26,6 @@ abstract class MacOSLibraryBase extends LibraryBase
         return $this->builder;
     }
 
-    /**
-     * @throws WrongUsageException
-     * @throws FileSystemException
-     */
     public function getFrameworks(): array
     {
         return Config::getLib(static::NAME, 'frameworks', []);

src/SPC/builder/macos/library/curl.php

@@ -21,7 +21,6 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
-use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 
 class curl extends MacOSLibraryBase
@@ -30,9 +29,6 @@ class curl extends MacOSLibraryBase
 
     public const NAME = 'curl';
 
-    /**
-     * @throws FileSystemException
-     */
     public function patchBeforeBuild(): bool
     {
         FileSystem::replaceFileRegex(

src/SPC/builder/macos/library/glfw.php

@@ -4,18 +4,12 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
 use SPC\util\executor\UnixCMakeExecutor;
 
 class glfw extends MacOSLibraryBase
 {
     public const NAME = 'glfw';
 
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     */
     protected function build(): void
     {
         UnixCMakeExecutor::create($this)

src/SPC/builder/macos/library/imap.php

@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 
@@ -13,10 +11,6 @@ class imap extends MacOSLibraryBase
 {
     public const NAME = 'imap';
 
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     */
     public function patchBeforeBuild(): bool
     {
         $cc = getenv('CC') ?: 'clang';
@@ -37,9 +31,6 @@ class imap extends MacOSLibraryBase
         return true;
     }
 
-    /**
-     * @throws RuntimeException
-     */
     protected function build(): void
     {
         if ($this->builder->getLib('openssl')) {

src/SPC/builder/macos/library/libffi.php

@@ -4,18 +4,12 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
 use SPC\util\executor\UnixAutoconfExecutor;
 
 class libffi extends MacOSLibraryBase
 {
     public const NAME = 'libffi';
 
-    /**
-     * @throws RuntimeException
-     * @throws FileSystemException
-     */
     protected function build(): void
     {
         $arch = getenv('SPC_ARCH');

src/SPC/builder/macos/library/libpng.php

@@ -21,20 +21,12 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
 use SPC\util\executor\UnixAutoconfExecutor;
 
 class libpng extends MacOSLibraryBase
 {
     public const NAME = 'libpng';
 
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
     protected function build(): void
     {
         $arch = arch2gnu(php_uname('m'));

src/SPC/builder/macos/library/openssl.php

@@ -21,20 +21,14 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 
 class openssl extends MacOSLibraryBase
 {
+    use \SPC\builder\traits\openssl;
+
     public const NAME = 'openssl';
 
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
     protected function build(): void
     {
         // lib:zlib

src/SPC/builder/macos/library/re2c.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class re2c extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\re2c;
+
+    public const NAME = 're2c';
+}

src/SPC/builder/traits/UnixLibraryTrait.php

@@ -4,20 +4,13 @@ declare(strict_types=1);
 
 namespace SPC\builder\traits;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
+use SPC\exception\PatchException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
 use SPC\util\SPCConfigUtil;
 
 trait UnixLibraryTrait
 {
-    /**
-     * @throws RuntimeException
-     * @throws FileSystemException
-     * @throws WrongUsageException
-     */
     public function getStaticLibFiles(bool $include_self = true): string
     {
         $libs = $include_self ? [$this] : [];
@@ -28,11 +21,11 @@ trait UnixLibraryTrait
     }
 
     /**
-     * Patch pkgconfig file prefix
+     * Patch pkgconfig file prefix, exec_prefix, libdir, includedir for correct build.
      *
-     * @param  array               $files file list
-     * @throws FileSystemException
-     * @throws RuntimeException
+     * @param array      $files          File list to patch, if empty, will use pkg-configs from config (e.g. ['zlib.pc', 'openssl.pc'])
+     * @param int        $patch_option   Patch options
+     * @param null|array $custom_replace Custom replace rules, if provided, will be used to replace in the format [regex, replacement]
      */
     public function patchPkgconfPrefix(array $files = [], int $patch_option = PKGCONF_PATCH_ALL, ?array $custom_replace = null): void
     {
@@ -43,7 +36,7 @@ trait UnixLibraryTrait
         foreach ($files as $name) {
             $realpath = realpath(BUILD_ROOT_PATH . '/lib/pkgconfig/' . $name);
             if ($realpath === false) {
-                throw new RuntimeException('Cannot find library [' . static::NAME . '] pkgconfig file [' . $name . '] !');
+                throw new PatchException('pkg-config prefix patcher', 'Cannot find library [' . static::NAME . '] pkgconfig file [' . $name . '] in ' . BUILD_LIB_PATH . '/pkgconfig/ !');
             }
             logger()->debug('Patching ' . $realpath);
             // replace prefix
@@ -70,7 +63,7 @@ trait UnixLibraryTrait
             $realpath = realpath(BUILD_LIB_PATH . '/' . $name);
             if ($realpath === false) {
                 if ($throwOnMissing) {
-                    throw new RuntimeException('Cannot find library [' . static::NAME . '] la file [' . $name . '] !');
+                    throw new PatchException('la dependency patcher', 'Cannot find library [' . static::NAME . '] la file [' . $name . '] !');
                 }
                 logger()->warning('Cannot find library [' . static::NAME . '] la file [' . $name . '] !');
                 continue;

src/SPC/builder/traits/UnixSystemUtilTrait.php

@@ -4,21 +4,101 @@ declare(strict_types=1);
 
 namespace SPC\builder\traits;
 
-/**
- * Unix 系统的工具函数 Trait，适用于 Linux、macOS
- */
+use SPC\exception\ExecutionException;
+use SPC\exception\SPCInternalException;
+use SPC\exception\WrongUsageException;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
+use SPC\util\SPCTarget;
+
 trait UnixSystemUtilTrait
 {
     /**
-     * @param  string      $name  命令名称
-     * @param  array       $paths 寻找的目标路径（如果不传入，则使用环境变量 PATH）
-     * @return null|string 找到了返回命令路径，找不到返回 null
+     * Export static library dynamic symbols to a .dynsym file.
+     * It will export to "/path/to/libxxx.a.dynsym".
+     *
+     * @param string $lib_file Static library file path (e.g. /path/to/libxxx.a)
+     */
+    public static function exportDynamicSymbols(string $lib_file): void
+    {
+        // check
+        if (!is_file($lib_file)) {
+            throw new WrongUsageException("The lib archive file {$lib_file} does not exist, please build it first.");
+        }
+        // shell out
+        $cmd = 'nm -g --defined-only -P ' . escapeshellarg($lib_file);
+        $result = shell()->execWithResult($cmd);
+        if ($result[0] !== 0) {
+            throw new ExecutionException($cmd, 'Failed to get defined symbols from ' . $lib_file);
+        }
+        // parse shell output and filter
+        $defined = [];
+        foreach ($result[1] as $line) {
+            $line = trim($line);
+            if ($line === '' || str_ends_with($line, '.o:') || str_ends_with($line, '.o]:')) {
+                continue;
+            }
+            $name = strtok($line, " \t");
+            if (!$name) {
+                continue;
+            }
+            $name = preg_replace('/@.*$/', '', $name);
+            if ($name !== '' && $name !== false) {
+                $defined[] = $name;
+            }
+        }
+        $defined = array_unique($defined);
+        sort($defined);
+        // export
+        if (SPCTarget::getTargetOS() === 'Linux') {
+            file_put_contents("{$lib_file}.dynsym", "{\n" . implode("\n", array_map(fn ($x) => "  {$x};", $defined)) . "};\n");
+        } else {
+            file_put_contents("{$lib_file}.dynsym", implode("\n", $defined) . "\n");
+        }
+    }
+
+    /**
+     * Get linker flag to export dynamic symbols from a static library.
+     *
+     * @param  string      $lib_file Static library file path (e.g. /path/to/libxxx.a)
+     * @return null|string Linker flag to export dynamic symbols, null if no .dynsym file found
+     */
+    public static function getDynamicExportedSymbols(string $lib_file): ?string
+    {
+        $symbol_file = "{$lib_file}.dynsym";
+        if (!is_file($symbol_file)) {
+            self::exportDynamicSymbols($lib_file);
+        }
+        if (!is_file($symbol_file)) {
+            throw new SPCInternalException("The symbol file {$symbol_file} does not exist, please check if nm command is available.");
+        }
+        // https://github.com/ziglang/zig/issues/24662
+        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            return '-Wl,--export-dynamic';
+        }
+        // macOS
+        if (SPCTarget::getTargetOS() !== 'Linux') {
+            return "-Wl,-exported_symbols_list,{$symbol_file}";
+        }
+        return "-Wl,--dynamic-list={$symbol_file}";
+    }
+
+    /**
+     * Find a command in given paths or system PATH.
+     * If $name is an absolute path, check if it exists.
+     *
+     * @param  string      $name  Command name or absolute path
+     * @param  array       $paths Paths to search, if empty, use system PATH
+     * @return null|string Absolute path of the command if found, null otherwise
      */
     public static function findCommand(string $name, array $paths = []): ?string
     {
         if (!$paths) {
             $paths = explode(PATH_SEPARATOR, getenv('PATH'));
         }
+        if (str_starts_with($name, '/')) {
+            return file_exists($name) ? $name : null;
+        }
         foreach ($paths as $path) {
             if (file_exists($path . DIRECTORY_SEPARATOR . $name)) {
                 return $path . DIRECTORY_SEPARATOR . $name;
@@ -28,6 +108,8 @@ trait UnixSystemUtilTrait
     }
 
     /**
+     * Make environment variable string for shell command.
+     *
      * @param  array  $vars Variables, like: ["CFLAGS" => "-Ixxx"]
      * @return string like: CFLAGS="-Ixxx"
      */

src/SPC/builder/traits/openssl.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\traits;
+
+use SPC\exception\SPCException;
+use SPC\store\FileSystem;
+use SPC\util\PkgConfigUtil;
+
+trait openssl
+{
+    public function getLibVersion(): ?string
+    {
+        // get openssl version from source directory
+        if (file_exists("{$this->source_dir}/VERSION.dat")) {
+            // parse as INI
+            $version = parse_ini_file("{$this->source_dir}/VERSION.dat");
+            if ($version !== false) {
+                return "{$version['MAJOR']}.{$version['MINOR']}.{$version['PATCH']}";
+            }
+        }
+        // get openssl version from pkg-config
+        if (PHP_OS_FAMILY !== 'Windows') {
+            try {
+                return PkgConfigUtil::getModuleVersion('openssl');
+            } catch (SPCException) {
+            }
+        }
+        // get openssl version from header openssl/opensslv.h
+        if (file_exists(BUILD_INCLUDE_PATH . '/openssl/opensslv.h')) {
+            if (preg_match('/OPENSSL_VERSION_STR "(.*)"/', FileSystem::readFile(BUILD_INCLUDE_PATH . '/openssl/opensslv.h'), $match)) {
+                return $match[1];
+            }
+        }
+        return null;
+    }
+}

src/SPC/builder/unix/UnixBuilderBase.php

@@ -5,14 +5,16 @@ declare(strict_types=1);
 namespace SPC\builder\unix;
 
 use SPC\builder\BuilderBase;
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
+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;
+use SPC\toolchain\ToolchainManager;
 use SPC\util\DependencyUtil;
 use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
@@ -56,7 +58,14 @@ abstract class UnixBuilderBase extends BuilderBase
             }
             // if some libs are not supported (but in config "lib.json", throw exception)
             if (!isset($support_lib_list[$library])) {
-                throw new WrongUsageException('library [' . $library . '] is in the lib.json list but not supported to compile, but in the future I will support it!');
+                $os = match (PHP_OS_FAMILY) {
+                    'Linux' => 'Linux',
+                    'Darwin' => 'macOS',
+                    'Windows' => 'Windows',
+                    'BSD' => 'FreeBSD',
+                    default => PHP_OS_FAMILY,
+                };
+                throw new WrongUsageException("library [{$library}] is in the lib.json list but not supported to build on {$os}.");
             }
             $lib = new ($support_lib_list[$library])($this);
             $this->addLib($lib);
@@ -70,9 +79,7 @@ abstract class UnixBuilderBase extends BuilderBase
     }
 
     /**
-     * Sanity check after build complete
-     *
-     * @throws RuntimeException
+     * Sanity check after build complete.
      */
     protected function sanityCheck(int $build_target): void
     {
@@ -82,7 +89,7 @@ abstract class UnixBuilderBase extends BuilderBase
             [$ret, $output] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n -r "echo \"hello\";"');
             $raw_output = implode('', $output);
             if ($ret !== 0 || trim($raw_output) !== 'hello') {
-                throw new RuntimeException("cli failed sanity check: ret[{$ret}]. out[{$raw_output}]");
+                throw new ValidationException("cli failed sanity check. code: {$ret}, output: {$raw_output}", validation_module: 'php-cli sanity check');
             }
 
             foreach ($this->getExts() as $ext) {
@@ -105,12 +112,25 @@ abstract class UnixBuilderBase extends BuilderBase
                 foreach ($task['conditions'] as $condition => $closure) {
                     if (!$closure($ret, $out)) {
                         $raw_out = trim(implode('', $out));
-                        throw new RuntimeException("micro failed sanity check: {$task_name}, condition [{$condition}], ret[{$ret}], out[{$raw_out}]");
+                        throw new ValidationException(
+                            "failure info: {$condition}, code: {$ret}, output: {$raw_out}",
+                            validation_module: "phpmicro sanity check item [{$task_name}]"
+                        );
                     }
                 }
             }
         }
 
+        // 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');
@@ -127,6 +147,7 @@ abstract class UnixBuilderBase extends BuilderBase
             if (SPCTarget::isStatic()) {
                 $lens .= ' -static';
             }
+            $dynamic_exports = '';
             // if someone changed to EMBED_TYPE=shared, we need to add LD_LIBRARY_PATH
             if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
                 if (PHP_OS_FAMILY === 'Darwin') {
@@ -141,14 +162,25 @@ abstract class UnixBuilderBase extends BuilderBase
                 foreach (glob(BUILD_LIB_PATH . "/libphp*.{$suffix}") as $file) {
                     unlink($file);
                 }
+                // calling linux system util in other unix OS is okay
+                if ($dynamic_exports = LinuxSystemUtil::getDynamicExportedSymbols(BUILD_LIB_PATH . '/libphp.a')) {
+                    $dynamic_exports = ' ' . $dynamic_exports;
+                }
             }
-            [$ret, $out] = shell()->cd($sample_file_path)->execWithResult(getenv('CC') . ' -o embed embed.c ' . $lens);
+            $cc = getenv('CC');
+            [$ret, $out] = shell()->cd($sample_file_path)->execWithResult("{$cc} -o embed embed.c {$lens} {$dynamic_exports}");
             if ($ret !== 0) {
-                throw new RuntimeException('embed failed sanity check: build failed. Error message: ' . implode("\n", $out));
+                throw new ValidationException(
+                    'embed failed sanity check: build failed. Error message: ' . implode("\n", $out),
+                    validation_module: 'static libphp.a sanity check'
+                );
             }
             [$ret, $output] = shell()->cd($sample_file_path)->execWithResult($ext_path . './embed');
             if ($ret !== 0 || trim(implode('', $output)) !== 'hello') {
-                throw new RuntimeException('embed failed sanity check: run failed. Error message: ' . implode("\n", $output));
+                throw new ValidationException(
+                    'embed failed sanity check: run failed. Error message: ' . implode("\n", $output),
+                    validation_module: 'static libphp.a sanity check'
+                );
             }
         }
 
@@ -157,24 +189,28 @@ abstract class UnixBuilderBase extends BuilderBase
             logger()->info('running frankenphp sanity check');
             $frankenphp = BUILD_BIN_PATH . '/frankenphp';
             if (!file_exists($frankenphp)) {
-                throw new RuntimeException('FrankenPHP binary not found: ' . $frankenphp);
+                throw new ValidationException(
+                    "FrankenPHP binary not found: {$frankenphp}",
+                    validation_module: 'FrankenPHP sanity check'
+                );
             }
             $prefix = PHP_OS_FAMILY === 'Darwin' ? 'DYLD_' : 'LD_';
             [$ret, $output] = shell()
                 ->setEnv(["{$prefix}LIBRARY_PATH" => BUILD_LIB_PATH])
                 ->execWithResult("{$frankenphp} version");
             if ($ret !== 0 || !str_contains(implode('', $output), 'FrankenPHP')) {
-                throw new RuntimeException('FrankenPHP failed sanity check: ret[' . $ret . ']. out[' . implode('', $output) . ']');
+                throw new ValidationException(
+                    'FrankenPHP failed sanity check: ret[' . $ret . ']. out[' . implode('', $output) . ']',
+                    validation_module: 'FrankenPHP sanity check'
+                );
             }
         }
     }
 
     /**
-     * 将编译好的二进制文件发布到 buildroot
+     * Deploy the binary file to the build bin path.
      *
-     * @param  int                 $type 发布类型
-     * @throws RuntimeException
-     * @throws FileSystemException
+     * @param int $type Type integer, one of BUILD_TARGET_CLI, BUILD_TARGET_MICRO, BUILD_TARGET_FPM
      */
     protected function deployBinary(int $type): bool
     {
@@ -182,7 +218,8 @@ 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',
-            default => throw new RuntimeException('Deployment does not accept type ' . $type),
+            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');
         FileSystem::createDir(BUILD_BIN_PATH);
@@ -192,18 +229,15 @@ abstract class UnixBuilderBase extends BuilderBase
 
     /**
      * Run php clean
-     *
-     * @throws RuntimeException
      */
     protected function cleanMake(): void
     {
-        logger()->info('cleaning up');
+        logger()->info('cleaning up php-src build files');
         shell()->cd(SOURCE_PATH . '/php-src')->exec('make clean');
     }
 
     /**
      * Patch phpize and php-config if needed
-     * @throws FileSystemException
      */
     protected function patchPhpScripts(): void
     {
@@ -231,12 +265,9 @@ abstract class UnixBuilderBase extends BuilderBase
         }
     }
 
-    /**
-     * @throws WrongUsageException
-     * @throws RuntimeException
-     */
     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');
@@ -248,45 +279,49 @@ 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);
         }
-        $lrt = PHP_OS_FAMILY === 'Linux' ? '-lrt' : '';
-        $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') {
-            $libphpVersion = preg_replace('/\.\d$/', '', $libphpVersion);
+            $libphpVersion = preg_replace('/\.\d+$/', '', $libphpVersion);
+        } else {
+            if ($dynamicSymbolsArgument = LinuxSystemUtil::getDynamicExportedSymbols(BUILD_LIB_PATH . '/libphp.a')) {
+                $dynamic_exports = ' ' . $dynamicSymbolsArgument;
+            }
         }
         $debugFlags = $this->getOption('no-strip') ? '-w -s ' : '';
-        $extLdFlags = "-extldflags '-pie'";
+        $extLdFlags = "-extldflags '-pie{$dynamic_exports}'";
         $muslTags = '';
         $staticFlags = '';
         if (SPCTarget::isStatic()) {
-            $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000'";
+            $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000{$dynamic_exports}'";
             $muslTags = 'static_build,';
             $staticFlags = '-static-pie';
         }
 
         $config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list);
-        $env = [
+        $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')) &&
+            ToolchainManager::getToolchainClass() === GccNativeToolchain::class) {
+            $cflags .= ' -Wno-error=missing-profile';
+            $libs .= ' -lgcov';
+        }
+        $env = [...[
             'CGO_ENABLED' => '1',
-            'CGO_CFLAGS' => $config['cflags'],
-            'CGO_LDFLAGS' => "{$staticFlags} {$config['ldflags']} {$config['libs']} {$lrt}",
+            '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}");
@@ -299,4 +334,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;
+        }
+    }
 }

src/SPC/builder/unix/library/attr.php

@@ -4,14 +4,10 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\exception\RuntimeException;
 use SPC\util\executor\UnixAutoconfExecutor;
 
 trait attr
 {
-    /**
-     * @throws RuntimeException
-     */
     protected function build(): void
     {
         UnixAutoconfExecutor::create($this)

src/SPC/builder/unix/library/brotli.php

@@ -4,17 +4,11 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
 use SPC\util\executor\UnixCMakeExecutor;
 
 trait brotli
 {
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     */
     protected function build(): void
     {
         UnixCMakeExecutor::create($this)

src/SPC/builder/unix/library/curl.php

@@ -4,16 +4,10 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
 use SPC\util\executor\UnixCMakeExecutor;
 
 trait curl
 {
-    /**
-     * @throws RuntimeException
-     * @throws FileSystemException
-     */
     protected function build(): void
     {
         shell()->cd($this->source_dir)->exec('sed -i.save s@\${CMAKE_C_IMPLICIT_LINK_LIBRARIES}@@ ./CMakeLists.txt');

src/SPC/builder/unix/library/fastlz.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\exception\BuildFailureException;
+
 trait fastlz
 {
     protected function build(): void
@@ -13,10 +15,10 @@ trait fastlz
             ->exec((getenv('AR') ?: 'ar') . ' rcs libfastlz.a fastlz.o');
 
         if (!copy($this->source_dir . '/fastlz.h', BUILD_INCLUDE_PATH . '/fastlz.h')) {
-            throw new \RuntimeException('Failed to copy fastlz.h');
+            throw new BuildFailureException('Failed to copy fastlz.h, file does not exist');
         }
         if (!copy($this->source_dir . '/libfastlz.a', BUILD_LIB_PATH . '/libfastlz.a')) {
-            throw new \RuntimeException('Failed to copy libfastlz.a');
+            throw new BuildFailureException('Failed to copy libfastlz.a, file does not exist');
         }
     }
 }

src/SPC/builder/unix/library/freetype.php

@@ -4,19 +4,11 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\util\executor\UnixCMakeExecutor;
 
 trait freetype
 {
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
     protected function build(): void
     {
         $cmake = UnixCMakeExecutor::create($this)