Revert "fix libheif"

Removed unused import of FileSystem.

.github/workflows/build-unix.yml

@@ -29,6 +29,9 @@ on:
         description: Extensions to build (comma separated)
         required: true
         type: string
+      shared-extensions:
+        description: Shared extensions to build (optional, comma separated)
+        type: string
       extra-libs:
         description: Extra libraries to build (optional, comma separated)
         type: string
@@ -42,10 +45,22 @@ on:
       build-fpm:
         description: Build fpm binary
         type: boolean
+      build-frankenphp:
+        description: Build frankenphp binary (requires ZTS)
+        type: boolean
+        default: false
+      enable-zts:
+        description: Enable ZTS
+        type: boolean
+        default: false
       prefer-pre-built:
         description: Prefer pre-built binaries (reduce build time)
         type: boolean
         default: true
+      with-suggested-libs:
+        description: Build with suggested libs
+        type: boolean
+        default: false
       debug:
         description: Show full build logs
         type: boolean
@@ -69,6 +84,9 @@ on:
         description: Extensions to build (comma separated)
         required: true
         type: string
+      shared-extensions:
+        description: Shared extensions to build (optional, comma separated)
+        type: string
       extra-libs:
         description: Extra libraries to build (optional, comma separated)
         type: string
@@ -82,10 +100,22 @@ on:
       build-fpm:
         description: Build fpm binary
         type: boolean
+      build-frankenphp:
+        description: Build frankenphp binary (requires ZTS)
+        type: boolean
+        default: false
+      enable-zts:
+        description: Enable ZTS
+        type: boolean
+        default: false
       prefer-pre-built:
         description: Prefer pre-built binaries (reduce build time)
         type: boolean
         default: true
+      with-suggested-libs:
+        description: Include suggested libs
+        type: boolean
+        default: false
       debug:
         description: Show full build logs
         type: boolean
@@ -144,8 +174,19 @@ jobs:
               RUNS_ON="macos-15"
               ;;
           esac
-          DOWN_CMD="$DOWN_CMD --with-php=${{ inputs.php-version }} --for-extensions=${{ inputs.extensions }} --ignore-cache-sources=php-src"
-          BUILD_CMD="$BUILD_CMD ${{ inputs.extensions }}"
+          STATIC_EXTS="${{ inputs.extensions }}"
+          SHARED_EXTS="${{ inputs['shared-extensions'] }}"
+          BUILD_FRANKENPHP="${{ inputs['build-frankenphp'] }}"
+          ENABLE_ZTS="${{ inputs['enable-zts'] }}"
+          ALL_EXTS="$STATIC_EXTS"
+          if [ -n "$SHARED_EXTS" ]; then
+            ALL_EXTS="$ALL_EXTS,$SHARED_EXTS"
+          fi
+          DOWN_CMD="$DOWN_CMD --with-php=${{ inputs.php-version }} --for-extensions=$ALL_EXTS --ignore-cache-sources=php-src"
+          BUILD_CMD="$BUILD_CMD $STATIC_EXTS"
+          if [ -n "$SHARED_EXTS" ]; then
+            BUILD_CMD="$BUILD_CMD --build-shared=$SHARED_EXTS"
+          fi
           if [ -n "${{ inputs.extra-libs }}" ]; then
             DOWN_CMD="$DOWN_CMD --for-libs=${{ inputs.extra-libs }}"
             BUILD_CMD="$BUILD_CMD --with-libs=${{ inputs.extra-libs }}"
@@ -157,6 +198,9 @@ jobs:
           if [ ${{ inputs.prefer-pre-built }} == true ]; then
               DOWN_CMD="$DOWN_CMD --prefer-pre-built"
           fi
+          if [ ${{ inputs.with-suggested-libs }} == true ]; then
+              BUILD_CMD="$BUILD_CMD --with-suggested-libs"
+          fi
           if [ ${{ inputs.build-cli }} == true ]; then
               BUILD_CMD="$BUILD_CMD --build-cli"
           fi
@@ -166,6 +210,12 @@ jobs:
           if [ ${{ inputs.build-fpm }} == true ]; then
               BUILD_CMD="$BUILD_CMD --build-fpm"
           fi
+          if [ "$BUILD_FRANKENPHP" = "true" ]; then
+              BUILD_CMD="$BUILD_CMD --build-frankenphp"
+          fi
+          if [ "$ENABLE_ZTS" = "true" ]; then
+              BUILD_CMD="$BUILD_CMD --enable-zts"
+          fi
           echo 'download='"$DOWN_CMD" >> "$GITHUB_OUTPUT"
           echo 'build='"$BUILD_CMD" >> "$GITHUB_OUTPUT"
           echo 'run='"$RUNS_ON" >> "$GITHUB_OUTPUT"
@@ -188,6 +238,27 @@ jobs:
         env:
           phpts: nts
 
+      - if: ${{ inputs['build-frankenphp'] == true }}
+        name: "Install go-xcaddy for FrankenPHP"
+        run: |
+          case "${{ inputs.os }}" in
+            linux-x86_64|linux-aarch64)
+              ./bin/spc-alpine-docker install-pkg go-xcaddy
+              ;;
+            linux-x86_64-glibc|linux-aarch64-glibc)
+              ./bin/spc-gnu-docker install-pkg go-xcaddy
+              ;;
+            macos-x86_64|macos-aarch64)
+              composer update --no-dev --classmap-authoritative
+              ./bin/spc doctor --auto-fix
+              ./bin/spc install-pkg go-xcaddy
+              ;;
+            *)
+              echo "Unsupported OS for go-xcaddy install: ${{ inputs.os }}"
+              exit 1
+              ;;
+          esac
+
       # Cache downloaded source
       - id: cache-download
         uses: actions/cache@v4
@@ -202,6 +273,14 @@ jobs:
 #        if: ${{ failure() }}
 #        uses: mxschmitt/action-tmate@v3
 
+      # Upload debug logs
+      - if: ${{ inputs.debug && failure() }}
+        name: "Upload build logs on failure"
+        uses: actions/upload-artifact@v4
+        with:
+          name: spc-logs-${{ inputs.php-version }}-${{ inputs.os }}
+          path: log/*.log
+
       # Upload cli executable
       - if: ${{ inputs.build-cli == true }}
         name: "Upload PHP cli SAPI"
@@ -226,7 +305,22 @@ jobs:
           name: php-fpm-${{ inputs.php-version }}-${{ inputs.os }}
           path: buildroot/bin/php-fpm
 
+      # Upload frankenphp executable
+      - if: ${{ inputs['build-frankenphp'] == true }}
+        name: "Upload FrankenPHP SAPI"
+        uses: actions/upload-artifact@v4
+        with:
+          name: php-frankenphp-${{ inputs.php-version }}-${{ inputs.os }}
+          path: buildroot/bin/frankenphp
+
       # Upload extensions metadata
+      - if: ${{ inputs['shared-extensions'] != '' }}
+        name: "Upload shared extensions"
+        uses: actions/upload-artifact@v4
+        with:
+          name: php-shared-ext-${{ inputs.php-version }}-${{ inputs.os }}
+          path: |
+            buildroot/modules/*.so
       - uses: actions/upload-artifact@v4
         name: "Upload License Files"
         with:

bin/spc-alpine-docker

@@ -108,8 +108,7 @@ RUN apk update; \
         wget \
         xz \
         gettext-dev \
-        binutils-gold \
-        patchelf
+        binutils-gold
 
 RUN curl -#fSL https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-linux-\$(uname -m).tar.gz | tar -xz -C /usr/local/bin && \
     chmod +x /usr/local/bin/php
@@ -162,6 +161,47 @@ if [ ! -z "$GITHUB_TOKEN" ]; then
     ENV_LIST="$ENV_LIST -e GITHUB_TOKEN=$GITHUB_TOKEN"
 fi
 
+# Intercept and rewrite --with-frankenphp-app option, and mount host path to /app/app
+FRANKENPHP_APP_PATH=""
+NEW_ARGS=()
+while [ $# -gt 0 ]; do
+    case "$1" in
+        --with-frankenphp-app=*)
+            FRANKENPHP_APP_PATH="${1#*=}"
+            NEW_ARGS+=("--with-frankenphp-app=/app/app")
+            shift
+            ;;
+        --with-frankenphp-app)
+            if [ -n "${2:-}" ]; then
+                FRANKENPHP_APP_PATH="$2"
+                NEW_ARGS+=("--with-frankenphp-app=/app/app")
+                shift 2
+            else
+                NEW_ARGS+=("$1")
+                shift
+            fi
+            ;;
+        *)
+            NEW_ARGS+=("$1")
+            shift
+            ;;
+    esac
+done
+
+# Normalize the path and add mount if provided
+if [ -n "$FRANKENPHP_APP_PATH" ]; then
+    # expand ~ to $HOME
+    if [ "${FRANKENPHP_APP_PATH#~}" != "$FRANKENPHP_APP_PATH" ]; then
+        FRANKENPHP_APP_PATH="$HOME${FRANKENPHP_APP_PATH#~}"
+    fi
+    # make absolute if relative
+    case "$FRANKENPHP_APP_PATH" in
+        /*) ABS_APP_PATH="$FRANKENPHP_APP_PATH" ;;
+        *) ABS_APP_PATH="$(pwd)/$FRANKENPHP_APP_PATH" ;;
+    esac
+    MOUNT_LIST="$MOUNT_LIST -v $ABS_APP_PATH:/app/app"
+fi
+
 # Run docker
 # shellcheck disable=SC2068
 # shellcheck disable=SC2086
@@ -183,5 +223,5 @@ if [ "$SPC_DOCKER_DEBUG" = "yes" ]; then
     set -ex
     $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION /bin/bash
 else
-    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc $@
+    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc "${NEW_ARGS[@]}"
 fi

bin/spc-gnu-docker

@@ -92,11 +92,6 @@ RUN echo "source scl_source enable devtoolset-10" >> /etc/bashrc
 RUN source /etc/bashrc
 RUN yum install -y which
 
-RUN curl -fsSL -o patchelf.tgz https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-$SPC_USE_ARCH.tar.gz && \
-    mkdir -p /patchelf && \
-    tar -xzf patchelf.tgz -C /patchelf --strip-components=1 && \
-    cp /patchelf/bin/patchelf /usr/bin/
-
 RUN curl -o cmake.tgz -#fSL https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$SPC_USE_ARCH.tar.gz && \
     mkdir /cmake && \
     tar -xzf cmake.tgz -C /cmake --strip-components 1
@@ -174,6 +169,47 @@ if [ ! -z "$GITHUB_TOKEN" ]; then
     ENV_LIST="$ENV_LIST -e GITHUB_TOKEN=$GITHUB_TOKEN"
 fi
 
+# Intercept and rewrite --with-frankenphp-app option, and mount host path to /app/app
+FRANKENPHP_APP_PATH=""
+NEW_ARGS=()
+while [ $# -gt 0 ]; do
+    case "$1" in
+        --with-frankenphp-app=*)
+            FRANKENPHP_APP_PATH="${1#*=}"
+            NEW_ARGS+=("--with-frankenphp-app=/app/app")
+            shift
+            ;;
+        --with-frankenphp-app)
+            if [ -n "${2:-}" ]; then
+                FRANKENPHP_APP_PATH="$2"
+                NEW_ARGS+=("--with-frankenphp-app=/app/app")
+                shift 2
+            else
+                NEW_ARGS+=("$1")
+                shift
+            fi
+            ;;
+        *)
+            NEW_ARGS+=("$1")
+            shift
+            ;;
+    esac
+done
+
+# Normalize the path and add mount if provided
+if [ -n "$FRANKENPHP_APP_PATH" ]; then
+    # expand ~ to $HOME
+    if [ "${FRANKENPHP_APP_PATH#~}" != "$FRANKENPHP_APP_PATH" ]; then
+        FRANKENPHP_APP_PATH="$HOME${FRANKENPHP_APP_PATH#~}"
+    fi
+    # make absolute if relative
+    case "$FRANKENPHP_APP_PATH" in
+        /*) ABS_APP_PATH="$FRANKENPHP_APP_PATH" ;;
+        *) ABS_APP_PATH="$(pwd)/$FRANKENPHP_APP_PATH" ;;
+    esac
+    MOUNT_LIST="$MOUNT_LIST -v $ABS_APP_PATH:/app/app"
+fi
+
 # Run docker
 # shellcheck disable=SC2068
 # shellcheck disable=SC2086
@@ -196,5 +232,5 @@ if [ "$SPC_DOCKER_DEBUG" = "yes" ]; then
     set -ex
     $DOCKER_EXECUTABLE run $PLATFORM_ARG --privileged --rm -it $INTERACT $ENV_LIST --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH-$SPC_DOCKER_VERSION /bin/bash
 else
-    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc $@
+    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc "${NEW_ARGS[@]}"
 fi

config/env.ini

@@ -1,40 +1,41 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; static-php-cli (spc) env configuration
 ;
 ; This file is used to set default env vars for static-php-cli build.
 ; As dynamic build process, some of these vars can be overwritten by CLI options.
 ; And you can also overwrite these vars by setting them in your shell environment.
+; The value should be changed only if you know what you are doing. Otherwise, please leave them as default.
 ;
 ; We need to use some pre-defined internal env vars, like `BUILD_ROOT_PATH`, `DOWNLOAD_PATH`, etc.
-; Please note that these vars cannot be defined in this file, they are only be defined before static-php-cli running.
+; Please note that these vars cannot be defined in this file, they should only be defined before static-php-cli running.
 ;
-; Here's a list of env vars, these value cannot be changed anywhere:
+; Here's a list of env vars, these variables will be defined if not defined:
 ;
-;   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`)
 ;   BUILD_INCLUDE_PATH: the path of the include files. (default: `$BUILD_ROOT_PATH/include`)
 ;   BUILD_LIB_PATH:     the path of the lib files. (default: `$BUILD_ROOT_PATH/lib`)
 ;   BUILD_BIN_PATH:     the path of the bin files. (default: `$BUILD_ROOT_PATH/bin`)
-;   PKG_ROOT_PATH:      the root path of the package files. (default: `$(pwd)/pkgroot`)
+;   BUILD_MODULES_PATH: the path of the php modules (shared extensions) files. (default: `$BUILD_ROOT_PATH/modules`)
+;   PKG_ROOT_PATH:      the root path of the package files. (default: `$(pwd)/pkgroot/$GNU_ARCH-{darwin|linux|windows}`)
 ;   SOURCE_PATH:        the path of the source files. (default: `$(pwd)/source`)
 ;   DOWNLOAD_PATH:      the path of the download files. (default: `$(pwd)/downloads`)
-;   CPU_COUNT:          the count of the CPU cores. (default: `$(nproc)`)
-;   SPC_ARCH:           the arch of the current system, for some libraries needed `--host=XXX` args. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`, `arm64`)
-;   GNU_ARCH:           the GNU arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`)
-;   MAC_ARCH:           the MAC arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `arm64`)
+;   PATH:               (*nix only) static-php-cli will add `$BUILD_BIN_PATH` to PATH.
+;   PKG_CONFIG_PATH:    (*nix only) static-php-cli will set `$BUILD_LIB_PATH/pkgconfig` to PKG_CONFIG_PATH.
 ;
-;   * These vars are only be defined in Unix (macOS, Linux, FreeBSD)Builder and cannot be changed anywhere:
-;   PATH:                               static-php-cli will add `$BUILD_BIN_PATH` to PATH.
-;   PKG_CONFIG:                         static-php-cli will set `$BUILD_BIN_PATH/pkg-config` to PKG_CONFIG.
-;   PKG_CONFIG_PATH:                    static-php-cli will set `$BUILD_LIB_PATH/pkgconfig` to PKG_CONFIG_PATH.
+; Here's a list of env vars, these variables is defined in SPC and cannot be changed anywhere:
 ;
-;   * These vars are only be defined in LinuxBuilder and cannot be changed anywhere:
-;   SPC_LINUX_DEFAULT_CC:                   the default compiler for linux. (For alpine linux: `gcc`, default: `$GNU_ARCH-linux-musl-gcc`)
-;   SPC_LINUX_DEFAULT_CXX:                  the default c++ compiler for linux. (For alpine linux: `g++`, default: `$GNU_ARCH-linux-musl-g++`)
-;   SPC_LINUX_DEFAULT_AR:                   the default archiver for linux. (For alpine linux: `ar`, default: `$GNU_ARCH-linux-musl-ar`)
-;   SPC_EXTRA_PHP_VARS:                     the extra vars for building php, used in `configure` and `make` command.
+;   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`)
+;   CPU_COUNT:              the count of the CPU cores. (default: `$(nproc)`)
+;   SPC_ARCH:               the arch of the current system, for some libraries needed `--host=XXX` args. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`, `arm64`)
+;   GNU_ARCH:               the GNU arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`)
+;   MAC_ARCH:               the MAC arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `arm64`)
+;   PKG_CONFIG:             (*nix only) static-php-cli will set `$BUILD_BIN_PATH/pkg-config` to PKG_CONFIG.
+;   SPC_LINUX_DEFAULT_CC:   (linux only) the default compiler for linux. (For alpine linux: `gcc`, default: `$GNU_ARCH-linux-musl-gcc`)
+;   SPC_LINUX_DEFAULT_CXX:  (linux only) the default c++ compiler for linux. (For alpine linux: `g++`, default: `$GNU_ARCH-linux-musl-g++`)
+;   SPC_LINUX_DEFAULT_AR:   (linux only) the default archiver for linux. (For alpine linux: `ar`, default: `$GNU_ARCH-linux-musl-ar`)
+;   SPC_EXTRA_PHP_VARS:     (linux only) the extra vars for building php, used in `configure` and `make` command.
 
 [global]
 ; Build concurrency for make -jN, default is CPU_COUNT, this value are used in every libs.
@@ -44,7 +45,7 @@ SPC_SKIP_PHP_VERSION_CHECK="no"
 ; Ignore some check item for bin/spc doctor command, comma separated (e.g. SPC_SKIP_DOCTOR_CHECK_ITEMS="if homebrew has installed")
 SPC_SKIP_DOCTOR_CHECK_ITEMS=""
 ; 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"
+SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES="--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}"
 
@@ -74,8 +75,10 @@ SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime
 ; - musl-native: used for alpine linux, can build `musl` and `musl -dynamic` target.
 ; - gnu-native: used for general linux distros, can build gnu target for the installed glibc version only.
 
-; LEGACY option to specify the target
+; option to specify the target, superceded by SPC_TARGET if set
 SPC_LIBC=musl
+; uncomment to link libc dynamically on musl
+; SPC_MUSL_DYNAMIC=true
 
 ; Recommended: specify your target here. Zig toolchain will be used.
 ; examples:
@@ -109,13 +112,15 @@ SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --disable
 ; *** default build vars for building php ***
 ; embed type for php, static (libphp.a) or shared (libphp.so)
 SPC_CMD_VAR_PHP_EMBED_TYPE="static"
-; CFLAGS for configuring php
-SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -fPIE"
-; EXTRA_CFLAGS for `make` php
+; EXTRA_CFLAGS for `configure` and `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE ${SPC_DEFAULT_C_FLAGS}"
 ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
 
+; optional, path to openssl conf. This affects where openssl will look for the default CA.
+; default on Debian/Alpine: /etc/ssl, default on RHEL: /etc/pki/tls
+OPENSSLDIR=""
+
 [macos]
 ; build target: macho or macho (possibly we could support macho-universal in the future)
 ; Currently we do not support universal and cross-compilation for macOS.
@@ -141,10 +146,12 @@ SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-
 ; *** default build vars for building php ***
 ; embed type for php, static (libphp.a) or shared (libphp.dylib)
 SPC_CMD_VAR_PHP_EMBED_TYPE="static"
-; CFLAGS for configuring php
-SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -Werror=unknown-warning-option"
-; EXTRA_CFLAGS for `make` php
-SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie ${SPC_DEFAULT_C_FLAGS}"
+; EXTRA_CFLAGS for `configure` and `make` php
+SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -Werror=unknown-warning-option ${SPC_DEFAULT_C_FLAGS}"
+; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
+; minimum compatible macOS version (LLVM vars, availability not guaranteed)
+MACOSX_DEPLOYMENT_TARGET=12.0
 
 [freebsd]
 ; compiler environments

config/ext.json

@@ -43,6 +43,14 @@
     "calendar": {
         "type": "builtin"
     },
+    "com_dotnet": {
+        "support": {
+            "BSD": "no",
+            "Linux": "no",
+            "Darwin": "no"
+        },
+        "type": "builtin"
+    },
     "ctype": {
         "type": "builtin"
     },
@@ -55,7 +63,8 @@
         ],
         "ext-depends-windows": [
             "zlib",
-            "openssl"
+            "openssl",
+            "brotli"
         ]
     },
     "dba": {
@@ -65,6 +74,19 @@
             "qdbm"
         ]
     },
+    "decimal": {
+        "type": "external",
+        "source": "ext-decimal",
+        "arg-type": "custom",
+        "lib-depends": [
+            "libmpdec"
+        ]
+    },
+    "deepclone": {
+        "type": "external",
+        "source": "deepclone",
+        "arg-type": "enable"
+    },
     "dio": {
         "support": {
             "BSD": "wip"
@@ -127,6 +149,14 @@
             "sockets"
         ]
     },
+    "excimer": {
+        "support": {
+            "Windows": "wip",
+            "BSD": "wip"
+        },
+        "type": "external",
+        "source": "ext-excimer"
+    },
     "exif": {
         "type": "builtin"
     },
@@ -232,11 +262,14 @@
             "BSD": "wip"
         },
         "type": "external",
-        "source": "grpc",
+        "source": "ext-grpc",
         "arg-type-unix": "enable-path",
         "cpp-extension": true,
         "lib-depends": [
-            "grpc"
+            "grpc",
+            "zlib",
+            "openssl",
+            "libcares"
         ]
     },
     "iconv": {
@@ -358,6 +391,18 @@
             "liblz4"
         ]
     },
+    "maxminddb": {
+        "support": {
+            "BSD": "wip",
+            "Windows": "wip"
+        },
+        "type": "external",
+        "source": "ext-maxminddb",
+        "arg-type": "with",
+        "lib-depends": [
+            "libmaxminddb"
+        ]
+    },
     "mbregex": {
         "type": "builtin",
         "arg-type": "custom",
@@ -396,8 +441,7 @@
         "ext-depends": [
             "zlib",
             "session"
-        ],
-        "build-with-php": true
+        ]
     },
     "memcached": {
         "support": {
@@ -475,6 +519,40 @@
             "zlib"
         ]
     },
+    "mysqlnd_ed25519": {
+        "type": "external",
+        "source": "mysqlnd_ed25519",
+        "arg-type": "enable",
+        "target": [
+            "shared"
+        ],
+        "ext-depends": [
+            "mysqlnd"
+        ],
+        "lib-depends": [
+            "libsodium"
+        ],
+        "lib-suggests": [
+            "openssl"
+        ]
+    },
+    "mysqlnd_parsec": {
+        "type": "external",
+        "source": "mysqlnd_parsec",
+        "arg-type": "enable",
+        "target": [
+            "shared"
+        ],
+        "ext-depends": [
+            "mysqlnd"
+        ],
+        "lib-depends": [
+            "libsodium"
+        ],
+        "lib-suggests": [
+            "openssl"
+        ]
+    },
     "oci8": {
         "type": "wip",
         "support": {
@@ -555,6 +633,13 @@
         "type": "builtin",
         "unix-only": true
     },
+    "pcov": {
+        "type": "external",
+        "source": "pcov",
+        "target": [
+            "shared"
+        ]
+    },
     "pdo": {
         "type": "builtin"
     },

config/lib.json

@@ -7,12 +7,14 @@
         "source": "php-src",
         "lib-depends": [
             "lib-base",
-            "micro"
+            "micro",
+            "frankenphp"
         ],
         "lib-depends-macos": [
             "lib-base",
             "micro",
-            "libxml2"
+            "libxml2",
+            "frankenphp"
         ],
         "lib-suggests-linux": [
             "libacl",
@@ -24,6 +26,10 @@
             "watcher"
         ]
     },
+    "frankenphp": {
+        "source": "frankenphp",
+        "type": "target"
+    },
     "micro": {
         "type": "target",
         "source": "micro"
@@ -98,11 +104,12 @@
             "ngtcp2",
             "zstd",
             "libcares",
-            "ldap"
+            "ldap",
+            "idn2",
+            "krb5"
         ],
         "lib-suggests-windows": [
-            "brotli",
-            "zstd"
+            "brotli"
         ],
         "frameworks": [
             "CoreFoundation",
@@ -135,9 +142,7 @@
             "zlib"
         ],
         "lib-suggests": [
-            "libpng",
-            "bzip2",
-            "brotli"
+            "libpng"
         ]
     },
     "gettext": {
@@ -228,6 +233,24 @@
             "unicode"
         ]
     },
+    "idn2": {
+        "source": "libidn2",
+        "pkg-configs": [
+            "libidn2"
+        ],
+        "headers": [
+            "idn2.h"
+        ],
+        "lib-suggests-unix": [
+            "libiconv",
+            "gettext",
+            "libunistring"
+        ],
+        "lib-depends-macos": [
+            "libiconv",
+            "gettext"
+        ]
+    },
     "imagemagick": {
         "source": "imagemagick",
         "cpp-library": true,
@@ -275,6 +298,26 @@
             "jbig_ar.h"
         ]
     },
+    "krb5": {
+        "source": "krb5",
+        "pkg-configs": [
+            "krb5-gssapi"
+        ],
+        "headers": [
+            "krb5.h",
+            "gssapi/gssapi.h"
+        ],
+        "lib-depends": [
+            "openssl"
+        ],
+        "lib-suggests": [
+            "ldap",
+            "libedit"
+        ],
+        "frameworks": [
+            "Kerberos"
+        ]
+    },
     "ldap": {
         "source": "ldap",
         "pkg-configs": [
@@ -309,12 +352,18 @@
         "static-libs-unix": [
             "libaom.a"
         ],
+        "static-libs-windows": [
+            "aom.lib"
+        ],
         "cpp-library": true
     },
     "libargon2": {
         "source": "libargon2",
         "static-libs-unix": [
             "libargon2.a"
+        ],
+        "lib-suggests": [
+            "libsodium"
         ]
     },
     "libavif": {
@@ -324,6 +373,15 @@
         ],
         "static-libs-windows": [
             "avif.lib"
+        ],
+        "lib-depends": [
+            "libaom"
+        ],
+        "lib-suggests": [
+            "libwebp",
+            "libjpeg",
+            "libxml2",
+            "libpng"
         ]
     },
     "libcares": {
@@ -435,7 +493,7 @@
         "static-libs-windows": [
             "libjpeg_a.lib"
         ],
-        "lib-suggests-windows": [
+        "lib-depends": [
             "zlib"
         ]
     },
@@ -460,6 +518,28 @@
             "liblz4.a"
         ]
     },
+    "libmaxminddb": {
+        "source": "libmaxminddb",
+        "static-libs-unix": [
+            "libmaxminddb.a"
+        ],
+        "headers": [
+            "maxminddb.h",
+            "maxminddb_config.h"
+        ]
+    },
+    "libmpdec": {
+        "source": "libmpdec",
+        "static-libs-unix": [
+            "libmpdec.a"
+        ],
+        "static-libs-windows": [
+            "libmpdec_a.lib"
+        ],
+        "headers": [
+            "mpdecimal.h"
+        ]
+    },
     "libmemcached": {
         "source": "libmemcached",
         "cpp-library": true,
@@ -506,13 +586,16 @@
     },
     "librdkafka": {
         "source": "librdkafka",
-        "static-libs-unix": [
-            "librdkafka.a",
-            "librdkafka++.a",
-            "librdkafka-static.a"
+        "pkg-configs": [
+            "rdkafka++-static",
+            "rdkafka-static"
         ],
         "cpp-library": true,
         "lib-suggests": [
+            "curl",
+            "liblz4",
+            "openssl",
+            "zlib",
             "zstd"
         ]
     },
@@ -559,6 +642,16 @@
             "zstd"
         ]
     },
+    "libunistring": {
+        "source": "libunistring",
+        "static-libs-unix": [
+            "libunistring.a"
+        ],
+        "headers": [
+            "unistr.h",
+            "unistring/"
+        ]
+    },
     "liburing": {
         "source": "liburing",
         "pkg-configs": [
@@ -681,7 +774,6 @@
             "xz"
         ],
         "lib-suggests-windows": [
-            "zstd",
             "openssl"
         ]
     },
@@ -781,6 +873,9 @@
     },
     "openssl": {
         "source": "openssl",
+        "pkg-configs": [
+            "openssl"
+        ],
         "static-libs-unix": [
             "libssl.a",
             "libcrypto.a"
@@ -893,6 +988,11 @@
     },
     "unixodbc": {
         "source": "unixodbc",
+        "pkg-configs": [
+            "odbc",
+            "odbccr",
+            "odbcinst"
+        ],
         "static-libs-unix": [
             "libodbc.a",
             "libodbccr.a",
@@ -910,6 +1010,9 @@
         ],
         "headers": [
             "wtr/watcher-c.h"
+        ],
+        "frameworks": [
+            "CoreServices"
         ]
     },
     "xz": {
@@ -934,6 +1037,9 @@
     },
     "zlib": {
         "source": "zlib",
+        "pkg-configs": [
+            "zlib"
+        ],
         "static-libs-unix": [
             "libz.a"
         ],
@@ -947,6 +1053,9 @@
     },
     "zstd": {
         "source": "zstd",
+        "pkg-configs": [
+            "libzstd"
+        ],
         "static-libs-unix": [
             "libzstd.a"
         ],

config/source.json

@@ -84,6 +84,25 @@
             "path": "COPYING"
         }
     },
+    "ext-decimal": {
+        "type": "ghtagtar",
+        "repo": "php-decimal/ext-decimal",
+        "match": "v2\\.\\d.*",
+        "path": "php-src/ext/decimal",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
+    "deepclone": {
+        "type": "ghtagtar",
+        "repo": "symfony/php-ext-deepclone",
+        "path": "php-src/ext/deepclone",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "dio": {
         "type": "url",
         "url": "https://pecl.php.net/get/dio",
@@ -126,13 +145,23 @@
     },
     "ext-event": {
         "type": "url",
-        "url": "https://bitbucket.org/osmanov/pecl-event/get/3.0.8.tar.gz",
+        "url": "https://bitbucket.org/osmanov/pecl-event/get/3.1.4.tar.gz",
         "path": "php-src/ext/event",
         "license": {
             "type": "file",
             "path": "LICENSE"
         }
     },
+    "ext-excimer": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/excimer",
+        "path": "php-src/ext/excimer",
+        "filename": "excimer.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "ext-glfw": {
         "type": "git",
         "url": "https://github.com/mario-deluna/php-glfw",
@@ -151,6 +180,18 @@
             "path": "LICENSE"
         }
     },
+    "ext-grpc": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/grpc",
+        "path": "php-src/ext/grpc",
+        "filename": "grpc.tgz",
+        "license": {
+            "type": "file",
+            "path": [
+                "LICENSE"
+            ]
+        }
+    },
     "ext-imagick": {
         "type": "url",
         "url": "https://pecl.php.net/get/imagick",
@@ -184,6 +225,15 @@
             ]
         }
     },
+    "ext-maxminddb": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/maxminddb",
+        "filename": "ext-maxminddb.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "ext-memcache": {
         "type": "url",
         "url": "https://pecl.php.net/get/memcache",
@@ -196,7 +246,7 @@
     },
     "ext-rdkafka": {
         "type": "ghtar",
-        "repo": "arnaud-lb/php-rdkafka",
+        "repo": "php-rdkafka/php-rdkafka",
         "path": "php-src/ext/rdkafka",
         "license": {
             "type": "file",
@@ -301,10 +351,19 @@
             "path": "LICENSE.MIT"
         }
     },
+    "frankenphp": {
+        "type": "ghtar",
+        "repo": "php/frankenphp",
+        "prefer-stable": true,
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "freetype": {
-        "type": "git",
-        "rev": "VER-2-13-2",
-        "url": "https://github.com/freetype/freetype",
+        "type": "ghtagtar",
+        "repo": "freetype/freetype",
+        "match": "VER-2-\\d+-\\d+",
         "license": {
             "type": "file",
             "path": "LICENSE.TXT"
@@ -321,7 +380,7 @@
     },
     "gmp": {
         "type": "filelist",
-        "url": "https://gmplib.org/download/gmp/",
+        "url": "https://ftp.gnu.org/gnu/gmp/",
         "regex": "/href=\"(?<file>gmp-(?<version>[^\"]+)\\.tar\\.xz)\"/",
         "provide-pre-built": true,
         "alt": {
@@ -421,6 +480,14 @@
             "path": "COPYING"
         }
     },
+    "krb5": {
+        "type": "url",
+        "url": "https://web.mit.edu/kerberos/dist/krb5/1.22/krb5-1.22.2.tar.gz",
+        "license": {
+            "type": "file",
+            "path": "NOTICE"
+        }
+    },
     "ldap": {
         "type": "filelist",
         "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/",
@@ -476,7 +543,7 @@
     "libavif": {
         "type": "ghtar",
         "repo": "AOMediaCodec/libavif",
-        "provide-pre-built": true,
+        "provide-pre-built": false,
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -579,9 +646,19 @@
             "path": "source/COPYING"
         }
     },
+    "libidn2": {
+        "type": "filelist",
+        "url": "https://ftp.gnu.org/gnu/libidn/",
+        "regex": "/href=\"(?<file>libidn2-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+        "license": {
+            "type": "file",
+            "path": "COPYING.LESSERv3"
+        }
+    },
     "libjpeg": {
         "type": "ghtar",
         "repo": "libjpeg-turbo/libjpeg-turbo",
+        "prefer-stable": true,
         "license": {
             "type": "file",
             "path": "LICENSE.md"
@@ -613,6 +690,24 @@
             "path": "LICENSE"
         }
     },
+    "libmaxminddb": {
+        "type": "ghrel",
+        "repo": "maxmind/libmaxminddb",
+        "match": "libmaxminddb-.+\\.tar\\.gz",
+        "prefer-stable": true,
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
+    "libmpdec": {
+        "type": "url",
+        "url": "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-4.0.1.tar.gz",
+        "license": {
+            "type": "file",
+            "path": "COPYRIGHT.txt"
+        }
+    },
     "libmemcached": {
         "type": "ghtagtar",
         "repo": "awesomized/libmemcached",
@@ -623,9 +718,10 @@
         }
     },
     "libpng": {
-        "type": "git",
-        "url": "https://github.com/glennrp/libpng.git",
-        "rev": "libpng16",
+        "type": "ghtagtar",
+        "repo": "pnggroup/libpng",
+        "match": "v1\\.6\\.\\d+",
+        "query": "?per_page=150",
         "provide-pre-built": true,
         "license": {
             "type": "file",
@@ -633,9 +729,9 @@
         }
     },
     "librabbitmq": {
-        "type": "git",
-        "url": "https://github.com/alanxz/rabbitmq-c.git",
-        "rev": "master",
+        "type": "ghtar",
+        "repo": "alanxz/rabbitmq-c",
+        "prefer-stable": true,
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -652,7 +748,7 @@
     "libsodium": {
         "type": "ghrel",
         "repo": "jedisct1/libsodium",
-        "match": "libsodium-\\d+(\\.\\d+)*\\.tar\\.gz",
+        "match": "libsodium-(?!1\\.0\\.21)\\d+(\\.\\d+)*\\.tar\\.gz",
         "prefer-stable": true,
         "provide-pre-built": true,
         "license": {
@@ -680,6 +776,16 @@
             "path": "LICENSE.md"
         }
     },
+    "libunistring": {
+        "type": "filelist",
+        "url": "https://ftp.gnu.org/gnu/libunistring/",
+        "regex": "/href=\"(?<file>libunistring-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+        "provide-pre-built": true,
+        "license": {
+            "type": "file",
+            "path": "COPYING.LIB"
+        }
+    },
     "liburing": {
         "type": "ghtar",
         "repo": "axboe/liburing",
@@ -693,6 +799,7 @@
         "type": "git",
         "url": "https://github.com/static-php/libuuid.git",
         "rev": "master",
+        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "COPYING"
@@ -713,8 +820,9 @@
         ]
     },
     "libwebp": {
-        "type": "url",
-        "url": "https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.2.tar.gz",
+        "type": "ghtagtar",
+        "repo": "webmproject/libwebp",
+        "match": "v1\\.\\d+\\.\\d+$",
         "provide-pre-built": true,
         "license": {
             "type": "file",
@@ -722,8 +830,10 @@
         }
     },
     "libxml2": {
-        "type": "url",
-        "url": "https://github.com/GNOME/libxml2/archive/refs/tags/v2.12.5.tar.gz",
+        "type": "ghtagtar",
+        "repo": "GNOME/libxml2",
+        "match": "v2\\.\\d+\\.\\d+$",
+        "provide-pre-built": false,
         "license": {
             "type": "file",
             "path": "Copyright"
@@ -810,6 +920,24 @@
             "path": "LICENSE"
         }
     },
+    "mysqlnd_ed25519": {
+        "type": "pie",
+        "repo": "mariadb/mysqlnd_ed25519",
+        "path": "php-src/ext/mysqlnd_ed25519",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
+    "mysqlnd_parsec": {
+        "type": "pie",
+        "repo": "mariadb/mysqlnd_parsec",
+        "path": "php-src/ext/mysqlnd_parsec",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "ncurses": {
         "type": "filelist",
         "url": "https://ftp.gnu.org/pub/gnu/ncurses/",
@@ -872,7 +1000,7 @@
     "openssl": {
         "type": "ghrel",
         "repo": "openssl/openssl",
-        "match": "openssl.+\\.tar\\.gz",
+        "match": "openssl-3.+\\.tar\\.gz",
         "prefer-stable": true,
         "alt": {
             "type": "filelist",
@@ -905,6 +1033,15 @@
             "path": "LICENSE"
         }
     },
+    "pcov": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/pcov",
+        "filename": "pcov.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "pdo_sqlsrv": {
         "type": "url",
         "url": "https://pecl.php.net/get/pdo_sqlsrv",
@@ -943,7 +1080,7 @@
     },
     "protobuf": {
         "type": "url",
-        "url": "https://pecl.php.net/get/protobuf",
+        "url": "https://pecl.php.net/get/protobuf-5.34.1.tgz",
         "path": "php-src/ext/protobuf",
         "filename": "protobuf.tgz",
         "license": {
@@ -1057,7 +1194,6 @@
         "path": "php-src/ext/swoole",
         "type": "ghtar",
         "repo": "swoole/swoole-src",
-        "match": "v6\\.+",
         "prefer-stable": true,
         "license": {
             "type": "file",
@@ -1102,9 +1238,8 @@
         }
     },
     "xdebug": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/xdebug",
-        "filename": "xdebug.tgz",
+        "type": "pie",
+        "repo": "xdebug/xdebug",
         "license": {
             "type": "file",
             "path": "LICENSE"

docs/.vitepress/config.ts

@@ -1,6 +1,5 @@
 import sidebarEn from "./sidebar.en";
 import sidebarZh from "./sidebar.zh";
-import sidebarJa from "./sidebar.ja";
 
 
 // https://vitepress.dev/reference/site-config
@@ -62,19 +61,5 @@ export default {
         indexName: 'static-php docs',
       },
     },
-  },
-  head: [
-    [
-      'script',
-      { async: '', src: 'https://www.googletagmanager.com/gtag/js?id=G-0MBJ29BD7F' }
-    ],
-    [
-      'script',
-      {},
-      `window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
-      gtag('config', 'G-0MBJ29BD7F');`
-    ]
-  ]
+  }
 }

docs/en/guide/action-build.md

@@ -16,8 +16,10 @@ while also defining the extensions to compile.
 
 1. Fork project.
 2. Go to the Actions of the project and select `CI`.
-3. Select `Run workflow`, fill in the PHP version you want to compile, the target type, and the list of extensions. (extensions comma separated, e.g. `bcmath,curl,mbstring`)
-4. After waiting for about a period of time, enter the corresponding task and get `Artifacts`.
+3. Select `Run workflow`, fill in the PHP version you want to compile, the target type, and the list of static extensions. (comma separated, e.g. `bcmath,curl,mbstring`)
+4. If you need shared extensions (for example `xdebug`), set `shared-extensions` (comma separated, e.g. `xdebug`).
+5. If you need FrankenPHP, enable `build-frankenphp` and also enable `enable-zts`.
+6. After waiting for about a period of time, enter the corresponding task and get `Artifacts`.
 
 If you enable `debug`, all logs will be output at build time, including compiled logs, for troubleshooting.
 

docs/en/guide/manual-build.md

@@ -549,22 +549,24 @@ otherwise it will be executed repeatedly in other events.
 
 The following are the supported `patch_point` event names and corresponding locations:
 
-| Event name                   | Event description                                                                                  |
-|------------------------------|----------------------------------------------------------------------------------------------------|
-| before-libs-extract          | Triggered before the dependent libraries extracted                                                 |
-| after-libs-extract           | Triggered after the compiled dependent libraries extracted                                         |
-| before-php-extract           | Triggered before PHP source code extracted                                                         |
-| after-php-extract            | Triggered after PHP source code extracted                                                          |
-| before-micro-extract         | Triggered before phpmicro extract                                                                  |
-| after-micro-extract          | Triggered after phpmicro extracted                                                                 |
-| before-exts-extract          | Triggered before the extension (to be compiled) extracted to the PHP source directory              |
-| after-exts-extract           | Triggered after the extension extracted to the PHP source directory                                |
-| before-library[*name*]-build | Triggered before the library named `name` is compiled (such as `before-library[postgresql]-build`) |
-| after-library[*name*]-build  | Triggered after the library named `name` is compiled                                               |
-| before-php-buildconf         | Triggered before compiling PHP command `./buildconf`                                               |
-| before-php-configure         | Triggered before compiling PHP command `./configure`                                               |
-| before-php-make              | Triggered before compiling PHP command `make`                                                      |
-| before-sanity-check          | Triggered after compiling PHP but before running extended checks                                   |
+| Event name                      | Event description                                                                                  |
+|---------------------------------|----------------------------------------------------------------------------------------------------|
+| before-libs-extract             | Triggered before the dependent libraries extracted                                                 |
+| after-libs-extract              | Triggered after the compiled dependent libraries extracted                                         |
+| before-php-extract              | Triggered before PHP source code extracted                                                         |
+| after-php-extract               | Triggered after PHP source code extracted                                                          |
+| before-micro-extract            | Triggered before phpmicro extract                                                                  |
+| after-micro-extract             | Triggered after phpmicro extracted                                                                 |
+| before-exts-extract             | Triggered before the extension (to be compiled) extracted to the PHP source directory              |
+| after-exts-extract              | Triggered after the extension extracted to the PHP source directory                                |
+| before-library[*name*]-build    | Triggered before the library named `name` is compiled (such as `before-library[postgresql]-build`) |
+| after-library[*name*]-build     | Triggered after the library named `name` is compiled                                               |
+| after-shared-ext[*name*]-build  | Triggered after the shared extension named `name` is compiled                                      |
+| before-shared-ext[*name*]-build | Triggered before the shared extension named `name` is compiled                                     |
+| before-php-buildconf            | Triggered before compiling PHP command `./buildconf`                                               |
+| before-php-configure            | Triggered before compiling PHP command `./configure`                                               |
+| before-php-make                 | Triggered before compiling PHP command `make`                                                      |
+| before-sanity-check             | Triggered after compiling PHP but before running extended checks                                   |
 
 The following is a simple example of temporarily modifying the PHP source code. 
 Enable the CLI function to search for the `php.ini` configuration in the current working directory:

docs/zh/guide/action-build.md

@@ -14,7 +14,9 @@ Action 构建指的是直接使用 GitHub Action 进行编译。
 1. Fork 本项目。
 2. 进入项目的 Actions，选择 CI 开头的 Workflow（根据你需要的操作系统选择）。
 3. 选择 `Run workflow`，填入你要编译的 PHP 版本、目标类型、扩展列表。（扩展列表使用英文逗号分割，例如 `bcmath,curl,mbstring`）
-4. 等待大约一段时间后，进入对应的任务中，获取 `Artifacts`。
+4. 如果需要共享扩展（例如 `xdebug`），请设置 `shared-extensions`（使用英文逗号分割，例如 `xdebug`）。
+5. 如果需要 FrankenPHP，请启用 `build-frankenphp`，同时也需要启用 `enable-zts`。
+6. 等待大约一段时间后，进入对应的任务中，获取 `Artifacts`。
 
 如果你选择了 `debug`，则会在构建时输出所有日志，包括编译的日志，以供排查错误。
 

docs/zh/guide/manual-build.md

@@ -500,6 +500,8 @@ bin/spc dev:sort-config ext
 | after-exts-extract           | 在要编译的扩展解压到 PHP 源码目录后触发                                    |
 | before-library[*name*]-build | 在名称为 `name` 的库编译前触发（如 `before-library[postgresql]-build`） |
 | after-library[*name*]-build  | 在名称为 `name` 的库编译后触发                                       |
+| after-shared-ext[*name*]-build | 在名称为 `name` 的共享扩展编译后触发（如 `after-shared-ext[redis]-build`）   |
+| before-shared-ext[*name*]-build | 在名称为 `name` 的共享扩展编译前触发                                    |
 | before-php-buildconf         | 在编译 PHP 命令 `./buildconf` 前触发                              |
 | before-php-configure         | 在编译 PHP 命令 `./configure` 前触发                              |
 | before-php-make              | 在编译 PHP 命令 `make` 前触发                                     |

phpstan.neon

@@ -14,6 +14,7 @@ parameters:
     - PHP_OS_FAMILY
   excludePaths:
       analyseAndScan:
+            - ./src/globals/ext-tests/decimal.php
             - ./src/globals/ext-tests/swoole.php
             - ./src/globals/ext-tests/swoole.phpt
             - ./src/globals/test-extensions.php

src/SPC/ConsoleApplication.php

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

src/SPC/builder/Extension.php

@@ -4,12 +4,16 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
+use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\EnvironmentException;
 use SPC\exception\SPCException;
 use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
+use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;
 
@@ -95,7 +99,8 @@ class Extension
             fn ($x) => $x->getStaticLibFiles(),
             $this->getLibraryDependencies(recursive: true)
         );
-        return implode(' ', $ret);
+        $libs = implode(' ', $ret);
+        return deduplicate_flags($libs);
     }
 
     /**
@@ -220,7 +225,7 @@ class Extension
      */
     public function patchBeforeSharedMake(): bool
     {
-        $config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs()));
+        $config = (new SPCConfigUtil($this->builder))->getExtensionConfig($this);
         [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
         $lstdcpp = str_contains($sharedLibs, '-l:libstdc++.a') ? '-l:libstdc++.a' : null;
         $lstdcpp ??= str_contains($sharedLibs, '-lstdc++') ? '-lstdc++' : '';
@@ -229,7 +234,7 @@ class Extension
         if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
             $prefix = $matches[1];
             $currentLibs = trim($matches[2]);
-            $newLibs = trim("{$currentLibs} {$staticLibs} {$lstdcpp}");
+            $newLibs = clean_spaces("{$currentLibs} {$staticLibs} {$lstdcpp}");
             $deduplicatedLibs = deduplicate_flags($newLibs);
 
             FileSystem::replaceFileRegex(
@@ -384,6 +389,9 @@ class Extension
                 logger()->info('Shared extension [' . $this->getName() . '] was already built, skipping (' . $this->getName() . '.so)');
                 return;
             }
+            if ((string) Config::getExt($this->getName(), 'type') === 'addon') {
+                return;
+            }
             logger()->info('Building extension [' . $this->getName() . '] as shared extension (' . $this->getName() . '.so)');
             foreach ($this->dependencies as $dependency) {
                 if (!$dependency instanceof Extension) {
@@ -394,13 +402,12 @@ class Extension
                     $dependency->buildShared([...$visited, $this->getName()]);
                 }
             }
-            if (Config::getExt($this->getName(), 'type') === 'addon') {
-                return;
-            }
+            $this->builder->emitPatchPoint('before-shared-ext[' . $this->getName() . ']-build');
             match (PHP_OS_FAMILY) {
                 'Darwin', 'Linux' => $this->buildUnixShared(),
                 default => throw new WrongUsageException(PHP_OS_FAMILY . ' build shared extensions is not supported yet'),
             };
+            $this->builder->emitPatchPoint('after-shared-ext[' . $this->getName() . ']-build');
         } catch (SPCException $e) {
             $e->bindExtensionInfo(['extension_name' => $this->getName()]);
             throw $e;
@@ -448,6 +455,20 @@ class Extension
             ->exec('make clean')
             ->exec('make -j' . $this->builder->concurrency)
             ->exec('make install');
+
+        // process *.so file
+        $soFile = BUILD_MODULES_PATH . '/' . $this->getName() . '.so';
+        $soDest = $soFile;
+        preg_match('/-release\s+(\S*)/', getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $matches);
+        if (!empty($matches[1])) {
+            $soDest = str_replace('.so', '-' . $matches[1] . '.so', $soFile);
+        }
+        if (!file_exists($soFile)) {
+            throw new ValidationException("extension {$this->getName()} build failed: {$soFile} not found", validation_module: "Extension {$this->getName()} build");
+        }
+        /** @var UnixBuilderBase $builder */
+        $builder = $this->builder;
+        $builder->deployBinary($soFile, $soDest, false);
     }
 
     /**
@@ -486,18 +507,51 @@ class Extension
         return $this->build_static;
     }
 
+    /**
+     * Get the library dependencies that current extension depends on.
+     *
+     * @param bool $recursive Whether it includes dependencies recursively
+     */
+    public function getLibraryDependencies(bool $recursive = false): array
+    {
+        $ret = array_filter($this->dependencies, fn ($x) => $x instanceof LibraryBase);
+        if (!$recursive) {
+            return $ret;
+        }
+
+        $deps = [];
+
+        $added = 1;
+        while ($added !== 0) {
+            $added = 0;
+            foreach ($ret as $depName => $dep) {
+                foreach ($dep->getDependencies(true) as $depdepName => $depdep) {
+                    if (!array_key_exists($depdepName, $deps)) {
+                        $deps[$depdepName] = $depdep;
+                        ++$added;
+                    }
+                }
+                if (!array_key_exists($depName, $deps)) {
+                    $deps[$depName] = $dep;
+                }
+            }
+        }
+
+        return $deps;
+    }
+
     /**
      * Returns the environment variables a shared extension needs to be built.
      * CFLAGS, CXXFLAGS, LDFLAGS and so on.
      */
     protected function getSharedExtensionEnv(): array
     {
-        $config = (new SPCConfigUtil($this->builder))->config(
-            [$this->getName()],
-            array_map(fn ($l) => $l->getName(), $this->getLibraryDependencies(recursive: true)),
-            $this->builder->getOption('with-suggested-exts'),
-            $this->builder->getOption('with-suggested-libs'),
-        );
+        $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+        if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            $compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
+            GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
+        }
+        $config = (new SPCConfigUtil($this->builder, ['no_php' => true]))->getExtensionConfig($this);
         [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
         $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
         $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
@@ -505,6 +559,7 @@ class Extension
             'CFLAGS' => $config['cflags'],
             'CXXFLAGS' => $config['cflags'],
             'LDFLAGS' => $config['ldflags'],
+            'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
             'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ];
@@ -519,7 +574,7 @@ class Extension
             }
             logger()->info("enabling {$this->name} without library {$name}");
         } else {
-            $this->dependencies[] = $depLib;
+            $this->dependencies[$name] = $depLib;
         }
     }
 
@@ -532,7 +587,7 @@ class Extension
             }
             logger()->info("enabling {$this->name} without extension {$name}");
         } else {
-            $this->dependencies[] = $depExt;
+            $this->dependencies[$name] = $depExt;
         }
     }
 
@@ -567,37 +622,4 @@ class Extension
         }
         return [trim($staticLibString), trim($sharedLibString)];
     }
-
-    private function getLibraryDependencies(bool $recursive = false): array
-    {
-        $ret = array_filter($this->dependencies, fn ($x) => $x instanceof LibraryBase);
-        if (!$recursive) {
-            return $ret;
-        }
-
-        $deps = [];
-
-        $added = 1;
-        while ($added !== 0) {
-            $added = 0;
-            foreach ($ret as $depName => $dep) {
-                foreach ($dep->getDependencies(true) as $depdepName => $depdep) {
-                    if (!array_key_exists($depdepName, $deps)) {
-                        $deps[$depdepName] = $depdep;
-                        ++$added;
-                    }
-                }
-                if (!array_key_exists($depName, $deps)) {
-                    $deps[$depName] = $dep;
-                }
-            }
-        }
-
-        if (array_key_exists(0, $deps)) {
-            $zero = [0 => $deps[0]];
-            unset($deps[0]);
-            return $zero + $deps;
-        }
-        return $deps;
-    }
 }

src/SPC/builder/LibraryBase.php

@@ -184,18 +184,18 @@ abstract class LibraryBase
 
             // extract first if not exists
             if (!is_dir($this->source_dir)) {
-                $this->getBuilder()->emitPatchPoint('before-library[ ' . static::NAME . ']-extract');
+                $this->getBuilder()->emitPatchPoint('before-library[' . static::NAME . ']-extract');
                 SourceManager::initSource(libs: [static::NAME], source_only: true);
-                $this->getBuilder()->emitPatchPoint('after-library[ ' . static::NAME . ']-extract');
+                $this->getBuilder()->emitPatchPoint('after-library[' . static::NAME . ']-extract');
             }
 
             if (!$this->patched && $this->patchBeforeBuild()) {
                 file_put_contents($this->source_dir . '/.spc.patched', 'PATCHED!!!');
             }
-            $this->getBuilder()->emitPatchPoint('before-library[ ' . static::NAME . ']-build');
+            $this->getBuilder()->emitPatchPoint('before-library[' . static::NAME . ']-build');
             $this->build();
             $this->installLicense();
-            $this->getBuilder()->emitPatchPoint('after-library[ ' . static::NAME . ']-build');
+            $this->getBuilder()->emitPatchPoint('after-library[' . static::NAME . ']-build');
             return LIB_STATUS_OK;
         }
 
@@ -346,25 +346,46 @@ abstract class LibraryBase
      */
     protected function installLicense(): void
     {
-        FileSystem::createDir(BUILD_ROOT_PATH . '/source-licenses/' . $this->getName());
         $source = Config::getLib($this->getName(), 'source');
+        FileSystem::createDir(BUILD_ROOT_PATH . "/source-licenses/{$source}");
         $license_files = Config::getSource($source)['license'] ?? [];
         if (is_assoc_array($license_files)) {
             $license_files = [$license_files];
         }
         foreach ($license_files as $index => $license) {
             if ($license['type'] === 'text') {
-                FileSystem::writeFile(BUILD_ROOT_PATH . '/source-licenses/' . $this->getName() . "/{$index}.txt", $license['text']);
+                FileSystem::writeFile(BUILD_ROOT_PATH . "/source-licenses/{$source}/{$index}.txt", $license['text']);
                 continue;
             }
             if ($license['type'] === 'file') {
-                copy($this->source_dir . '/' . $license['path'], BUILD_ROOT_PATH . '/source-licenses/' . $this->getName() . "/{$index}.txt");
+                copy($this->source_dir . '/' . $license['path'], BUILD_ROOT_PATH . "/source-licenses/{$source}/{$index}.txt");
             }
         }
     }
 
     protected function isLibraryInstalled(): bool
     {
+        if ($pkg_configs = Config::getLib(static::NAME, 'pkg-configs', [])) {
+            $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
+            $search_paths = array_unique(array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path)));
+
+            foreach ($pkg_configs as $name) {
+                $found = false;
+                foreach ($search_paths as $path) {
+                    if (file_exists($path . "/{$name}.pc")) {
+                        $found = true;
+                        break;
+                    }
+                }
+                if (!$found) {
+                    return false;
+                }
+            }
+            // allow using system dependencies if pkg_config_path is explicitly defined
+            if (count($search_paths) > 1) {
+                return true;
+            }
+        }
         foreach (Config::getLib(static::NAME, 'static-libs', []) as $name) {
             if (!file_exists(BUILD_LIB_PATH . "/{$name}")) {
                 return false;
@@ -375,8 +396,17 @@ abstract class LibraryBase
                 return false;
             }
         }
+        $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
+        $search_paths = array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path));
         foreach (Config::getLib(static::NAME, 'pkg-configs', []) as $name) {
-            if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$name}.pc")) {
+            $found = false;
+            foreach ($search_paths as $path) {
+                if (file_exists($path . "/{$name}.pc")) {
+                    $found = true;
+                    break;
+                }
+            }
+            if (!$found) {
                 return false;
             }
         }

src/SPC/builder/extension/com_dotnet.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('com_dotnet')]
+class com_dotnet extends Extension
+{
+    public function getWindowsConfigureArg(bool $shared = false): string
+    {
+        return '--enable-com-dotnet=yes';
+    }
+}

src/SPC/builder/extension/decimal.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('decimal')]
+class decimal extends Extension
+{
+    // TODO: remove this when https://github.com/php-decimal/ext-decimal/issues/92 is merged
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/php_decimal.c',
+            [
+                'zend_module_entry decimal_module_entry',
+                'ZEND_GET_MODULE(decimal)',
+            ],
+            [
+                'zend_module_entry php_decimal_module_entry',
+                'ZEND_GET_MODULE(php_decimal)',
+            ]
+        );
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/config.w32',
+            'ARG_WITH("decimal", "for decimal support", "no");',
+            'ARG_WITH("decimal", "for decimal support",  "no");' . "\n" .
+            'ADD_EXTENSION_DEP("decimal", "json");'
+        );
+        return true;
+    }
+
+    public function getUnixConfigureArg(bool $shared = false): string
+    {
+        return '--enable-decimal --with-libmpdec-path="' . BUILD_ROOT_PATH . '"';
+    }
+
+    public function getWindowsConfigureArg(bool $shared = false): string
+    {
+        return '--with-decimal';
+    }
+}

src/SPC/builder/extension/ffi.php

@@ -5,11 +5,21 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\builder\linux\SystemUtil;
+use SPC\store\SourcePatcher;
 use SPC\util\CustomExt;
 
 #[CustomExt('ffi')]
 class ffi extends Extension
 {
+    public function patchBeforeBuildconf(): bool
+    {
+        if (PHP_OS_FAMILY === 'Linux' && SystemUtil::getOSRelease()['dist'] === 'centos') {
+            return SourcePatcher::patchFfiCentos7FixO3strncmp();
+        }
+        return false;
+    }
+
     public function getUnixConfigureArg(bool $shared = false): string
     {
         return '--with-ffi' . ($shared ? '=shared' : '') . ' --enable-zend-signals';

src/SPC/builder/extension/grpc.php

@@ -11,7 +11,6 @@ use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
-use SPC\util\SPCTarget;
 
 #[CustomExt('grpc')]
 class grpc extends Extension
@@ -21,29 +20,66 @@ class grpc extends Extension
         if ($this->builder instanceof WindowsBuilder) {
             throw new ValidationException('grpc extension does not support windows yet');
         }
-        if (file_exists(SOURCE_PATH . '/php-src/ext/grpc')) {
-            return false;
-        }
-        // soft link to the grpc source code
-        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 ValidationException('Cannot find grpc source code in ' . $this->source_dir . '/src/php/ext/grpc');
-        }
-        if (SPCTarget::getTargetOS() === 'Darwin') {
-            FileSystem::replaceFileRegex(
-                SOURCE_PATH . '/php-src/ext/grpc/config.m4',
-                '/GRPC_LIBDIR=.*$/m',
-                'GRPC_LIBDIR=' . BUILD_LIB_PATH . "\n" . 'LDFLAGS="$LDFLAGS -framework CoreFoundation"'
-            );
+
+        // Fix deprecated PHP API usage in call.c
+        FileSystem::replaceFileStr(
+            "{$this->source_dir}/src/php/ext/grpc/call.c",
+            'zend_exception_get_default(TSRMLS_C),',
+            'zend_ce_exception,',
+        );
+
+        // Fix include path conflict with pdo_sqlsrv: grpc's PHP ext dir is added to the global include path via
+        $grpc_php_dir = "{$this->source_dir}/src/php/ext/grpc";
+        if (file_exists("{$grpc_php_dir}/version.h")) {
+            copy("{$grpc_php_dir}/version.h", "{$grpc_php_dir}/php_grpc_version.h");
+            unlink("{$grpc_php_dir}/version.h");
+            FileSystem::replaceFileStr("{$grpc_php_dir}/php_grpc.h", '#include "version.h"', '#include "php_grpc_version.h"');
+            FileSystem::replaceFileStr("{$grpc_php_dir}/php_grpc.c", '#include "version.h"', '#include "php_grpc_version.h"');
         }
+
+        $config_m4 = <<<'M4'
+PHP_ARG_ENABLE(grpc, [whether to enable grpc support], [AS_HELP_STRING([--enable-grpc], [Enable grpc support])])
+
+if test "$PHP_GRPC" != "no"; then
+  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/include)
+  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/php/ext/grpc)
+  GRPC_LIBDIR=@@build_lib_path@@
+  PHP_ADD_LIBPATH($GRPC_LIBDIR)
+  PHP_ADD_LIBRARY(grpc,,GRPC_SHARED_LIBADD)
+  LIBS="-lpthread $LIBS"
+  PHP_ADD_LIBRARY(pthread)
+
+  case $host in
+    *darwin*)
+      PHP_ADD_LIBRARY(c++,1,GRPC_SHARED_LIBADD)
+      ;;
+    *)
+      PHP_ADD_LIBRARY(stdc++,1,GRPC_SHARED_LIBADD)
+      PHP_ADD_LIBRARY(rt,,GRPC_SHARED_LIBADD)
+      PHP_ADD_LIBRARY(rt)
+      ;;
+    esac
+
+  PHP_NEW_EXTENSION(grpc, @grpc_c_files@, $ext_shared, , -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1)
+  PHP_SUBST(GRPC_SHARED_LIBADD)
+  PHP_INSTALL_HEADERS([ext/grpc], [php_grpc.h])
+fi
+M4;
+        $replace = get_pack_replace();
+        // load grpc c files from src/php/ext/grpc
+        $c_files = glob($this->source_dir . '/src/php/ext/grpc/*.c');
+        $replace['@grpc_c_files@'] = implode(" \\\n    ", array_map(fn ($f) => 'src/php/ext/grpc/' . basename($f), $c_files));
+        $config_m4 = str_replace(array_keys($replace), array_values($replace), $config_m4);
+        file_put_contents($this->source_dir . '/config.m4', $config_m4);
+
+        copy($this->source_dir . '/src/php/ext/grpc/php_grpc.h', $this->source_dir . '/php_grpc.h');
         return true;
     }
 
     public function patchBeforeConfigure(): bool
     {
         $util = new SPCConfigUtil($this->builder, ['libs_only_deps' => true]);
-        $config = $util->config(['grpc']);
+        $config = $util->getExtensionConfig($this);
         $libs = $config['libs'];
         FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/configure', '-lgrpc', $libs);
         return true;
@@ -52,7 +88,6 @@ class grpc extends Extension
     public function patchBeforeMake(): bool
     {
         parent::patchBeforeMake();
-        // add -Wno-strict-prototypes
         GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -Wno-strict-prototypes');
         return true;
     }

src/SPC/builder/extension/imagick.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
 use SPC\util\CustomExt;
 
 #[CustomExt('imagick')]
@@ -19,7 +21,9 @@ class imagick extends Extension
     protected function splitLibsIntoStaticAndShared(string $allLibs): array
     {
         [$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
-        if (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
+        if (ToolchainManager::getToolchainClass() !== ZigToolchain::class &&
+            (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/maxminddb.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('maxminddb')]
+class maxminddb extends Extension
+{
+    public function patchBeforeBuildconf(): bool
+    {
+        if (!is_dir(SOURCE_PATH . '/php-src/ext/maxminddb')) {
+            $original = $this->source_dir;
+            FileSystem::copyDir($original . '/ext', SOURCE_PATH . '/php-src/ext/maxminddb');
+            $this->source_dir = SOURCE_PATH . '/php-src/ext/maxminddb';
+            return true;
+        }
+        $this->source_dir = SOURCE_PATH . '/php-src/ext/maxminddb';
+        return false;
+    }
+}

src/SPC/builder/extension/memcache.php

@@ -18,6 +18,9 @@ class memcache extends Extension
 
     public function patchBeforeBuildconf(): bool
     {
+        if (!$this->isBuildStatic()) {
+            return false;
+        }
         FileSystem::replaceFileStr(
             SOURCE_PATH . '/php-src/ext/memcache/config9.m4',
             'if test -d $abs_srcdir/src ; then',
@@ -43,4 +46,27 @@ EOF
         );
         return true;
     }
+
+    public function patchBeforeSharedConfigure(): bool
+    {
+        if (!$this->isBuildShared()) {
+            return false;
+        }
+        FileSystem::replaceFileStr(
+            SOURCE_PATH . '/php-src/ext/memcache/config9.m4',
+            'if test -d $abs_srcdir/main ; then',
+            'if test -d $abs_srcdir/src ; then',
+        );
+        FileSystem::replaceFileStr(
+            SOURCE_PATH . '/php-src/ext/memcache/config9.m4',
+            'export CPPFLAGS="$CPPFLAGS $INCLUDES -I$abs_srcdir/main"',
+            'export CPPFLAGS="$CPPFLAGS $INCLUDES"',
+        );
+        return true;
+    }
+
+    protected function getExtraEnv(): array
+    {
+        return ['CFLAGS' => '-std=c17'];
+    }
 }

src/SPC/builder/extension/mongodb.php

@@ -5,11 +5,22 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('mongodb')]
 class mongodb extends Extension
 {
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileRegex(
+            SOURCE_PATH . '/php-src/ext/mongodb/config.m4',
+            '/^(\s+)(src\/libmongoc\/)/m',
+            '$1${ac_config_dir}/$2'
+        );
+        return true;
+    }
+
     public function getUnixConfigureArg(bool $shared = false): string
     {
         $arg = ' --enable-mongodb' . ($shared ? '=shared' : '') . ' ';
@@ -24,4 +35,9 @@ class mongodb extends Extension
         $arg .= $this->builder->getLib('zlib') ? ' --with-mongodb-zlib=yes ' : ' --with-mongodb-zlib=bundled ';
         return clean_spaces($arg);
     }
+
+    public function getExtraEnv(): array
+    {
+        return ['CFLAGS' => '-std=c17'];
+    }
 }

src/SPC/builder/extension/mysqlnd_ed25519.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('mysqlnd_ed25519')]
+class mysqlnd_ed25519 extends Extension
+{
+    public function getConfigureArg(bool $shared = false): string
+    {
+        return '--with-mysqlnd_ed25519' . ($shared ? '=shared' : '');
+    }
+
+    public function getUnixConfigureArg(bool $shared = false): string
+    {
+        return $this->getConfigureArg();
+    }
+}

src/SPC/builder/extension/mysqlnd_parsec.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('mysqlnd_parsec')]
+class mysqlnd_parsec extends Extension
+{
+    public function getConfigureArg(bool $shared = false): string
+    {
+        return '--enable-mysqlnd_parsec' . ($shared ? '=shared' : '');
+    }
+
+    public function getUnixConfigureArg(bool $shared = false): string
+    {
+        return $this->getConfigureArg();
+    }
+}

src/SPC/builder/extension/password_argon2.php

@@ -24,28 +24,9 @@ class password_argon2 extends Extension
         }
     }
 
-    public function patchBeforeMake(): bool
-    {
-        $patched = parent::patchBeforeMake();
-        if ($this->builder->getLib('libsodium') !== null) {
-            $extraLibs = getenv('SPC_EXTRA_LIBS');
-            if ($extraLibs !== false) {
-                $extraLibs = str_replace(
-                    [BUILD_LIB_PATH . '/libargon2.a', BUILD_LIB_PATH . '/libsodium.a'],
-                    ['', BUILD_LIB_PATH . '/libargon2.a ' . BUILD_LIB_PATH . '/libsodium.a'],
-                    $extraLibs,
-                );
-                $extraLibs = trim(preg_replace('/\s+/', ' ', $extraLibs)); // normalize spacing
-                f_putenv('SPC_EXTRA_LIBS=' . $extraLibs);
-                return true;
-            }
-        }
-        return $patched;
-    }
-
     public function getConfigureArg(bool $shared = false): string
     {
-        if ($this->builder->getLib('openssl') !== null) {
+        if ($this->builder->getExt('openssl')?->isBuildStatic() || $this->isBuildShared()) {
             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
             }

src/SPC/builder/extension/pgsql.php

@@ -45,7 +45,7 @@ class pgsql extends Extension
     protected function getExtraEnv(): array
     {
         return [
-            'CFLAGS' => '-Wno-int-conversion',
+            'CFLAGS' => '-std=c17 -Wno-int-conversion',
         ];
     }
 }

src/SPC/builder/extension/rdkafka.php

@@ -7,6 +7,7 @@ namespace SPC\builder\extension;
 use SPC\builder\Extension;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
+use SPC\util\SPCConfigUtil;
 
 #[CustomExt('rdkafka')]
 class rdkafka extends Extension
@@ -15,6 +16,7 @@ class rdkafka extends Extension
     {
         FileSystem::replaceFileStr("{$this->source_dir}/config.m4", "-L\$RDKAFKA_DIR/\$PHP_LIBDIR -lm\n", "-L\$RDKAFKA_DIR/\$PHP_LIBDIR -lm \$RDKAFKA_LIBS\n");
         FileSystem::replaceFileStr("{$this->source_dir}/config.m4", "-L\$RDKAFKA_DIR/\$PHP_LIBDIR -lm\"\n", '-L$RDKAFKA_DIR/$PHP_LIBDIR -lm $RDKAFKA_LIBS"');
+        FileSystem::replaceFileStr("{$this->source_dir}/config.m4", 'PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,', 'AC_CHECK_LIB([$LIBNAME], [$LIBSYMBOL],');
         return true;
     }
 
@@ -37,8 +39,7 @@ class rdkafka extends Extension
 
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        $pkgconf_libs = shell()->execWithResult('pkg-config --libs --static rdkafka')[1];
-        $pkgconf_libs = trim(implode('', $pkgconf_libs));
-        return '--with-rdkafka=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . ' RDKAFKA_LIBS="' . $pkgconf_libs . '"';
+        $pkgconf_libs = (new SPCConfigUtil($this->builder, ['no_php' => true, 'libs_only_deps' => true]))->getExtensionConfig($this);
+        return '--with-rdkafka=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . " RDKAFKA_LIBS=\"{$pkgconf_libs['libs']}\"";
     }
 }

src/SPC/builder/extension/spx.php

@@ -45,4 +45,11 @@ class spx extends Extension
         FileSystem::copy($this->source_dir . '/src/php_spx.h', $this->source_dir . '/php_spx.h');
         return true;
     }
+
+    public function getSharedExtensionEnv(): array
+    {
+        $env = parent::getSharedExtensionEnv();
+        $env['SPX_SHARED_LIBADD'] = $env['LIBS'];
+        return $env;
+    }
 }

src/SPC/builder/extension/sqlsrv.php

@@ -33,4 +33,14 @@ class sqlsrv extends Extension
         }
         return false;
     }
+
+    public function patchBeforeMake(): bool
+    {
+        $makefile = SOURCE_PATH . '/php-src/Makefile';
+        $makeContent = file_get_contents($makefile);
+        $makeContent = preg_replace('/^(CFLAGS_(?:PDO_)?SQLSRV=.*?)\s+\/W4\b/m', '$1', $makeContent);
+        $makeContent = preg_replace('/^(CFLAGS_(?:PDO_)?SQLSRV=.*?)\s+\/WX\b/m', '$1', $makeContent);
+        file_put_contents($makefile, $makeContent);
+        return true;
+    }
 }

src/SPC/builder/extension/swoole.php

@@ -17,6 +17,7 @@ class swoole extends Extension
     public function patchBeforeMake(): bool
     {
         $patched = parent::patchBeforeMake();
+        FileSystem::replaceFileStr($this->source_dir . '/ext-src/php_swoole_private.h', 'PHP_VERSION_ID > 80500', 'PHP_VERSION_ID >= 80600');
         if ($this->builder instanceof MacOSBuilder) {
             // Fix swoole with event extension <util.h> conflict bug
             $util_path = shell()->execWithResult('xcrun --show-sdk-path', false)[1][0] . '/usr/include/util.h';
@@ -49,19 +50,16 @@ class swoole extends Extension
 
         // commonly used feature: coroutine-time
         $arg .= ' --enable-swoole-coro-time --with-pic';
+        $arg .= ' --enable-swoole-ssh --enable-swoole-curl';
 
         $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 features that only require libraries
         $arg .= $this->builder->getLib('libcares') ? ' --enable-cares' : '';
         $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->getLib('liburing') && getenv('SPC_LIBC') !== 'glibc' ? ' --enable-iouring --enable-uring-socket' : '--disable-iouring';
         $arg .= $this->builder->getExt('sockets') ? ' --enable-sockets' : '';
 
         // enable additional features that require the pdo extension, but conflict with pdo_* extensions
@@ -70,9 +68,10 @@ class swoole extends Extension
         $arg .= $this->builder->getExt('swoole-hook-mysql') ? ' --enable-mysqlnd' : ' --disable-mysqlnd';
         $arg .= $this->builder->getExt('swoole-hook-sqlite') ? ' --enable-swoole-sqlite' : ' --disable-swoole-sqlite';
         if ($this->builder->getExt('swoole-hook-odbc')) {
-            $config = (new SPCConfigUtil($this->builder, ['libs_only_deps' => true]))->config([], ['unixodbc']);
+            $config = (new SPCConfigUtil($this->builder))->getLibraryConfig($this->builder->getLib('unixodbc'));
             $arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"';
         }
+        $arg .= $this->builder->getExt('ftp')?->isBuildStatic() ? ' --disable-swoole-ftp' : ' --enable-swoole-ftp';
 
         if ($this->getExtVersion() >= '6.1.0') {
             $arg .= ' --enable-swoole-stdext';

src/SPC/builder/extension/trader.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('trader')]
+class trader extends Extension
+{
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/trader/config.m4', 'PHP_TA', 'PHP_TRADER');
+        return true;
+    }
+}

src/SPC/builder/extension/xlswriter.php

@@ -7,6 +7,7 @@ namespace SPC\builder\extension;
 use SPC\builder\Extension;
 use SPC\store\SourcePatcher;
 use SPC\util\CustomExt;
+use SPC\util\GlobalEnvManager;
 
 #[CustomExt('xlswriter')]
 class xlswriter extends Extension
@@ -28,6 +29,13 @@ class xlswriter extends Extension
     public function patchBeforeMake(): bool
     {
         $patched = parent::patchBeforeMake();
+
+        // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
+        if (PHP_OS_FAMILY !== 'Windows') {
+            GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');
+            $patched = true;
+        }
+
         if (PHP_OS_FAMILY === 'Windows') {
             // fix windows build with openssl extension duplicate symbol bug
             SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $this->source_dir);
@@ -40,4 +48,10 @@ class xlswriter extends Extension
         }
         return $patched;
     }
+
+    // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
+    protected function getExtraEnv(): array
+    {
+        return ['CFLAGS' => '-std=gnu17'];
+    }
 }

src/SPC/builder/freebsd/BSDBuilder.php

@@ -153,7 +153,7 @@ class BSDBuilder extends UnixBuilderBase
         if (!$this->getOption('no-strip', false)) {
             $shell->exec('strip sapi/cli/php');
         }
-        $this->deployBinary(BUILD_TARGET_CLI);
+        $this->deploySAPIBinary(BUILD_TARGET_CLI);
     }
 
     /**
@@ -184,7 +184,7 @@ class BSDBuilder extends UnixBuilderBase
         if (!$this->getOption('no-strip', false)) {
             shell()->cd(SOURCE_PATH . '/php-src/sapi/micro')->exec('strip --strip-unneeded micro.sfx');
         }
-        $this->deployBinary(BUILD_TARGET_MICRO);
+        $this->deploySAPIBinary(BUILD_TARGET_MICRO);
 
         if ($this->phar_patched) {
             SourcePatcher::unpatchMicroPhar();
@@ -206,7 +206,7 @@ class BSDBuilder extends UnixBuilderBase
         if (!$this->getOption('no-strip', false)) {
             $shell->exec('strip sapi/fpm/php-fpm');
         }
-        $this->deployBinary(BUILD_TARGET_FPM);
+        $this->deploySAPIBinary(BUILD_TARGET_FPM);
     }
 
     /**

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

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

src/SPC/builder/linux/LinuxBuilder.php

@@ -8,8 +8,11 @@ use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\PatchException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
+use SPC\store\DirDiff;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
 use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;
@@ -64,7 +67,8 @@ class LinuxBuilder extends UnixBuilderBase
             // 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');
+            $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+            f_putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
         }
 
         if ($this->getOption('enable-zts', false)) {
@@ -90,7 +94,7 @@ class LinuxBuilder extends UnixBuilderBase
         // 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'),
+            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             '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!
@@ -161,7 +165,7 @@ class LinuxBuilder extends UnixBuilderBase
                 throw new WrongUsageException(
                     "You're building against musl libc statically (the default on Linux), but you're trying to build shared extensions.\n" .
                     'Static musl libc does not implement `dlopen`, so your php binary is not able to load shared extensions.' . "\n" .
-                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, or use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc`.'
+                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc` or use SPC_MUSL_DYNAMIC=true on alpine.'
                 );
             }
             logger()->info('Building shared extensions...');
@@ -194,15 +198,7 @@ class LinuxBuilder extends UnixBuilderBase
             SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src', true);
         }
 
-        if (!$this->getOption('no-strip', false)) {
-            shell()->cd(SOURCE_PATH . '/php-src/sapi/cli')->exec('strip --strip-unneeded php');
-        }
-        if ($this->getOption('with-upx-pack')) {
-            shell()->cd(SOURCE_PATH . '/php-src/sapi/cli')
-                ->exec(getenv('UPX_EXEC') . ' --best php');
-        }
-
-        $this->deployBinary(BUILD_TARGET_CLI);
+        $this->deploySAPIBinary(BUILD_TARGET_CLI);
     }
 
     protected function buildCgi(): void
@@ -213,15 +209,7 @@ class LinuxBuilder extends UnixBuilderBase
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
             ->exec("make {$concurrency} {$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);
+        $this->deploySAPIBinary(BUILD_TARGET_CGI);
     }
 
     /**
@@ -232,29 +220,33 @@ class LinuxBuilder extends UnixBuilderBase
         if ($this->getPHPVersionID() < 80000) {
             throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
         }
-        if ($this->getExt('phar')) {
-            $this->phar_patched = true;
-            SourcePatcher::patchMicroPhar($this->getPHPVersionID());
-        }
+        try {
+            if ($this->getExt('phar')) {
+                $this->phar_patched = true;
+                SourcePatcher::patchMicroPhar($this->getPHPVersionID());
+            }
 
-        $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
-        $vars = $this->getMakeExtraVars();
+            $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
+            $vars = $this->getMakeExtraVars();
 
-        // patch fake cli for micro
-        $vars['EXTRA_CFLAGS'] .= $enable_fake_cli;
-        $vars = SystemUtil::makeEnvVarString($vars);
-        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
+            // patch fake cli for micro
+            $vars['EXTRA_CFLAGS'] .= $enable_fake_cli;
+            $vars = SystemUtil::makeEnvVarString($vars);
+            $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
 
-        shell()->cd(SOURCE_PATH . '/php-src')
-            ->exec('sed -i "s|//lib|/lib|g" Makefile')
-            ->exec("make {$concurrency} {$vars} micro");
+            shell()->cd(SOURCE_PATH . '/php-src')
+                ->exec('sed -i "s|//lib|/lib|g" Makefile')
+                ->exec("make {$concurrency} {$vars} micro");
 
-        $this->processMicroUPX();
+            // deploy micro.sfx
+            $dst = $this->deploySAPIBinary(BUILD_TARGET_MICRO);
 
-        $this->deployBinary(BUILD_TARGET_MICRO);
-
-        if ($this->phar_patched) {
-            SourcePatcher::unpatchMicroPhar();
+            // patch after UPX-ed micro.sfx
+            $this->processUpxedMicroSfx($dst);
+        } finally {
+            if ($this->phar_patched) {
+                SourcePatcher::unpatchMicroPhar();
+            }
         }
     }
 
@@ -269,14 +261,7 @@ class LinuxBuilder extends UnixBuilderBase
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
             ->exec("make {$concurrency} {$vars} fpm");
 
-        if (!$this->getOption('no-strip', false)) {
-            shell()->cd(SOURCE_PATH . '/php-src/sapi/fpm')->exec('strip --strip-unneeded php-fpm');
-        }
-        if ($this->getOption('with-upx-pack')) {
-            shell()->cd(SOURCE_PATH . '/php-src/sapi/fpm')
-                ->exec(getenv('UPX_EXEC') . ' --best php-fpm');
-        }
-        $this->deployBinary(BUILD_TARGET_FPM);
+        $this->deploySAPIBinary(BUILD_TARGET_FPM);
     }
 
     /**
@@ -284,11 +269,19 @@ class LinuxBuilder extends UnixBuilderBase
      */
     protected function buildEmbed(): void
     {
+        $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+        if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            $compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
+            GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
+        }
         $sharedExts = array_filter($this->exts, static fn ($ext) => $ext->isBuildShared());
         $sharedExts = array_filter($sharedExts, static function ($ext) {
             return Config::getExt($ext->getName(), 'build-with-php') === true;
         });
         $install_modules = $sharedExts ? 'install-modules' : '';
+
+        // detect changes in module path
+        $diff = new DirDiff(BUILD_MODULES_PATH, true);
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
         $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
         shell()->cd(SOURCE_PATH . '/php-src')
@@ -296,72 +289,25 @@ class LinuxBuilder extends UnixBuilderBase
             ->exec('sed -i "s|^EXTENSION_DIR = .*|EXTENSION_DIR = /' . basename(BUILD_MODULES_PATH) . '|" Makefile')
             ->exec("make {$concurrency} INSTALL_ROOT=" . BUILD_ROOT_PATH . " {$vars} install-sapi {$install_modules} install-build install-headers install-programs");
 
-        $ldflags = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') ?: '';
-        $libDir = BUILD_LIB_PATH;
-        $modulesDir = BUILD_MODULES_PATH;
-        $libphpSo = "{$libDir}/libphp.so";
-        $realLibName = 'libphp.so';
-        $cwd = getcwd();
-
-        if (preg_match('/-release\s+(\S+)/', $ldflags, $matches)) {
-            $release = $matches[1];
-            $realLibName = "libphp-{$release}.so";
-            $libphpRelease = "{$libDir}/{$realLibName}";
-            if (!file_exists($libphpRelease) && file_exists($libphpSo)) {
-                rename($libphpSo, $libphpRelease);
+        // process libphp.so for shared embed
+        $libphpSo = BUILD_LIB_PATH . '/libphp.so';
+        $libphpSoDest = BUILD_LIB_PATH . '/libphp.so';
+        if (file_exists($libphpSo)) {
+            // deploy libphp.so
+            preg_match('/-release\s+(\S*)/', getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $matches);
+            if (!empty($matches[1])) {
+                $libphpSoDest = str_replace('.so', '-' . $matches[1] . '.so', $libphpSo);
             }
-            if (file_exists($libphpRelease)) {
-                chdir($libDir);
-                if (file_exists($libphpSo)) {
-                    unlink($libphpSo);
-                }
-                symlink($realLibName, 'libphp.so');
-                shell()->exec(sprintf(
-                    'patchelf --set-soname %s %s',
-                    escapeshellarg($realLibName),
-                    escapeshellarg($libphpRelease)
-                ));
-            }
-            if (is_dir($modulesDir)) {
-                chdir($modulesDir);
-                foreach ($this->getExts() as $ext) {
-                    if (!$ext->isBuildShared()) {
-                        continue;
-                    }
-                    $name = $ext->getName();
-                    $versioned = "{$name}-{$release}.so";
-                    $unversioned = "{$name}.so";
-                    $src = "{$modulesDir}/{$versioned}";
-                    $dst = "{$modulesDir}/{$unversioned}";
-                    if (is_file($src)) {
-                        rename($src, $dst);
-                        shell()->exec(sprintf(
-                            'patchelf --set-soname %s %s',
-                            escapeshellarg($unversioned),
-                            escapeshellarg($dst)
-                        ));
-                    }
-                }
-            }
-            chdir($cwd);
+            $this->deployBinary($libphpSo, $libphpSoDest, false);
         }
 
-        $target = "{$libDir}/{$realLibName}";
-        if (file_exists($target)) {
-            [, $output] = shell()->execWithResult('readelf -d ' . escapeshellarg($target));
-            $output = implode("\n", $output);
-            if (preg_match('/SONAME.*\[(.+)]/', $output, $sonameMatch)) {
-                $currentSoname = $sonameMatch[1];
-                if ($currentSoname !== basename($target)) {
-                    shell()->exec(sprintf(
-                        'patchelf --set-soname %s %s',
-                        escapeshellarg(basename($target)),
-                        escapeshellarg($target)
-                    ));
-                }
-            }
+        // process shared extensions build-with-php
+        $increment_files = $diff->getChangedFiles();
+        foreach ($increment_files as $increment_file) {
+            $this->deployBinary($increment_file, $increment_file, false);
         }
 
+        // process libphp.a for static embed
         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');
@@ -369,9 +315,7 @@ class LinuxBuilder extends UnixBuilderBase
             SystemUtil::exportDynamicSymbols(BUILD_LIB_PATH . '/libphp.a');
         }
 
-        if (!$this->getOption('no-strip', false) && file_exists(BUILD_LIB_PATH . '/' . $realLibName)) {
-            shell()->cd(BUILD_LIB_PATH)->exec("strip --strip-unneeded {$realLibName}");
-        }
+        // patch embed php scripts
         $this->patchPhpScripts();
     }
 
@@ -392,29 +336,26 @@ 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 :(
+     * Patch micro.sfx after UPX compression.
+     * micro needs special section handling in LinuxBuilder.
+     * 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
      */
-    private function processMicroUPX(): void
+    private function processUpxedMicroSfx(string $dst): void
     {
-        if (version_compare($this->getMicroVersion(), '0.2.0') >= 0 && !$this->getOption('no-strip', false)) {
-            shell()->exec('strip --strip-unneeded ' . SOURCE_PATH . '/php-src/sapi/micro/micro.sfx');
-
-            if ($this->getOption('with-upx-pack')) {
-                // strip first
-                shell()->exec(getenv('UPX_EXEC') . ' --best ' . SOURCE_PATH . '/php-src/sapi/micro/micro.sfx');
-                // cut binary with readelf
-                [$ret, $out] = shell()->execWithResult('readelf -l ' . SOURCE_PATH . '/php-src/sapi/micro/micro.sfx | awk \'/LOAD|GNU_STACK/ {getline; print $1, $2, $3, $4, $6, $7}\'');
-                $out[1] = explode(' ', $out[1]);
-                $offset = $out[1][0];
-                if ($ret !== 0 || !str_starts_with($offset, '0x')) {
-                    throw new PatchException('phpmicro UPX patcher', 'Cannot find offset in readelf output');
-                }
-                $offset = hexdec($offset);
-                // remove upx extra wastes
-                file_put_contents(SOURCE_PATH . '/php-src/sapi/micro/micro.sfx', substr(file_get_contents(SOURCE_PATH . '/php-src/sapi/micro/micro.sfx'), 0, $offset));
+        if ($this->getOption('with-upx-pack') && version_compare($this->getMicroVersion(), '0.2.0') >= 0) {
+            // strip first
+            // cut binary with readelf
+            [$ret, $out] = shell()->execWithResult("readelf -l {$dst} | awk '/LOAD|GNU_STACK/ {getline; print \$1, \$2, \$3, \$4, \$6, \$7}'");
+            $out[1] = explode(' ', $out[1]);
+            $offset = $out[1][0];
+            if ($ret !== 0 || !str_starts_with($offset, '0x')) {
+                throw new PatchException('phpmicro UPX patcher', 'Cannot find offset in readelf output');
             }
+            $offset = hexdec($offset);
+            // remove upx extra wastes
+            file_put_contents($dst, substr(file_get_contents($dst), 0, $offset));
         }
     }
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -6,6 +6,8 @@ namespace SPC\builder\linux\library;
 
 use SPC\builder\linux\SystemUtil;
 use SPC\store\FileSystem;
+use SPC\toolchain\GccNativeToolchain;
+use SPC\toolchain\ToolchainManager;
 use SPC\util\executor\UnixAutoconfExecutor;
 use SPC\util\SPCTarget;
 
@@ -15,26 +17,19 @@ class liburing extends LinuxLibraryBase
 
     public function patchBeforeBuild(): bool
     {
-        if (!SystemUtil::isMuslDist()) {
-            return false;
+        if (SystemUtil::isMuslDist()) {
+            FileSystem::replaceFileStr($this->source_dir . '/configure', 'realpath -s', 'realpath');
+            return true;
         }
-        FileSystem::replaceFileStr($this->source_dir . '/configure', 'realpath -s', 'realpath');
-        return true;
+        return false;
     }
 
     protected function build(): void
     {
-        $use_libc = SPCTarget::getLibc() !== 'glibc' || version_compare(SPCTarget::getLibcVersion(), '2.30', '>=');
+        $use_libc = ToolchainManager::getToolchainClass() !== GccNativeToolchain::class || 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 {
+        if ($use_libc) {
             $make->appendEnv([
                 'CFLAGS' => '-D_GNU_SOURCE',
             ]);
@@ -51,7 +46,7 @@ class liburing extends LinuxLibraryBase
                 $use_libc ? '--use-libc' : '',
             )
             ->configure()
-            ->make('library', 'install ENABLE_SHARED=0', with_clean: false);
+            ->make('library ENABLE_SHARED=0', 'install ENABLE_SHARED=0', with_clean: false);
 
         $this->patchPkgconfPrefix();
     }

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

@@ -21,6 +21,7 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
+use SPC\builder\linux\SystemUtil;
 use SPC\store\FileSystem;
 
 class openssl extends LinuxLibraryBase
@@ -51,6 +52,9 @@ class openssl extends LinuxLibraryBase
             $zlib_extra = '';
         }
 
+        $openssl_dir = getenv('OPENSSLDIR') ?: null;
+        // TODO: in v3 use the following: $openssl_dir ??= SystemUtil::getOSRelease()['dist'] === 'redhat' ? '/etc/pki/tls' : '/etc/ssl';
+        $openssl_dir ??= '/etc/ssl';
         $ex_lib = trim($ex_lib);
 
         shell()->cd($this->source_dir)->initializeEnv($this)
@@ -58,10 +62,11 @@ class openssl extends LinuxLibraryBase
                 "{$env} ./Configure no-shared {$extra} " .
                 '--prefix=' . BUILD_ROOT_PATH . ' ' .
                 '--libdir=' . BUILD_LIB_PATH . ' ' .
-                '--openssldir=/etc/ssl ' .
+                "--openssldir={$openssl_dir} " .
                 "{$zlib_extra}" .
                 'enable-pie ' .
                 'no-legacy ' .
+                'no-tests ' .
                 "linux-{$arch}"
             )
             ->exec('make clean')

src/SPC/builder/macos/MacOSBuilder.php

@@ -8,6 +8,7 @@ use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
+use SPC\store\DirDiff;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 use SPC\util\GlobalEnvManager;
@@ -105,7 +106,7 @@ class MacOSBuilder extends UnixBuilderBase
 
         // prepare build php envs
         $envs_build_php = SystemUtil::makeEnvVarString([
-            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
+            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
             'LDFLAGS' => '-L' . BUILD_LIB_PATH,
         ]);
@@ -189,10 +190,7 @@ class MacOSBuilder extends UnixBuilderBase
         $shell = shell()->cd(SOURCE_PATH . '/php-src');
         $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
         $shell->exec("make {$concurrency} {$vars} cli");
-        if (!$this->getOption('no-strip', false)) {
-            $shell->exec('dsymutil -f sapi/cli/php')->exec('strip -S sapi/cli/php');
-        }
-        $this->deployBinary(BUILD_TARGET_CLI);
+        $this->deploySAPIBinary(BUILD_TARGET_CLI);
     }
 
     protected function buildCgi(): void
@@ -202,10 +200,7 @@ class MacOSBuilder extends UnixBuilderBase
         $shell = shell()->cd(SOURCE_PATH . '/php-src');
         $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
         $shell->exec("make {$concurrency} {$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);
+        $this->deploySAPIBinary(BUILD_TARGET_CGI);
     }
 
     /**
@@ -216,31 +211,30 @@ class MacOSBuilder extends UnixBuilderBase
         if ($this->getPHPVersionID() < 80000) {
             throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
         }
-        if ($this->getExt('phar')) {
-            $this->phar_patched = true;
-            SourcePatcher::patchMicroPhar($this->getPHPVersionID());
-        }
 
-        $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
-        $vars = $this->getMakeExtraVars();
+        try {
+            if ($this->getExt('phar')) {
+                $this->phar_patched = true;
+                SourcePatcher::patchMicroPhar($this->getPHPVersionID());
+            }
 
-        // patch fake cli for micro
-        $vars['EXTRA_CFLAGS'] .= $enable_fake_cli;
-        $vars = SystemUtil::makeEnvVarString($vars);
+            $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
+            $vars = $this->getMakeExtraVars();
 
-        $shell = shell()->cd(SOURCE_PATH . '/php-src');
-        // build
-        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
-        $shell->exec("make {$concurrency} {$vars} micro");
-        // strip
-        if (!$this->getOption('no-strip', false)) {
-            $shell->exec('dsymutil -f sapi/micro/micro.sfx')->exec('strip -S sapi/micro/micro.sfx');
-        }
+            // patch fake cli for micro
+            $vars['EXTRA_CFLAGS'] .= $enable_fake_cli;
+            $vars = SystemUtil::makeEnvVarString($vars);
 
-        $this->deployBinary(BUILD_TARGET_MICRO);
+            $shell = shell()->cd(SOURCE_PATH . '/php-src');
+            // build
+            $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
+            $shell->exec("make {$concurrency} {$vars} micro");
 
-        if ($this->phar_patched) {
-            SourcePatcher::unpatchMicroPhar();
+            $this->deploySAPIBinary(BUILD_TARGET_MICRO);
+        } finally {
+            if ($this->phar_patched) {
+                SourcePatcher::unpatchMicroPhar();
+            }
         }
     }
 
@@ -254,10 +248,7 @@ class MacOSBuilder extends UnixBuilderBase
         $shell = shell()->cd(SOURCE_PATH . '/php-src');
         $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
         $shell->exec("make {$concurrency} {$vars} fpm");
-        if (!$this->getOption('no-strip', false)) {
-            $shell->exec('dsymutil -f sapi/fpm/php-fpm')->exec('strip -S sapi/fpm/php-fpm');
-        }
-        $this->deployBinary(BUILD_TARGET_FPM);
+        $this->deploySAPIBinary(BUILD_TARGET_FPM);
     }
 
     /**
@@ -272,9 +263,25 @@ class MacOSBuilder extends UnixBuilderBase
         $install_modules = $sharedExts ? 'install-modules' : '';
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
         $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
+
+        $diff = new DirDiff(BUILD_MODULES_PATH, true);
+
         shell()->cd(SOURCE_PATH . '/php-src')
+            ->exec('sed -i "" "s|^EXTENSION_DIR = .*|EXTENSION_DIR = /' . basename(BUILD_MODULES_PATH) . '|" Makefile')
             ->exec("make {$concurrency} INSTALL_ROOT=" . BUILD_ROOT_PATH . " {$vars} install-sapi {$install_modules} install-build install-headers install-programs");
 
+        $libphp = BUILD_LIB_PATH . '/libphp.dylib';
+        if (file_exists($libphp)) {
+            $this->deployBinary($libphp, $libphp, false);
+            // macOS currently have no -release option for dylib, so we just rename it here
+        }
+
+        // process shared extensions build-with-php
+        $increment_files = $diff->getChangedFiles();
+        foreach ($increment_files as $increment_file) {
+            $this->deployBinary($increment_file, $increment_file, false);
+        }
+
         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');

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

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

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

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

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

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

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

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

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

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

src/SPC/builder/traits/UnixLibraryTrait.php

@@ -34,7 +34,7 @@ trait UnixLibraryTrait
             $files = array_map(fn ($x) => "{$x}.pc", $conf_pc);
         }
         foreach ($files as $name) {
-            $realpath = realpath(BUILD_ROOT_PATH . '/lib/pkgconfig/' . $name);
+            $realpath = realpath(BUILD_LIB_PATH . '/pkgconfig/' . $name);
             if ($realpath === false) {
                 throw new PatchException('pkg-config prefix patcher', 'Cannot find library [' . static::NAME . '] pkgconfig file [' . $name . '] in ' . BUILD_LIB_PATH . '/pkgconfig/ !');
             }

src/SPC/builder/traits/UnixSystemUtilTrait.php

@@ -50,7 +50,7 @@ trait UnixSystemUtilTrait
         $defined = array_unique($defined);
         sort($defined);
         // export
-        if (SPCTarget::getTargetOS() === 'Linux') {
+        if (SPCTarget::getTargetOS() === 'Linux' && ToolchainManager::getToolchainClass() !== ZigToolchain::class) {
             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");
@@ -72,12 +72,8 @@ trait UnixSystemUtilTrait
         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') {
+        // macOS/zig
+        if (SPCTarget::getTargetOS() !== 'Linux' || ToolchainManager::getToolchainClass() === ZigToolchain::class) {
             return "-Wl,-exported_symbols_list,{$symbol_file}";
         }
         return "-Wl,--dynamic-list={$symbol_file}";

src/SPC/builder/unix/UnixBuilderBase.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\unix;
 
 use SPC\builder\BuilderBase;
+use SPC\builder\linux\SystemUtil;
 use SPC\builder\linux\SystemUtil as LinuxSystemUtil;
 use SPC\exception\SPCException;
 use SPC\exception\SPCInternalException;
@@ -13,6 +14,7 @@ use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
 use SPC\store\pkg\GoXcaddy;
+use SPC\store\SourceManager;
 use SPC\toolchain\GccNativeToolchain;
 use SPC\toolchain\ToolchainManager;
 use SPC\util\DependencyUtil;
@@ -78,6 +80,91 @@ abstract class UnixBuilderBase extends BuilderBase
         $this->lib_list = $sorted_libraries;
     }
 
+    /**
+     * Strip unneeded symbols from binary file.
+     */
+    public function stripBinary(string $binary_path): void
+    {
+        shell()->exec(match (PHP_OS_FAMILY) {
+            'Darwin' => "strip -S {$binary_path}",
+            'Linux' => "strip --strip-unneeded {$binary_path}",
+            default => throw new SPCInternalException('stripBinary is only supported on Linux and macOS'),
+        });
+    }
+
+    /**
+     * Extract debug information from binary file.
+     *
+     * @param string $binary_path the path to the binary file, including executables, shared libraries, etc
+     */
+    public function extractDebugInfo(string $binary_path): string
+    {
+        $target_dir = BUILD_ROOT_PATH . '/debug';
+        FileSystem::createDir($target_dir);
+        $basename = basename($binary_path);
+        $debug_file = "{$target_dir}/{$basename}" . (PHP_OS_FAMILY === 'Darwin' ? '.dwarf' : '.debug');
+        if (PHP_OS_FAMILY === 'Darwin') {
+            shell()->exec("dsymutil -f {$binary_path} -o {$debug_file}");
+        } elseif (PHP_OS_FAMILY === 'Linux') {
+            if ($eu_strip = SystemUtil::findCommand('eu-strip')) {
+                shell()
+                    ->exec("{$eu_strip} -f {$debug_file} {$binary_path}")
+                    ->exec("objcopy --add-gnu-debuglink={$debug_file} {$binary_path}");
+            } else {
+                shell()
+                    ->exec("objcopy --only-keep-debug {$binary_path} {$debug_file}")
+                    ->exec("objcopy --add-gnu-debuglink={$debug_file} {$binary_path}");
+            }
+        } else {
+            throw new SPCInternalException('extractDebugInfo is only supported on Linux and macOS');
+        }
+        return $debug_file;
+    }
+
+    /**
+     * Deploy the binary file from src to dst.
+     */
+    public function deployBinary(string $src, string $dst, bool $executable = true): string
+    {
+        logger()->debug('Deploying binary from ' . $src . ' to ' . $dst);
+
+        // file must exists
+        if (!file_exists($src)) {
+            throw new SPCInternalException("Deploy failed. Cannot find file: {$src}");
+        }
+        // dst dir must exists
+        FileSystem::createDir(dirname($dst));
+
+        // ignore copy to self
+        if (realpath($src) !== realpath($dst)) {
+            shell()->exec('cp ' . escapeshellarg($src) . ' ' . escapeshellarg($dst));
+        }
+
+        // file exist
+        if (!file_exists($dst)) {
+            throw new SPCInternalException("Deploy failed. Cannot find file after copy: {$dst}");
+        }
+
+        if (!$this->getOption('no-strip')) {
+            // extract debug info
+            $this->extractDebugInfo($dst);
+            // extra strip
+            $this->stripBinary($dst);
+        }
+
+        // UPX for linux
+        $upx_option = $this->getOption('with-upx-pack');
+        if ($upx_option && PHP_OS_FAMILY === 'Linux' && $executable) {
+            if ($this->getOption('no-strip')) {
+                logger()->warning('UPX compression is not recommended when --no-strip is enabled.');
+            }
+            logger()->info("Compressing {$dst} with UPX");
+            shell()->exec(getenv('UPX_EXEC') . " --best {$dst}");
+        }
+
+        return $dst;
+    }
+
     /**
      * Sanity check after build complete.
      */
@@ -148,8 +235,10 @@ abstract class UnixBuilderBase extends BuilderBase
                 $lens .= ' -static';
             }
             $dynamic_exports = '';
+            $embedType = 'static';
             // if someone changed to EMBED_TYPE=shared, we need to add LD_LIBRARY_PATH
             if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
+                $embedType = 'shared';
                 if (PHP_OS_FAMILY === 'Darwin') {
                     $ext_path = 'DYLD_LIBRARY_PATH=' . BUILD_LIB_PATH . ':$DYLD_LIBRARY_PATH ';
                 } else {
@@ -168,18 +257,19 @@ abstract class UnixBuilderBase extends BuilderBase
                 }
             }
             $cc = getenv('CC');
+
             [$ret, $out] = shell()->cd($sample_file_path)->execWithResult("{$cc} -o embed embed.c {$lens} {$dynamic_exports}");
             if ($ret !== 0) {
                 throw new ValidationException(
-                    'embed failed sanity check: build failed. Error message: ' . implode("\n", $out),
-                    validation_module: 'static libphp.a sanity check'
+                    'embed failed to build. Error message: ' . implode("\n", $out),
+                    validation_module: $embedType . ' libphp embed build sanity check'
                 );
             }
             [$ret, $output] = shell()->cd($sample_file_path)->execWithResult($ext_path . './embed');
             if ($ret !== 0 || trim(implode('', $output)) !== 'hello') {
                 throw new ValidationException(
-                    'embed failed sanity check: run failed. Error message: ' . implode("\n", $output),
-                    validation_module: 'static libphp.a sanity check'
+                    'embed failed to run. Error message: ' . implode("\n", $output),
+                    validation_module: $embedType . ' libphp embed run sanity check'
                 );
             }
         }
@@ -208,23 +298,20 @@ abstract class UnixBuilderBase extends BuilderBase
     }
 
     /**
-     * Deploy the binary file to the build bin path.
-     *
-     * @param int $type Type integer, one of BUILD_TARGET_CLI, BUILD_TARGET_MICRO, BUILD_TARGET_FPM
+     * Deploy binaries that produces executable SAPI
      */
-    protected function deployBinary(int $type): bool
+    protected function deploySAPIBinary(int $type): string
     {
         $src = match ($type) {
             BUILD_TARGET_CLI => SOURCE_PATH . '/php-src/sapi/cli/php',
             BUILD_TARGET_MICRO => SOURCE_PATH . '/php-src/sapi/micro/micro.sfx',
             BUILD_TARGET_FPM => SOURCE_PATH . '/php-src/sapi/fpm/php-fpm',
             BUILD_TARGET_CGI => SOURCE_PATH . '/php-src/sapi/cgi/php-cgi',
+            BUILD_TARGET_FRANKENPHP => BUILD_BIN_PATH . '/frankenphp',
             default => throw new SPCInternalException("Deployment does not accept type {$type}"),
         };
-        logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');
-        FileSystem::createDir(BUILD_BIN_PATH);
-        shell()->exec('cp ' . escapeshellarg($src) . ' ' . escapeshellarg(BUILD_BIN_PATH));
-        return true;
+        $dst = BUILD_BIN_PATH . '/' . basename($src);
+        return $this->deployBinary($src, $dst);
     }
 
     /**
@@ -265,22 +352,76 @@ abstract class UnixBuilderBase extends BuilderBase
         }
     }
 
+    /**
+     * Process the --with-frankenphp-app option
+     * Creates app.tar and app.checksum in source/frankenphp directory
+     */
+    protected function processFrankenphpApp(): void
+    {
+        $frankenphpSourceDir = getenv('FRANKENPHP_SOURCE_PATH') ?: SOURCE_PATH . '/frankenphp';
+        if (!is_dir($frankenphpSourceDir)) {
+            SourceManager::initSource(['frankenphp'], ['frankenphp']);
+        }
+        $frankenphpAppPath = $this->getOption('with-frankenphp-app');
+
+        if ($frankenphpAppPath) {
+            $frankenphpAppPath = trim($frankenphpAppPath, "\"'");
+            if (!is_dir($frankenphpAppPath)) {
+                throw new WrongUsageException("The path provided to --with-frankenphp-app is not a valid directory: {$frankenphpAppPath}");
+            }
+            $appTarPath = $frankenphpSourceDir . '/app.tar';
+            logger()->info("Creating app.tar from {$frankenphpAppPath}");
+
+            shell()->exec('tar -cf ' . escapeshellarg($appTarPath) . ' -C ' . escapeshellarg($frankenphpAppPath) . ' .');
+
+            $checksum = hash_file('md5', $appTarPath);
+            file_put_contents($frankenphpSourceDir . '/app_checksum.txt', $checksum);
+        } else {
+            FileSystem::removeFileIfExists($frankenphpSourceDir . '/app.tar');
+            FileSystem::removeFileIfExists($frankenphpSourceDir . '/app_checksum.txt');
+            file_put_contents($frankenphpSourceDir . '/app.tar', '');
+            file_put_contents($frankenphpSourceDir . '/app_checksum.txt', '');
+        }
+    }
+
+    protected function getFrankenPHPVersion(): string
+    {
+        if ($version = getenv('FRANKENPHP_VERSION')) {
+            return $version;
+        }
+        $frankenphpSourceDir = getenv('FRANKENPHP_SOURCE_PATH') ?: SOURCE_PATH . '/frankenphp';
+        $goModPath = $frankenphpSourceDir . '/caddy/go.mod';
+
+        if (!file_exists($goModPath)) {
+            throw new SPCInternalException("FrankenPHP caddy/go.mod file not found at {$goModPath}, why did we not download FrankenPHP?");
+        }
+
+        $content = file_get_contents($goModPath);
+        if (preg_match('/github\.com\/dunglas\/frankenphp\s+v?(\d+\.\d+\.\d+)/', $content, $matches)) {
+            return $matches[1];
+        }
+
+        throw new SPCInternalException('Could not find FrankenPHP version in caddy/go.mod');
+    }
+
     protected function buildFrankenphp(): void
     {
         GlobalEnvManager::addPathIfNotExists(GoXcaddy::getPath());
+        $this->processFrankenphpApp();
         $nobrotli = $this->getLib('brotli') === null ? ',nobrotli' : '';
         $nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : '';
         $xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES');
-        // make it possible to build from a different frankenphp directory!
-        if (!str_contains($xcaddyModules, '--with github.com/dunglas/frankenphp')) {
-            $xcaddyModules = '--with github.com/dunglas/frankenphp ' . $xcaddyModules;
-        }
+        $frankenphpSourceDir = getenv('FRANKENPHP_SOURCE_PATH') ?: SOURCE_PATH . '/frankenphp';
+
+        $xcaddyModules = preg_replace('#--with github.com/dunglas/frankenphp\S*#', '', $xcaddyModules);
+        $xcaddyModules = "--with github.com/dunglas/frankenphp={$frankenphpSourceDir} " .
+            "--with github.com/dunglas/frankenphp/caddy={$frankenphpSourceDir}/caddy {$xcaddyModules}";
         if ($this->getLib('brotli') === null && str_contains($xcaddyModules, '--with github.com/dunglas/caddy-cbrotli')) {
             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);
         }
-        [, $out] = shell()->execWithResult('go list -m github.com/dunglas/frankenphp@latest');
-        $frankenPhpVersion = str_replace('github.com/dunglas/frankenphp v', '', $out[0]);
+
+        $frankenPhpVersion = $this->getFrankenPHPVersion();
         $libphpVersion = $this->getPHPVersion();
         $dynamic_exports = '';
         if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
@@ -290,7 +431,6 @@ abstract class UnixBuilderBase extends BuilderBase
                 $dynamic_exports = ' ' . $dynamicSymbolsArgument;
             }
         }
-        $debugFlags = $this->getOption('no-strip') ? '-w -s ' : '';
         $extLdFlags = "-extldflags '-pie{$dynamic_exports} {$this->arch_ld_flags}'";
         $muslTags = '';
         $staticFlags = '';
@@ -301,7 +441,7 @@ abstract class UnixBuilderBase extends BuilderBase
         }
 
         $config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list);
-        $cflags = "{$this->arch_c_flags} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS');
+        $cflags = "{$this->arch_c_flags} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -DFRANKENPHP_VERSION=' . $frankenPhpVersion;
         $libs = $config['libs'];
         // 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') ||
@@ -315,23 +455,20 @@ abstract class UnixBuilderBase extends BuilderBase
             '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 .
+                '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' .
+                '-X \'github.com/caddyserver/caddy/v2/modules/caddyhttp.ServerHeader=FrankenPHP Caddy\' ' .
+                '-X \'github.com/caddyserver/caddy/v2.CustomBinaryName=frankenphp\' ' .
                 '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .
                 "v{$frankenPhpVersion} PHP {$libphpVersion} Caddy'\\\" " .
                 "-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ], ...GoXcaddy::getEnvironment()];
+        $pgo = file_exists("{$frankenphpSourceDir}/caddy/frankenphp/default.pgo") ? "--pgo {$frankenphpSourceDir}/caddy/frankenphp/default.pgo " : '';
         shell()->cd(BUILD_BIN_PATH)
             ->setEnv($env)
-            ->exec("xcaddy build --output frankenphp {$xcaddyModules}");
+            ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddyModules}");
 
-        if (!$this->getOption('no-strip', false) && file_exists(BUILD_BIN_PATH . '/frankenphp')) {
-            if (PHP_OS_FAMILY === 'Linux') {
-                shell()->cd(BUILD_BIN_PATH)->exec('strip --strip-unneeded frankenphp');
-            } else { // macOS doesn't understand strip-unneeded
-                shell()->cd(BUILD_BIN_PATH)->exec('strip -S frankenphp');
-            }
-        }
+        $this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP);
     }
 
     /**

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\store\FileSystem;
 use SPC\util\executor\UnixCMakeExecutor;
 
 trait curl
@@ -23,6 +24,8 @@ trait curl
             ->optionalLib('zstd', ...cmake_boolean_args('CURL_ZSTD'))
             ->optionalLib('idn2', ...cmake_boolean_args('USE_LIBIDN2'))
             ->optionalLib('psl', ...cmake_boolean_args('CURL_USE_LIBPSL'))
+            ->optionalLib('krb5', ...cmake_boolean_args('CURL_USE_GSSAPI'))
+            ->optionalLib('idn2', ...cmake_boolean_args('CURL_USE_IDN2'))
             ->optionalLib('libcares', '-DENABLE_ARES=ON')
             ->addConfigureArgs(
                 '-DBUILD_CURL_EXE=OFF',
@@ -30,8 +33,16 @@ trait curl
             )
             ->build();
 
-        // patch pkgconf
         $this->patchPkgconfPrefix(['libcurl.pc']);
+        // On glibc <2.28 without built-in pthreads, FindThreads sets
+        // INTERFACE_LINK_LIBRARIES to '-lpthread'
+        // curls .pc generator walks and prepends '-l' to each
+        // entry, resulting in -l-lpthread
+        FileSystem::replaceFileRegex(
+            BUILD_LIB_PATH . '/pkgconfig/libcurl.pc',
+            '/-l(-l\S+)/',
+            '$1'
+        );
         shell()->cd(BUILD_LIB_PATH . '/cmake/CURL/')
             ->exec("sed -ie 's|\"/lib/libcurl.a\"|\"" . BUILD_LIB_PATH . "/libcurl.a\"|g' CURLTargets-release.cmake");
     }

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

@@ -13,8 +13,8 @@ trait freetype
     {
         $cmake = UnixCMakeExecutor::create($this)
             ->optionalLib('libpng', ...cmake_boolean_args('FT_DISABLE_PNG', true))
-            ->optionalLib('bzip2', ...cmake_boolean_args('FT_DISABLE_BZIP2', true))
-            ->optionalLib('brotli', ...cmake_boolean_args('FT_DISABLE_BROTLI', true))
+            ->addConfigureArgs('-DFT_DISABLE_BZIP2=ON')
+            ->addConfigureArgs('-DFT_DISABLE_BROTLI=ON')
             ->addConfigureArgs('-DFT_DISABLE_HARFBUZZ=ON');
 
         // fix cmake 4.0 compatibility

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

@@ -16,7 +16,11 @@ trait gettext
             ->addConfigureArgs(
                 '--disable-java',
                 '--disable-c++',
-                '--with-included-gettext',
+                '--disable-d',
+                '--disable-rpath',
+                '--disable-modula2',
+                '--disable-libasprintf',
+                '--with-included-libintl',
                 "--with-iconv-prefix={$this->getBuildRootPath()}",
             );
 

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

@@ -10,7 +10,14 @@ trait gmp
 {
     protected function build(): void
     {
-        UnixAutoconfExecutor::create($this)->configure()->make();
+        UnixAutoconfExecutor::create($this)
+            ->appendEnv([
+                'CFLAGS' => '-std=c17',
+            ])
+            ->configure(
+                '--enable-fat'
+            )
+            ->make();
         $this->patchPkgconfPrefix(['gmp.pc']);
     }
 }

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

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\util\executor\UnixAutoconfExecutor;
+
+trait idn2
+{
+    protected function build(): void
+    {
+        UnixAutoconfExecutor::create($this)
+            ->configure(
+                '--disable-nls',
+                '--disable-doc',
+                '--enable-year2038',
+                '--disable-rpath'
+            )
+            ->optionalLib('libiconv', "--with-libiconv-prefix={$this->getBuildRootPath()}")
+            ->optionalLib('libunistring', "--with-libunistring-prefix={$this->getBuildRootPath()}")
+            ->optionalLib('gettext', "--with-libnintl-prefix={$this->getBuildRootPath()}")
+            ->make();
+        $this->patchPkgconfPrefix(['libidn2.pc']);
+        $this->patchLaDependencyPrefix();
+    }
+}

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

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
+use SPC\util\executor\UnixAutoconfExecutor;
+use SPC\util\SPCConfigUtil;
+
+trait krb5
+{
+    protected function build(): void
+    {
+        $origin_source_dir = $this->source_dir;
+        $this->source_dir .= '/src';
+        shell()->cd($this->source_dir)->exec('ls -lah');
+        if (!file_exists($this->source_dir . '/configure')) {
+            shell()->cd($this->source_dir)->exec('autoreconf -if');
+        }
+        $libs = array_map(fn ($x) => $x->getName(), $this->getDependencies(true));
+        $spc = new SPCConfigUtil($this->builder, ['no_php' => true, 'libs_only_deps' => true]);
+        $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));
+        $extraEnv = [
+            'CFLAGS' => '-fcommon',
+            'LIBS' => $config['libs'],
+        ];
+        if (getenv('SPC_LD_LIBRARY_PATH') && getenv('SPC_LIBRARY_PATH')) {
+            $extraEnv = [...$extraEnv, ...[
+                'LD_LIBRARY_PATH' => getenv('SPC_LD_LIBRARY_PATH'),
+                'LIBRARY_PATH' => getenv('SPC_LIBRARY_PATH'),
+            ]];
+        }
+        $args = [
+            '--disable-nls',
+            '--disable-rpath',
+            '--without-system-verto',
+        ];
+        if (PHP_OS_FAMILY === 'Darwin') {
+            $extraEnv['LDFLAGS'] = '-framework Kerberos';
+            $args[] = 'ac_cv_func_secure_getenv=no';
+        }
+        $make = UnixAutoconfExecutor::create($this)
+            ->appendEnv($extraEnv)
+            ->optionalLib('ldap', '--with-ldap', '--without-ldap')
+            ->optionalLib('libedit', '--with-libedit', '--without-libedit')
+            ->configure(...$args);
+
+        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            $make->exec('find . -name Makefile -exec sed -i "s/-Werror=incompatible-pointer-types//g" {} +');
+        }
+        $make->make();
+        $this->patchPkgconfPrefix([
+            'krb5-gssapi.pc',
+            'krb5.pc',
+            'kadm-server.pc',
+            'kadm-client.pc',
+            'kdb.pc',
+            'mit-krb5-gssapi.pc',
+            'mit-krb5.pc',
+            'gssrpc.pc',
+        ]);
+        $this->source_dir = $origin_source_dir;
+    }
+}

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

@@ -11,6 +11,11 @@ trait libavif
     protected function build(): void
     {
         UnixCMakeExecutor::create($this)
+            ->optionalLib('libaom', '-DAVIF_CODEC_AOM=SYSTEM', '-DAVIF_CODEC_AOM=OFF')
+            ->optionalLib('libsharpyuv', '-DAVIF_LIBSHARPYUV=SYSTEM', '-DAVIF_LIBSHARPYUV=OFF')
+            ->optionalLib('libjpeg', '-DAVIF_JPEG=SYSTEM', '-DAVIF_JPEG=OFF')
+            ->optionalLib('libxml2', '-DAVIF_LIBXML2=SYSTEM', '-DAVIF_LIBXML2=OFF')
+            ->optionalLib('libpng', '-DAVIF_LIBPNG=SYSTEM', '-DAVIF_LIBPNG=OFF')
             ->addConfigureArgs('-DAVIF_LIBYUV=OFF')
             ->build();
         // patch pkgconfig

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

@@ -11,7 +11,11 @@ trait libde265
     protected function build(): void
     {
         UnixCMakeExecutor::create($this)
-            ->addConfigureArgs('-DENABLE_SDL=OFF')
+            ->addConfigureArgs(
+                '-DENABLE_SDL=OFF',
+                '-DENABLE_DECODER=OFF',
+                '-DHAVE_NEON=OFF',
+            )
             ->build();
         $this->patchPkgconfPrefix(['libde265.pc']);
     }

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

@@ -14,6 +14,10 @@ trait libjpeg
             ->addConfigureArgs(
                 '-DENABLE_STATIC=ON',
                 '-DENABLE_SHARED=OFF',
+                '-DWITH_SYSTEM_ZLIB=ON',
+                '-DWITH_TOOLS=OFF',
+                '-DWITH_TESTS=OFF',
+                '-DWITH_SIMD=OFF',
             )
             ->build();
         // patch pkgconfig

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

@@ -29,13 +29,17 @@ trait libjxl
             );
 
         if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $cmake->addConfigureArgs(
-                '-DCXX_MAVX512F_SUPPORTED:BOOL=FALSE',
-                '-DCXX_MAVX512DQ_SUPPORTED:BOOL=FALSE',
-                '-DCXX_MAVX512CD_SUPPORTED:BOOL=FALSE',
-                '-DCXX_MAVX512BW_SUPPORTED:BOOL=FALSE',
-                '-DCXX_MAVX512VL_SUPPORTED:BOOL=FALSE'
-            );
+            $cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
+            $has_avx512 = str_contains($cflags, '-mavx512') || str_contains($cflags, '-march=x86-64-v4');
+            if (!$has_avx512) {
+                $cmake->addConfigureArgs(
+                    '-DCXX_MAVX512F_SUPPORTED:BOOL=FALSE',
+                    '-DCXX_MAVX512DQ_SUPPORTED:BOOL=FALSE',
+                    '-DCXX_MAVX512CD_SUPPORTED:BOOL=FALSE',
+                    '-DCXX_MAVX512BW_SUPPORTED:BOOL=FALSE',
+                    '-DCXX_MAVX512VL_SUPPORTED:BOOL=FALSE'
+                );
+            }
         }
 
         $cmake->build();

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

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\util\executor\UnixCMakeExecutor;
+
+trait libmaxminddb
+{
+    protected function build(): void
+    {
+        UnixCMakeExecutor::create($this)
+            ->addConfigureArgs(
+                '-DBUILD_TESTING=OFF',
+                '-DMAXMINDDB_BUILD_BINARIES=OFF',
+            )
+            ->build();
+    }
+}

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

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\util\executor\UnixAutoconfExecutor;
+
+trait libmpdec
+{
+    protected function build(): void
+    {
+        UnixAutoconfExecutor::create($this)
+            ->configure('--disable-cxx --disable-shared --enable-static')
+            ->make();
+    }
+}

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

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\unix\library;
 
 use SPC\store\FileSystem;
-use SPC\util\executor\UnixAutoconfExecutor;
+use SPC\util\executor\UnixCMakeExecutor;
 
 trait librdkafka
 {
@@ -26,34 +26,18 @@ trait librdkafka
 
     protected function build(): void
     {
-        UnixAutoconfExecutor::create($this)
-            ->appendEnv(['CFLAGS' => '-Wno-int-conversion -Wno-unused-but-set-variable -Wno-unused-variable'])
-            ->optionalLib(
-                'zstd',
-                function ($lib) {
-                    putenv("STATIC_LIB_libzstd={$lib->getLibDir()}/libzstd.a");
-                    return '';
-                },
-                '--disable-zstd'
+        UnixCMakeExecutor::create($this)
+            ->optionalLib('zstd', ...cmake_boolean_args('WITH_ZSTD'))
+            ->optionalLib('curl', ...cmake_boolean_args('WITH_CURL'))
+            ->optionalLib('openssl', ...cmake_boolean_args('WITH_SSL'))
+            ->optionalLib('zlib', ...cmake_boolean_args('WITH_ZLIB'))
+            ->optionalLib('liblz4', ...cmake_boolean_args('ENABLE_LZ4_EXT'))
+            ->addConfigureArgs(
+                '-DWITH_SASL=OFF',
+                '-DRDKAFKA_BUILD_STATIC=ON',
+                '-DRDKAFKA_BUILD_EXAMPLES=OFF',
+                '-DRDKAFKA_BUILD_TESTS=OFF',
             )
-            ->removeConfigureArgs(
-                '--with-pic',
-                '--enable-pic',
-            )
-            ->configure(
-                '--disable-curl',
-                '--disable-sasl',
-                '--disable-valgrind',
-                '--disable-zlib',
-                '--disable-ssl',
-            )
-            ->make();
-
-        $this->patchPkgconfPrefix(['rdkafka.pc', 'rdkafka-static.pc', 'rdkafka++.pc', 'rdkafka++-static.pc']);
-        // remove dynamic libs
-        shell()
-            ->exec("rm -rf {$this->getLibDir()}/*.so.*")
-            ->exec("rm -rf {$this->getLibDir()}/*.so")
-            ->exec("rm -rf {$this->getLibDir()}/*.dylib");
+            ->build();
     }
 }

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

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\util\executor\UnixAutoconfExecutor;
+
+trait libunistring
+{
+    protected function build(): void
+    {
+        UnixAutoconfExecutor::create($this)
+            ->configure('--disable-nls')
+            ->make();
+        $this->patchLaDependencyPrefix();
+    }
+}

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

@@ -10,8 +10,26 @@ trait libwebp
 {
     protected function build(): void
     {
+        $code = '#include <immintrin.h>
+int main() { return _mm256_cvtsi256_si32(_mm256_setzero_si256()); }';
+        $cc = getenv('CC') ?: 'gcc';
+        [$ret] = shell()->execWithResult("printf '%s' '{$code}' | {$cc} -x c -mavx2 -o /dev/null - 2>&1");
+        $disableAvx2 = $ret !== 0 && GNU_ARCH === 'x86_64' && PHP_OS_FAMILY === 'Linux';
+
         UnixCMakeExecutor::create($this)
-            ->addConfigureArgs('-DWEBP_BUILD_EXTRAS=ON')
+            ->addConfigureArgs(
+                '-DWEBP_BUILD_EXTRAS=OFF',
+                '-DWEBP_BUILD_ANIM_UTILS=OFF',
+                '-DWEBP_BUILD_CWEBP=OFF',
+                '-DWEBP_BUILD_DWEBP=OFF',
+                '-DWEBP_BUILD_GIF2WEBP=OFF',
+                '-DWEBP_BUILD_IMG2WEBP=OFF',
+                '-DWEBP_BUILD_VWEBP=OFF',
+                '-DWEBP_BUILD_WEBPINFO=OFF',
+                '-DWEBP_BUILD_WEBPMUX=OFF',
+                '-DWEBP_BUILD_FUZZTEST=OFF',
+                $disableAvx2 ? '-DWEBP_ENABLE_SIMD=OFF' : ''
+            )
             ->build();
         // patch pkgconfig
         $this->patchPkgconfPrefix(patch_option: PKGCONF_PATCH_PREFIX | PKGCONF_PATCH_LIBDIR);

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

@@ -16,6 +16,7 @@ trait ncurses
 
         UnixAutoconfExecutor::create($this)
             ->appendEnv([
+                'CFLAGS' => '-std=c17',
                 'LDFLAGS' => SPCTarget::isStatic() ? '-static' : '',
             ])
             ->configure(
@@ -29,7 +30,7 @@ trait ncurses
                 '--without-tests',
                 '--without-dlsym',
                 '--without-debug',
-                '-enable-symlinks',
+                '--enable-symlinks',
                 "--bindir={$this->getBinDir()}",
                 "--includedir={$this->getIncludeDir()}",
                 "--libdir={$this->getLibDir()}",

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

@@ -4,29 +4,14 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 use SPC\util\PkgConfigUtil;
 use SPC\util\SPCConfigUtil;
-use SPC\util\SPCTarget;
 
 trait postgresql
 {
     public function patchBeforeBuild(): bool
     {
-        // fix aarch64 build on glibc 2.17 (e.g. CentOS 7)
-        if (SPCTarget::getLibcVersion() === '2.17' && GNU_ARCH === 'aarch64') {
-            try {
-                FileSystem::replaceFileStr("{$this->source_dir}/src/port/pg_popcount_aarch64.c", 'HWCAP_SVE', '0');
-                FileSystem::replaceFileStr(
-                    "{$this->source_dir}/src/port/pg_crc32c_armv8_choose.c",
-                    '#if defined(__linux__) && !defined(__aarch64__) && !defined(HWCAP2_CRC32)',
-                    '#if defined(__linux__) && !defined(HWCAP_CRC32)'
-                );
-            } catch (FileSystemException) {
-                // allow file not-existence to make it compatible with old and new version
-            }
-        }
         // skip the test on platforms where libpq infrastructure may be provided by statically-linked libraries
         FileSystem::replaceFileStr("{$this->source_dir}/src/interfaces/libpq/Makefile", 'invokes exit\'; exit 1;', 'invokes exit\';');
         // disable shared libs build
@@ -47,10 +32,10 @@ trait postgresql
     {
         $libs = array_map(fn ($x) => $x->getName(), $this->getDependencies(true));
         $spc = new SPCConfigUtil($this->builder, ['no_php' => true, 'libs_only_deps' => true]);
-        $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs'));
+        $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));
 
         $env_vars = [
-            'CFLAGS' => $config['cflags'],
+            'CFLAGS' => $config['cflags'] . ' -std=c17',
             'CPPFLAGS' => '-DPIC',
             'LDFLAGS' => $config['ldflags'],
             'LIBS' => $config['libs'],
@@ -108,8 +93,7 @@ trait postgresql
 
         // remove dynamic libs
         shell()->cd($this->source_dir . '/build')
-            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.so.*")
-            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.so")
+            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.so*")
             ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.dylib");
 
         FileSystem::replaceFileStr("{$this->getLibDir()}/pkgconfig/libpq.pc", '-lldap', '-lldap -llber');

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\unix\library;
 
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 use SPC\util\executor\UnixAutoconfExecutor;
 
 trait unixodbc
@@ -30,7 +31,15 @@ trait unixodbc
                 '--enable-gui=no',
             )
             ->make();
-        $this->patchPkgconfPrefix(['odbc.pc', 'odbccr.pc', 'odbcinst.pc']);
+        $pkgConfigs = ['odbc.pc', 'odbccr.pc', 'odbcinst.pc'];
+        $this->patchPkgconfPrefix($pkgConfigs);
+        foreach ($pkgConfigs as $file) {
+            FileSystem::replaceFileStr(
+                BUILD_LIB_PATH . "/pkgconfig/{$file}",
+                '$(top_build_prefix)libltdl/libltdlc.la',
+                ''
+            );
+        }
         $this->patchLaDependencyPrefix();
     }
 }

src/SPC/builder/windows/WindowsBuilder.php

@@ -67,21 +67,6 @@ class WindowsBuilder extends BuilderBase
 
         $zts = $this->zts ? '--enable-zts=yes ' : '--enable-zts=no ';
 
-        // with-upx-pack for phpmicro
-        if ($enableMicro && version_compare($this->getMicroVersion(), '0.2.0') < 0) {
-            $makefile = FileSystem::convertPath(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.w32');
-            if ($this->getOption('with-upx-pack', false)) {
-                if (!file_exists($makefile . '.originfile')) {
-                    copy($makefile, $makefile . '.originfile');
-                    FileSystem::replaceFileStr($makefile, '$(MICRO_SFX):', '_MICRO_UPX = ' . getenv('UPX_EXEC') . " --best $(MICRO_SFX)\n$(MICRO_SFX):");
-                    FileSystem::replaceFileStr($makefile, '@$(_MICRO_MT)', "@$(_MICRO_MT)\n\t@$(_MICRO_UPX)");
-                }
-            } elseif (file_exists($makefile . '.originfile')) {
-                copy($makefile . '.originfile', $makefile);
-                unlink($makefile . '.originfile');
-            }
-        }
-
         $opcache_jit = !$this->getOption('disable-opcache-jit', false);
         $opcache_jit_arg = $opcache_jit ? '--enable-opcache-jit=yes ' : '--enable-opcache-jit=no ';
 
@@ -145,7 +130,7 @@ class WindowsBuilder extends BuilderBase
         }
     }
 
-    public function testPHP(int $build_target = BUILD_TARGET_NONE)
+    public function testPHP(int $build_target = BUILD_TARGET_NONE): void
     {
         $this->sanityCheck($build_target);
     }
@@ -156,12 +141,27 @@ class WindowsBuilder extends BuilderBase
 
         $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
 
+        // Add debug symbols for release build if --no-strip is specified
+        // We need to modify CFLAGS to replace /Ox with /Zi and add /DEBUG to LDFLAGS
+        $debug_overrides = '';
+        if ($this->getOption('no-strip', false)) {
+            // Read current CFLAGS from Makefile and replace optimization flags
+            $makefile_content = file_get_contents(SOURCE_PATH . '\php-src\Makefile');
+            if (preg_match('/^CFLAGS=(.+?)$/m', $makefile_content, $matches)) {
+                $cflags = $matches[1];
+                // Replace /Ox (full optimization) with /Zi (debug info) and /Od (disable optimization)
+                // Keep optimization for speed: /O2 /Zi instead of /Od /Zi
+                $cflags = str_replace('/Ox ', '/O2 /Zi ', $cflags);
+                $debug_overrides = '"CFLAGS=' . $cflags . '" "LDFLAGS=/DEBUG /LTCG /INCREMENTAL:NO" "LDFLAGS_CLI=/DEBUG" ';
+            }
+        }
+
         // add nmake wrapper
-        FileSystem::writeFile(SOURCE_PATH . '\php-src\nmake_cli_wrapper.bat', "nmake /nologo LIBS_CLI=\"ws2_32.lib shell32.lib {$extra_libs}\" EXTRA_LD_FLAGS_PROGRAM= %*");
+        FileSystem::writeFile(SOURCE_PATH . '\php-src\nmake_cli_wrapper.bat', "nmake /nologo {$debug_overrides}LIBS_CLI=\"ws2_32.lib shell32.lib {$extra_libs}\" EXTRA_LD_FLAGS_PROGRAM= %*");
 
         cmd()->cd(SOURCE_PATH . '\php-src')->exec("{$this->sdk_prefix} nmake_cli_wrapper.bat --task-args php.exe");
 
-        $this->deployBinary(BUILD_TARGET_CLI);
+        $this->deploySAPIBinary(BUILD_TARGET_CLI);
     }
 
     public function buildCgi(): void
@@ -170,12 +170,23 @@ class WindowsBuilder extends BuilderBase
 
         $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
 
+        // Add debug symbols for release build if --no-strip is specified
+        $debug_overrides = '';
+        if ($this->getOption('no-strip', false)) {
+            $makefile_content = file_get_contents(SOURCE_PATH . '\php-src\Makefile');
+            if (preg_match('/^CFLAGS=(.+?)$/m', $makefile_content, $matches)) {
+                $cflags = $matches[1];
+                $cflags = str_replace('/Ox ', '/O2 /Zi ', $cflags);
+                $debug_overrides = '"CFLAGS=' . $cflags . '" "LDFLAGS=/DEBUG /LTCG /INCREMENTAL:NO" "LDFLAGS_CGI=/DEBUG" ';
+            }
+        }
+
         // add nmake wrapper
-        FileSystem::writeFile(SOURCE_PATH . '\php-src\nmake_cgi_wrapper.bat', "nmake /nologo LIBS_CGI=\"ws2_32.lib kernel32.lib advapi32.lib {$extra_libs}\" EXTRA_LD_FLAGS_PROGRAM= %*");
+        FileSystem::writeFile(SOURCE_PATH . '\php-src\nmake_cgi_wrapper.bat', "nmake /nologo {$debug_overrides}LIBS_CGI=\"ws2_32.lib kernel32.lib advapi32.lib {$extra_libs}\" EXTRA_LD_FLAGS_PROGRAM= %*");
 
         cmd()->cd(SOURCE_PATH . '\php-src')->exec("{$this->sdk_prefix} nmake_cgi_wrapper.bat --task-args php-cgi.exe");
 
-        $this->deployBinary(BUILD_TARGET_CGI);
+        $this->deploySAPIBinary(BUILD_TARGET_CGI);
     }
 
     public function buildEmbed(): void
@@ -202,9 +213,20 @@ class WindowsBuilder extends BuilderBase
 
         $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
 
+        // Add debug symbols for release build if --no-strip is specified
+        $debug_overrides = '';
+        if ($this->getOption('no-strip', false) && !$this->getOption('debug', false)) {
+            $makefile_content = file_get_contents(SOURCE_PATH . '\php-src\Makefile');
+            if (preg_match('/^CFLAGS=(.+?)$/m', $makefile_content, $matches)) {
+                $cflags = $matches[1];
+                $cflags = str_replace('/Ox ', '/O2 /Zi ', $cflags);
+                $debug_overrides = '"CFLAGS=' . $cflags . '" "LDFLAGS=/DEBUG /LTCG /INCREMENTAL:NO" "LDFLAGS_MICRO=/DEBUG" ';
+            }
+        }
+
         // add nmake wrapper
         $fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' /DPHP_MICRO_FAKE_CLI" ' : '';
-        $wrapper = "nmake /nologo LIBS_MICRO=\"ws2_32.lib shell32.lib {$extra_libs}\" CFLAGS_MICRO=\"/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1{$fake_cli}\" %*";
+        $wrapper = "nmake /nologo {$debug_overrides}LIBS_MICRO=\"ws2_32.lib shell32.lib {$extra_libs}\" CFLAGS_MICRO=\"/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1{$fake_cli}\" %*";
         FileSystem::writeFile(SOURCE_PATH . '\php-src\nmake_micro_wrapper.bat', $wrapper);
 
         // phar patch for micro
@@ -221,7 +243,7 @@ class WindowsBuilder extends BuilderBase
             }
         }
 
-        $this->deployBinary(BUILD_TARGET_MICRO);
+        $this->deploySAPIBinary(BUILD_TARGET_MICRO);
     }
 
     public function proveLibs(array $sorted_libraries): void
@@ -335,28 +357,53 @@ class WindowsBuilder extends BuilderBase
      *
      * @param int $type Deploy type
      */
-    public function deployBinary(int $type): bool
+    public function deploySAPIBinary(int $type): void
     {
+        logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');
+
+        $debug_dir = BUILD_ROOT_PATH . '\debug';
+        $bin_path = BUILD_BIN_PATH;
+
+        // create dirs
+        FileSystem::createDir($debug_dir);
+        FileSystem::createDir($bin_path);
+
+        // determine source path for different SAPI
+        $rel_type = 'Release'; // TODO: Debug build support
         $ts = $this->zts ? '_TS' : '';
         $src = match ($type) {
-            BUILD_TARGET_CLI => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\php.exe",
-            BUILD_TARGET_MICRO => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\micro.sfx",
-            BUILD_TARGET_CGI => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\php-cgi.exe",
+            BUILD_TARGET_CLI => [SOURCE_PATH . "\\php-src\\x64\\{$rel_type}{$ts}", 'php.exe', 'php.pdb'],
+            BUILD_TARGET_MICRO => [SOURCE_PATH . "\\php-src\\x64\\{$rel_type}{$ts}", 'micro.sfx', 'micro.pdb'],
+            BUILD_TARGET_CGI => [SOURCE_PATH . "\\php-src\\x64\\{$rel_type}{$ts}", 'php-cgi.exe', 'php-cgi.pdb'],
             default => throw new SPCInternalException("Deployment does not accept type {$type}"),
         };
 
+        $src = "{$src[0]}\\{$src[1]}";
+        $dst = BUILD_BIN_PATH . '\\' . basename($src);
+
+        // file must exists
+        if (!file_exists($src)) {
+            throw new SPCInternalException("Deploy failed. Cannot find file: {$src}");
+        }
+        // dst dir must exists
+        FileSystem::createDir(dirname($dst));
+
+        // copy file
+        if (realpath($src) !== realpath($dst)) {
+            cmd()->exec('copy ' . escapeshellarg($src) . ' ' . escapeshellarg($dst));
+        }
+
+        // extract debug info in buildroot/debug
+        if ($this->getOption('no-strip', false) && file_exists("{$src[0]}\\{$src[2]}")) {
+            cmd()->exec('copy ' . escapeshellarg("{$src[0]}\\{$src[2]}") . ' ' . escapeshellarg($debug_dir));
+        }
+
         // with-upx-pack for cli and micro
         if ($this->getOption('with-upx-pack', false)) {
             if ($type === BUILD_TARGET_CLI || $type === BUILD_TARGET_CGI || ($type === BUILD_TARGET_MICRO && version_compare($this->getMicroVersion(), '0.2.0') >= 0)) {
-                cmd()->exec(getenv('UPX_EXEC') . ' --best ' . escapeshellarg($src));
+                cmd()->exec(getenv('UPX_EXEC') . ' --best ' . escapeshellarg($dst));
             }
         }
-
-        logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');
-        FileSystem::createDir(BUILD_BIN_PATH);
-
-        cmd()->exec('copy ' . escapeshellarg($src) . ' ' . escapeshellarg(BUILD_BIN_PATH . '\\'));
-        return true;
     }
 
     /**

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

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\windows\library;
+
+use SPC\store\FileSystem;
+
+class brotli extends WindowsLibraryBase
+{
+    public const NAME = 'brotli';
+
+    protected function build(): void
+    {
+        // reset cmake
+        FileSystem::resetDir($this->source_dir . '\build');
+
+        // start build
+        cmd()->cd($this->source_dir)
+            ->execWithWrapper(
+                $this->builder->makeSimpleWrapper('cmake'),
+                '-B build ' .
+                '-A x64 ' .
+                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
+                '-DCMAKE_BUILD_TYPE=Release ' .
+                '-DBUILD_SHARED_LIBS=OFF ' .
+                '-DBROTLI_BUILD_TOOLS=OFF ' .
+                '-DBROTLI_BUNDLED_MODE=OFF ' .
+                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
+            )
+            ->execWithWrapper(
+                $this->builder->makeSimpleWrapper('cmake'),
+                "--build build --config Release --target install -j{$this->builder->concurrency}"
+            );
+    }
+}

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

@@ -30,7 +30,6 @@ class curl extends WindowsLibraryBase
                 '-DCMAKE_BUILD_TYPE=Release ' .
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DBUILD_STATIC_LIBS=ON ' .
-                '-DCURL_STATICLIB=ON ' .
                 '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
                 '-DBUILD_CURL_EXE=OFF ' . // disable curl.exe
                 '-DBUILD_TESTING=OFF ' . // disable tests
@@ -42,9 +41,9 @@ class curl extends WindowsLibraryBase
                 '-DCURL_USE_OPENSSL=OFF ' . // disable openssl due to certificate issue
                 '-DCURL_ENABLE_SSL=ON ' .
                 '-DUSE_NGHTTP2=ON ' . // enable nghttp2
+                '-DSHARE_LIB_OBJECT=OFF ' . // disable shared lib object
                 '-DCURL_USE_LIBSSH2=ON ' . // enable libssh2
                 '-DENABLE_IPV6=ON ' . // enable ipv6
-                '-DNGHTTP2_CFLAGS="/DNGHTTP2_STATICLIB" ' .
                 $alt
             )
             ->execWithWrapper(
@@ -53,5 +52,7 @@ class curl extends WindowsLibraryBase
             );
         // move libcurl.lib to libcurl_a.lib
         rename(BUILD_LIB_PATH . '\libcurl.lib', BUILD_LIB_PATH . '\libcurl_a.lib');
+
+        FileSystem::replaceFileStr(BUILD_INCLUDE_PATH . '\curl\curl.h', '#ifdef CURL_STATICLIB', '#if 1');
     }
 }

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

@@ -24,6 +24,8 @@ class freetype extends WindowsLibraryBase
                 "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
                 '-DCMAKE_BUILD_TYPE=Release ' .
                 '-DBUILD_SHARED_LIBS=OFF ' .
+                '-DFT_DISABLE_BROTLI=TRUE ' .
+                '-DFT_DISABLE_BZIP2=TRUE ' .
                 '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
             )
             ->execWithWrapper(

src/SPC/builder/windows/library/icu_static_win.php

@@ -12,16 +12,16 @@ class icu_static_win extends WindowsLibraryBase
 
     protected function build(): void
     {
-        copy("{$this->source_dir}\\x64-windows-static\\lib\\icudt.lib", "{$this->getLibDir()}\\icudt.lib");
-        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuin.lib", "{$this->getLibDir()}\\icuin.lib");
-        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuio.lib", "{$this->getLibDir()}\\icuio.lib");
-        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuuc.lib", "{$this->getLibDir()}\\icuuc.lib");
+        copy("{$this->source_dir}\\lib\\icudt.lib", "{$this->getLibDir()}\\icudt.lib");
+        copy("{$this->source_dir}\\lib\\icuin.lib", "{$this->getLibDir()}\\icuin.lib");
+        copy("{$this->source_dir}\\lib\\icuio.lib", "{$this->getLibDir()}\\icuio.lib");
+        copy("{$this->source_dir}\\lib\\icuuc.lib", "{$this->getLibDir()}\\icuuc.lib");
 
         // create libpq folder in buildroot/includes/libpq
         if (!file_exists("{$this->getIncludeDir()}\\unicode")) {
             mkdir("{$this->getIncludeDir()}\\unicode");
         }
 
-        FileSystem::copyDir("{$this->source_dir}\\x64-windows-static\\include\\unicode", "{$this->getIncludeDir()}\\unicode");
+        FileSystem::copyDir("{$this->source_dir}\\include\\unicode", "{$this->getIncludeDir()}\\unicode");
     }
 }

src/SPC/builder/windows/library/libaom.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\windows\library;
+
+use SPC\store\FileSystem;
+
+class libaom extends WindowsLibraryBase
+{
+    public const NAME = 'libaom';
+
+    protected function build(): void
+    {
+        // libaom source tree contains a build/cmake/ directory with its own
+        // cmake modules, so we must use a different name for the build dir.
+        FileSystem::resetDir($this->source_dir . '\builddir');
+
+        // start build
+        cmd()->cd($this->source_dir)
+            ->execWithWrapper(
+                $this->builder->makeSimpleWrapper('cmake'),
+                '-S . -B builddir ' .
+                '-A x64 ' .
+                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
+                '-DCMAKE_BUILD_TYPE=Release ' .
+                '-DBUILD_SHARED_LIBS=OFF ' .
+                '-DAOM_TARGET_CPU=generic ' .
+                '-DENABLE_DOCS=OFF ' .
+                '-DENABLE_EXAMPLES=OFF ' .
+                '-DENABLE_TESTDATA=OFF ' .
+                '-DENABLE_TESTS=OFF ' .
+                '-DENABLE_TOOLS=OFF ' .
+                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
+            )
+            ->execWithWrapper(
+                $this->builder->makeSimpleWrapper('cmake'),
+                "--build builddir --config Release --target install -j{$this->builder->concurrency}"
+            );
+    }
+}

src/SPC/builder/windows/library/libjpeg.php

@@ -28,6 +28,7 @@ class libjpeg extends WindowsLibraryBase
                 '-DENABLE_STATIC=ON ' .
                 '-DBUILD_TESTING=OFF ' .
                 '-DWITH_JAVA=OFF ' .
+                '-DWITH_SIMD=OFF ' .
                 '-DWITH_CRT_DLL=OFF ' .
                 "-DENABLE_ZLIB_COMPRESSION={$zlib} " .
                 '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '

src/SPC/builder/windows/library/libmpdec.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\windows\library;
+
+class libmpdec extends WindowsLibraryBase
+{
+    public const NAME = 'libmpdec';
+
+    protected function build(): void
+    {
+        $makefile_dir = $this->source_dir . '\libmpdec';
+        $nmake = $this->builder->makeSimpleWrapper('nmake /nologo');
+
+        cmd()->cd($makefile_dir)
+            ->exec('copy /y Makefile.vc Makefile')
+            ->execWithWrapper($nmake, 'clean')
+            ->execWithWrapper($nmake, 'MACHINE=x64');
+
+        // Copy static lib (rename from versioned name to libmpdec_a.lib)
+        $libs = glob($makefile_dir . '\libmpdec-*.lib');
+        foreach ($libs as $lib) {
+            if (!str_contains($lib, '.dll.')) {
+                copy($lib, BUILD_LIB_PATH . '\libmpdec_a.lib');
+                break;
+            }
+        }
+        copy($makefile_dir . '\mpdecimal.h', BUILD_INCLUDE_PATH . '\mpdecimal.h');
+    }
+}

src/SPC/builder/windows/library/nghttp2.php

@@ -29,11 +29,16 @@ class nghttp2 extends WindowsLibraryBase
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DENABLE_STATIC_CRT=ON ' .
                 '-DENABLE_LIB_ONLY=ON ' .
-                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
+                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
+                '-DENABLE_STATIC_CRT=ON ' .
+                '-DENABLE_DOC=OFF ' .
+                '-DBUILD_TESTING=OFF '
             )
             ->execWithWrapper(
                 $this->builder->makeSimpleWrapper('cmake'),
                 "--build build --config Release --target install -j{$this->builder->concurrency}"
             );
+
+        FileSystem::replaceFileStr(BUILD_INCLUDE_PATH . '\nghttp2\nghttp2.h', '#ifdef NGHTTP2_STATICLIB', '#if 1');
     }
 }

src/SPC/builder/windows/library/ngtcp2.php

@@ -29,6 +29,7 @@ class ngtcp2 extends WindowsLibraryBase
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DENABLE_STATIC_CRT=ON ' .
                 '-DENABLE_LIB_ONLY=ON ' .
+                '-DENABLE_OPENSSL=OFF ' .
                 '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
             )
             ->execWithWrapper(

src/SPC/builder/windows/library/postgresql_win.php

@@ -10,9 +10,9 @@ class postgresql_win extends WindowsLibraryBase
 
     protected function build(): void
     {
-        copy($this->source_dir . '\pgsql\lib\libpq.lib', BUILD_LIB_PATH . '\libpq.lib');
-        copy($this->source_dir . '\pgsql\lib\libpgport.lib', BUILD_LIB_PATH . '\libpgport.lib');
-        copy($this->source_dir . '\pgsql\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');
+        copy($this->source_dir . '\lib\libpq.lib', BUILD_LIB_PATH . '\libpq.lib');
+        copy($this->source_dir . '\lib\libpgport.lib', BUILD_LIB_PATH . '\libpgport.lib');
+        copy($this->source_dir . '\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');
 
         // create libpq folder in buildroot/includes/libpq
         if (!file_exists(BUILD_INCLUDE_PATH . '\libpq')) {
@@ -21,7 +21,7 @@ class postgresql_win extends WindowsLibraryBase
 
         $headerFiles = ['libpq-fe.h', 'postgres_ext.h', 'pg_config_ext.h', 'libpq\libpq-fs.h'];
         foreach ($headerFiles as $header) {
-            copy($this->source_dir . '\pgsql\include\\' . $header, BUILD_INCLUDE_PATH . '\\' . $header);
+            copy($this->source_dir . '\include\\' . $header, BUILD_INCLUDE_PATH . '\\' . $header);
         }
     }
 }

src/SPC/builder/windows/library/zlib.php

@@ -31,8 +31,24 @@ class zlib extends WindowsLibraryBase
                 $this->builder->makeSimpleWrapper('cmake'),
                 "--build build --config Release --target install -j{$this->builder->concurrency}"
             );
-        copy(BUILD_LIB_PATH . '\zlibstatic.lib', BUILD_LIB_PATH . '\zlib_a.lib');
-        unlink(BUILD_ROOT_PATH . '\bin\zlib.dll');
-        unlink(BUILD_LIB_PATH . '\zlib.lib');
+        $detect_list = [
+            'zlibstatic.lib',
+            'zs.lib',
+            'libzs.lib',
+            'libz.lib',
+        ];
+        foreach ($detect_list as $item) {
+            if (file_exists(BUILD_LIB_PATH . '\\' . $item)) {
+                FileSystem::copy(BUILD_LIB_PATH . '\\' . $item, BUILD_LIB_PATH . '\zlib_a.lib');
+                FileSystem::copy(BUILD_LIB_PATH . '\\' . $item, BUILD_LIB_PATH . '\zlibstatic.lib');
+                break;
+            }
+        }
+        FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '\bin\zlib.dll');
+        FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\zlib.lib');
+        FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\libz.dll');
+        FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\libz.lib');
+        FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\z.lib');
+        FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\z.dll');
     }
 }

src/SPC/command/BuildPHPCommand.php

@@ -48,6 +48,7 @@ class BuildPHPCommand extends BuildCommand
         $this->addOption('with-upx-pack', null, null, 'Compress / pack binary using UPX tool (linux/windows only)');
         $this->addOption('with-micro-logo', null, InputOption::VALUE_REQUIRED, 'Use custom .ico for micro.sfx (windows only)');
         $this->addOption('enable-micro-win32', null, null, 'Enable win32 mode for phpmicro (Windows only)');
+        $this->addOption('with-frankenphp-app', null, InputOption::VALUE_REQUIRED, 'Path to a folder to be embedded in FrankenPHP');
     }
 
     public function handle(): int

src/SPC/command/DownloadCommand.php

@@ -30,7 +30,7 @@ class DownloadCommand extends BaseCommand
         $this->addArgument('sources', InputArgument::REQUIRED, 'The sources will be compiled, comma separated');
         $this->addOption('shallow-clone', null, null, 'Clone shallow');
         $this->addOption('with-openssl11', null, null, 'Use openssl 1.1');
-        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format (default 8.4)', '8.4');
+        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format (default 8.5)', '8.5');
         $this->addOption('clean', null, null, 'Clean old download cache and source before fetch');
         $this->addOption('all', 'A', null, 'Fetch all sources that static-php-cli needed');
         $this->addOption('custom-url', 'U', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Specify custom source download url, e.g "php-src:https://downloads.php.net/~eric/php-8.3.0beta1.tar.gz"');

src/SPC/command/SwitchPhpVersionCommand.php

@@ -20,9 +20,9 @@ class SwitchPhpVersionCommand extends BaseCommand
         $this->addArgument(
             'php-major-version',
             InputArgument::REQUIRED,
-            'PHP major version (supported: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4)',
+            'PHP major version (supported: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5)',
             null,
-            fn () => ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+            fn () => ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
         );
         $this->no_motd = true;
 
@@ -32,7 +32,7 @@ class SwitchPhpVersionCommand extends BaseCommand
     public function handle(): int
     {
         $php_ver = $this->input->getArgument('php-major-version');
-        if (!in_array($php_ver, ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'])) {
+        if (!in_array($php_ver, ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'])) {
             // match x.y.z
             preg_match('/^\d+\.\d+\.\d+$/', $php_ver, $matches);
             if (!$matches) {

src/SPC/doctor/item/LinuxMuslCheck.php

@@ -22,7 +22,7 @@ class LinuxMuslCheck
     public static function optionalCheck(): bool
     {
         return getenv('SPC_TOOLCHAIN') === MuslToolchain::class ||
-            (getenv('SPC_TOOLCHAIN') === ZigToolchain::class && !SystemUtil::isMuslDist());
+            (getenv('SPC_TOOLCHAIN') === ZigToolchain::class && !SystemUtil::isMuslDist() && !str_contains((string) getenv('SPC_TARGET'), 'gnu'));
     }
 
     /** @noinspection PhpUnused */

src/SPC/doctor/item/LinuxToolCheckList.php

@@ -22,7 +22,6 @@ class LinuxToolCheckList
         'bzip2', 'cmake', 'gcc',
         'g++', 'patch', 'binutils-gold',
         'libtoolize', 'which',
-        'patchelf',
     ];
 
     public const TOOLS_DEBIAN = [
@@ -31,7 +30,6 @@ class LinuxToolCheckList
         'tar', 'unzip', 'gzip', 'gcc', 'g++',
         'bzip2', 'cmake', 'patch',
         'xz', 'libtoolize', 'which',
-        'patchelf',
     ];
 
     public const TOOLS_RHEL = [
@@ -39,8 +37,7 @@ class LinuxToolCheckList
         'git', 'autoconf', 'automake',
         'tar', 'unzip', 'gzip', 'gcc', 'g++',
         'bzip2', 'cmake', 'patch', 'which',
-        'xz', 'libtool', 'gettext-devel',
-        'patchelf', 'file',
+        'xz', 'libtool', 'gettext-devel', 'file',
     ];
 
     public const TOOLS_ARCH = [
@@ -112,7 +109,7 @@ class LinuxToolCheckList
     public function fixBuildTools(array $distro, array $missing): bool
     {
         $install_cmd = match ($distro['dist']) {
-            'ubuntu', 'debian', 'Deepin' => 'apt-get install -y',
+            'ubuntu', 'debian', 'linuxmint', 'Deepin' => 'apt-get install -y',
             'alpine' => 'apk add',
             'redhat' => 'dnf install -y',
             'centos' => 'yum install -y',

src/SPC/exception/ExceptionHandler.php

@@ -159,7 +159,9 @@ class ExceptionHandler
     public static function handleDefaultException(\Throwable $e): void
     {
         $class = get_class($e);
-        self::logError("✗ Unhandled exception {$class}:\n\t{$e->getMessage()}\n");
+        $file = $e->getFile();
+        $line = $e->getLine();
+        self::logError("✗ Unhandled exception {$class} on {$file} line {$line}:\n\t{$e->getMessage()}\n");
         self::logError('Stack trace:');
         self::logError(ConsoleColor::gray($e->getTraceAsString()) . PHP_EOL, 4);
         self::logError('⚠ Please report this exception to: https://github.com/crazywhalecc/static-php-cli/issues');

src/SPC/store/DirDiff.php

@@ -0,0 +1,95 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\store;
+
+/**
+ * A util class to diff directory file increments.
+ */
+class DirDiff
+{
+    protected array $before = [];
+
+    protected array $before_file_hashes = [];
+
+    public function __construct(protected string $dir, protected bool $track_content_changes = false)
+    {
+        $this->reset();
+    }
+
+    /**
+     * Reset the baseline to current state.
+     */
+    public function reset(): void
+    {
+        $this->before = FileSystem::scanDirFiles($this->dir, relative: true) ?: [];
+
+        if ($this->track_content_changes) {
+            $this->before_file_hashes = [];
+            foreach ($this->before as $file) {
+                $this->before_file_hashes[$file] = md5_file($this->dir . DIRECTORY_SEPARATOR . $file);
+            }
+        }
+    }
+
+    /**
+     * Get the list of incremented files.
+     *
+     * @param  bool          $relative Return relative paths or absolute paths
+     * @return array<string> List of incremented files
+     */
+    public function getIncrementFiles(bool $relative = false): array
+    {
+        $after = FileSystem::scanDirFiles($this->dir, relative: true) ?: [];
+        $diff = array_diff($after, $this->before);
+        if ($relative) {
+            return $diff;
+        }
+        return array_map(fn ($f) => $this->dir . DIRECTORY_SEPARATOR . $f, $diff);
+    }
+
+    /**
+     * Get the list of changed files (including new files).
+     *
+     * @param  bool          $relative          Return relative paths or absolute paths
+     * @param  bool          $include_new_files Include new files as changed files
+     * @return array<string> List of changed files
+     */
+    public function getChangedFiles(bool $relative = false, bool $include_new_files = true): array
+    {
+        $after = FileSystem::scanDirFiles($this->dir, relative: true) ?: [];
+        $changed = [];
+        foreach ($after as $file) {
+            if (isset($this->before_file_hashes[$file])) {
+                $after_hash = md5_file($this->dir . DIRECTORY_SEPARATOR . $file);
+                if ($after_hash !== $this->before_file_hashes[$file]) {
+                    $changed[] = $file;
+                }
+            } elseif ($include_new_files) {
+                // New file, consider as changed
+                $changed[] = $file;
+            }
+        }
+        if ($relative) {
+            return $changed;
+        }
+        return array_map(fn ($f) => $this->dir . DIRECTORY_SEPARATOR . $f, $changed);
+    }
+
+    /**
+     * Get the list of removed files.
+     *
+     * @param  bool          $relative Return relative paths or absolute paths
+     * @return array<string> List of removed files
+     */
+    public function getRemovedFiles(bool $relative = false): array
+    {
+        $after = FileSystem::scanDirFiles($this->dir, relative: true) ?: [];
+        $removed = array_diff($this->before, $after);
+        if ($relative) {
+            return $removed;
+        }
+        return array_map(fn ($f) => $this->dir . DIRECTORY_SEPARATOR . $f, $removed);
+    }
+}

src/SPC/store/Downloader.php

@@ -97,29 +97,52 @@ class Downloader
     public static function getLatestGithubTarball(string $name, array $source, string $type = 'releases'): array
     {
         logger()->debug("finding {$name} source from github {$type} tarball");
-        $data = json_decode(self::curlExec(
-            url: "https://api.github.com/repos/{$source['repo']}/{$type}",
-            hooks: [[CurlHook::class, 'setupGithubToken']],
-            retries: self::getRetryAttempts()
-        ), true, 512, JSON_THROW_ON_ERROR);
+        $source['query'] ??= '';
 
-        $url = null;
-        foreach ($data as $rel) {
-            if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
-                continue;
+        // Use /releases/latest when possible: it returns the semantically latest stable
+        // release regardless of publish order, avoiding issues with concurrent release branches.
+        if ($type === 'releases' && empty($source['query']) && !($source['match'] ?? null)) {
+            $data = json_decode(self::curlExec(
+                url: "https://api.github.com/repos/{$source['repo']}/releases/latest",
+                hooks: [[CurlHook::class, 'setupGithubToken']],
+                retries: self::getRetryAttempts()
+            ), true, 512, JSON_THROW_ON_ERROR);
+            if (!is_array($data) || empty($data['tarball_url'])) {
+                throw new DownloaderException("failed to find {$name} source");
             }
-            if (!($source['match'] ?? null)) {
-                $url = $rel['tarball_url'] ?? null;
-                break;
+            $url = $data['tarball_url'];
+            $version = $data['tag_name'] ?? $data['name'] ?? null;
+        } else {
+            $data = json_decode(self::curlExec(
+                url: "https://api.github.com/repos/{$source['repo']}/{$type}{$source['query']}",
+                hooks: [[CurlHook::class, 'setupGithubToken']],
+                retries: self::getRetryAttempts()
+            ), true, 512, JSON_THROW_ON_ERROR);
+
+            $url = null;
+            $version = null;
+            foreach ($data as $rel) {
+                if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
+                    continue;
+                }
+                if (($rel['draft'] ?? false) === true && (($source['prefer-stable'] ?? false) || !$rel['tarball_url'])) {
+                    continue;
+                }
+                if (!($source['match'] ?? null)) {
+                    $url = $rel['tarball_url'] ?? null;
+                    $version = $rel['tag_name'] ?? $rel['name'] ?? null;
+                    break;
+                }
+                if (preg_match('|' . $source['match'] . '|', $rel['tarball_url'])) {
+                    $url = $rel['tarball_url'];
+                    $version = $rel['tag_name'] ?? $rel['name'] ?? null;
+                    break;
+                }
             }
-            if (preg_match('|' . $source['match'] . '|', $rel['tarball_url'])) {
-                $url = $rel['tarball_url'];
-                break;
+            if (!$url) {
+                throw new DownloaderException("failed to find {$name} source");
             }
         }
-        if (!$url) {
-            throw new DownloaderException("failed to find {$name} source");
-        }
         $headers = self::curlExec(
             url: $url,
             method: 'HEAD',
@@ -130,7 +153,7 @@ class Downloader
         if ($matches) {
             $filename = $matches['filename'];
         } else {
-            $filename = "{$name}-" . ($type === 'releases' ? $data['tag_name'] : $data['name']) . '.tar.gz';
+            $filename = "{$name}-" . ($version ?? 'latest') . '.tar.gz';
         }
 
         return [$url, $filename];

src/SPC/store/FileSystem.php

@@ -152,7 +152,7 @@ class FileSystem
         $src_path = FileSystem::convertPath($from);
         switch (PHP_OS_FAMILY) {
             case 'Windows':
-                f_passthru('xcopy "' . $src_path . '" "' . $dst_path . '" /s/e/v/y/i');
+                f_passthru('xcopy "' . $src_path . '" "' . $dst_path . '" /s/e/y/i');
                 break;
             case 'Linux':
             case 'Darwin':
@@ -174,6 +174,9 @@ class FileSystem
         logger()->debug("Copying file from {$from} to {$to}");
         $dst_path = FileSystem::convertPath($to);
         $src_path = FileSystem::convertPath($from);
+        if ($src_path === $dst_path) {
+            return;
+        }
         if (!copy($src_path, $dst_path)) {
             throw new FileSystemException('Cannot copy file from ' . $src_path . ' to ' . $dst_path);
         }
@@ -405,13 +408,13 @@ class FileSystem
                 continue;
             }
             $sub_file = self::convertPath($dir . '/' . $v);
-            if (is_dir($sub_file)) {
-                # 如果是 目录 且 递推 , 则递推添加下级文件
-                if (!self::removeDir($sub_file)) {
+            if (is_link($sub_file) || is_file($sub_file)) {
+                if (!unlink($sub_file)) {
                     return false;
                 }
-            } elseif (is_link($sub_file) || is_file($sub_file)) {
-                if (!unlink($sub_file)) {
+            } elseif (is_dir($sub_file)) {
+                # 如果是 目录 且 递推 , 则递推添加下级文件
+                if (!self::removeDir($sub_file)) {
                     return false;
                 }
             }
@@ -569,6 +572,44 @@ class FileSystem
         return file_put_contents($file, implode('', $lines));
     }
 
+    /**
+     * Move file or directory, handling cross-device scenarios
+     * Uses rename() if possible, falls back to copy+delete for cross-device moves
+     *
+     * @param string $source Source path
+     * @param string $dest   Destination path
+     */
+    public static function moveFileOrDir(string $source, string $dest): void
+    {
+        $source = self::convertPath($source);
+        $dest = self::convertPath($dest);
+
+        // Check if source and dest are on the same device to avoid cross-device rename errors
+        $source_stat = @stat($source);
+        $dest_parent = dirname($dest);
+        $dest_stat = @stat($dest_parent);
+
+        // Only use rename if on same device
+        if ($source_stat !== false && $dest_stat !== false && $source_stat['dev'] === $dest_stat['dev']) {
+            if (@rename($source, $dest)) {
+                return;
+            }
+        }
+
+        // Fall back to copy + delete for cross-device moves or if rename failed
+        if (is_dir($source)) {
+            self::copyDir($source, $dest);
+            self::removeDir($source);
+        } else {
+            if (!copy($source, $dest)) {
+                throw new FileSystemException("Failed to copy file from {$source} to {$dest}");
+            }
+            if (!unlink($source)) {
+                throw new FileSystemException("Failed to remove source file: {$source}");
+            }
+        }
+    }
+
     private static function extractArchive(string $filename, string $target): void
     {
         // Create base dir
@@ -645,36 +686,6 @@ class FileSystem
         };
     }
 
-    /**
-     * Move file or directory, handling cross-device scenarios
-     * Uses rename() if possible, falls back to copy+delete for cross-device moves
-     *
-     * @param string $source Source path
-     * @param string $dest   Destination path
-     */
-    private static function moveFileOrDir(string $source, string $dest): void
-    {
-        $source = self::convertPath($source);
-        $dest = self::convertPath($dest);
-
-        // Try rename first (fast, atomic)
-        if (@rename($source, $dest)) {
-            return;
-        }
-
-        if (is_dir($source)) {
-            self::copyDir($source, $dest);
-            self::removeDir($source);
-        } else {
-            if (!copy($source, $dest)) {
-                throw new FileSystemException("Failed to copy file from {$source} to {$dest}");
-            }
-            if (!unlink($source)) {
-                throw new FileSystemException("Failed to remove source file: {$source}");
-            }
-        }
-    }
-
     /**
      * Unzip file with stripping top-level directory
      */

src/SPC/store/SourcePatcher.php

@@ -22,9 +22,10 @@ class SourcePatcher
         FileSystem::addSourceExtractHook('swoole', [__CLASS__, 'patchSwoole']);
         FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchPhpLibxml212']);
         FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchGDWin32']);
-        FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchFfiCentos7FixO3strncmp']);
+        // FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchFfiCentos7FixO3strncmp']);
         FileSystem::addSourceExtractHook('sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
         FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
+        FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVPhp85']);
         FileSystem::addSourceExtractHook('yaml', [__CLASS__, 'patchYamlWin32']);
         FileSystem::addSourceExtractHook('libyaml', [__CLASS__, 'patchLibYaml']);
         FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchImapLicense']);
@@ -94,6 +95,10 @@ class SourcePatcher
         // patch php-src/build/php.m4 PKG_CHECK_MODULES -> PKG_CHECK_MODULES_STATIC
         FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/build/php.m4', 'PKG_CHECK_MODULES(', 'PKG_CHECK_MODULES_STATIC(');
 
+        if ($builder->getPHPVersionID() >= 80300 && $builder->getPHPVersionID() < 80400) {
+            self::patchFile('spc_fix_avx512_cache_before_80400.patch', SOURCE_PATH . '/php-src');
+        }
+
         if ($builder->getOption('enable-micro-win32')) {
             self::patchMicroWin32();
         } else {
@@ -124,6 +129,15 @@ class SourcePatcher
             FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/configure', '/have_capstone="yes"/', 'have_capstone="no"');
         }
 
+        // PHP 8.2 and below: bcmath libbcmath uses K&R style C function
+        if (is_unix() && $builder->getPHPVersionID() < 80300) {
+            FileSystem::replaceFileStr(
+                SOURCE_PATH . '/php-src/configure',
+                "for ac_arg in '' -std=gnu23",
+                "for ac_arg in '' -std=gnu17",
+            );
+        }
+
         if (file_exists(SOURCE_PATH . '/php-src/configure.ac.bak')) {
             // restore configure.ac
             FileSystem::restoreBackupFile(SOURCE_PATH . '/php-src/configure.ac');
@@ -432,6 +446,23 @@ class SourcePatcher
         return false;
     }
 
+    /**
+     * Fix the compilation issue of pdo_sqlsrv with php 8.5
+     */
+    public static function patchSQLSRVPhp85(): bool
+    {
+        $source_dir = SOURCE_PATH . '/php-src/ext/pdo_sqlsrv';
+        if (!file_exists($source_dir . '/config.m4') && is_dir($source_dir . '/source/pdo_sqlsrv')) {
+            FileSystem::moveFileOrDir($source_dir . '/LICENSE', $source_dir . '/source/pdo_sqlsrv/LICENSE');
+            FileSystem::moveFileOrDir($source_dir . '/source/shared', $source_dir . '/source/pdo_sqlsrv/shared');
+            FileSystem::moveFileOrDir($source_dir . '/source/pdo_sqlsrv', SOURCE_PATH . '/pdo_sqlsrv');
+            FileSystem::removeDir($source_dir);
+            FileSystem::moveFileOrDir(SOURCE_PATH . '/pdo_sqlsrv', $source_dir);
+            return true;
+        }
+        return false;
+    }
+
     public static function patchYamlWin32(): bool
     {
         FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/yaml/config.w32', "lib.substr(lib.length - 6, 6) == '_a.lib'", "lib.substr(lib.length - 6, 6) == '_a.lib' || 'yes' == 'yes'");
@@ -616,7 +647,13 @@ class SourcePatcher
                 FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/gd/libgd/gdft.c', '#ifndef MSWIN32', '#ifndef _WIN32');
             }
             // custom config.w32, because official config.w32 is hard-coded many things
-            $origin = $ver_id >= 80100 ? file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32') : file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
+            if ($ver_id >= 80500) {
+                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_85.w32');
+            } elseif ($ver_id >= 80100) {
+                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32');
+            } else {
+                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
+            }
             file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32.bak', file_get_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32'));
             return file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32', $origin) !== false;
         }

src/SPC/store/pkg/GoXcaddy.php

@@ -30,8 +30,8 @@ class GoXcaddy extends CustomPackage
     public function fetch(string $name, bool $force = false, ?array $config = null): void
     {
         $pkgroot = PKG_ROOT_PATH;
-        $go_exec = "{$pkgroot}/{$name}/bin/go";
-        $xcaddy_exec = "{$pkgroot}/{$name}/bin/xcaddy";
+        $go_exec = "{$pkgroot}/go-xcaddy/bin/go";
+        $xcaddy_exec = "{$pkgroot}/go-xcaddy/bin/xcaddy";
         if ($force) {
             FileSystem::removeDir("{$pkgroot}/{$name}");
         }
@@ -48,10 +48,10 @@ class GoXcaddy extends CustomPackage
             'macos' => 'darwin',
             default => throw new \InvalidArgumentException('Unsupported OS: ' . $name),
         };
-        $go_version = '1.25.0';
+        [$go_version] = explode("\n", Downloader::curlExec('https://go.dev/VERSION?m=text'));
         $config = [
             'type' => 'url',
-            'url' => "https://go.dev/dl/go{$go_version}.{$os}-{$arch}.tar.gz",
+            'url' => "https://go.dev/dl/{$go_version}.{$os}-{$arch}.tar.gz",
         ];
         Downloader::downloadPackage($name, $config, $force);
     }
@@ -85,7 +85,7 @@ class GoXcaddy extends CustomPackage
                 'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
                 'GOPATH' => "{$pkgroot}/go",
             ])
-            ->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
+            ->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master');
     }
 
     public static function getEnvironment(): array

src/SPC/store/pkg/Zig.php

@@ -72,8 +72,11 @@ class Zig extends CustomPackage
 
         $latest_version = null;
         foreach ($index_json as $version => $data) {
-            $latest_version = $version;
-            break;
+            // Skip the master branch, get the latest stable release
+            if ($version !== 'master') {
+                $latest_version = $version;
+                break;
+            }
         }
 
         if (!$latest_version) {

src/SPC/store/source/PhpSource.php

@@ -6,18 +6,22 @@ namespace SPC\store\source;
 
 use JetBrains\PhpStorm\ArrayShape;
 use SPC\exception\DownloaderException;
+use SPC\exception\SPCException;
 use SPC\store\Downloader;
 
 class PhpSource extends CustomSourceBase
 {
-    public const NAME = 'php-src';
+    public const string NAME = 'php-src';
+
+    public const array WEB_PHP_DOMAINS = [
+        'https://www.php.net',
+        'https://phpmirror.static-php.dev',
+    ];
 
     public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_DOWNLOAD_SOURCE): void
     {
-        $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
-        if ($major === '8.5') {
-            Downloader::downloadSource('php-src', ['type' => 'url', 'url' => 'https://downloads.php.net/~daniels/php-8.5.0RC3.tar.xz'], $force);
-        } elseif ($major === 'git') {
+        $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.5';
+        if ($major === 'git') {
             Downloader::downloadSource('php-src', ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
         } else {
             Downloader::downloadSource('php-src', $this->getLatestPHPInfo($major), $force);
@@ -30,21 +34,26 @@ class PhpSource extends CustomSourceBase
     #[ArrayShape(['type' => 'string', 'path' => 'string', 'rev' => 'string', 'url' => 'string'])]
     public function getLatestPHPInfo(string $major_version): array
     {
-        // 查找最新的小版本号
-        $info = json_decode(Downloader::curlExec(
-            url: "https://www.php.net/releases/index.php?json&version={$major_version}",
-            retries: (int) getenv('SPC_DOWNLOAD_RETRIES') ?: 0
-        ), true);
-        if (!isset($info['version'])) {
-            throw new DownloaderException("Version {$major_version} not found.");
+        foreach (self::WEB_PHP_DOMAINS as $domain) {
+            try {
+                $info = json_decode(Downloader::curlExec(
+                    url: "{$domain}/releases/index.php?json&version={$major_version}",
+                    retries: (int) getenv('SPC_DOWNLOAD_RETRIES') ?: 0
+                ), true);
+                if (!isset($info['version'])) {
+                    throw new DownloaderException("Version {$major_version} not found.");
+                }
+                $version = $info['version'];
+                return [
+                    'type' => 'url',
+                    'url' => "{$domain}/distributions/php-{$version}.tar.xz",
+                ];
+            } catch (SPCException) {
+                logger()->warning('Failed to fetch latest PHP version for major version {$major_version} from {$domain}, trying next mirror if available.');
+                continue;
+            }
         }
-
-        $version = $info['version'];
-
-        // 从官网直接下载
-        return [
-            'type' => 'url',
-            'url' => "https://www.php.net/distributions/php-{$version}.tar.xz",
-        ];
+        // exception if all mirrors failed
+        throw new DownloaderException("Failed to fetch latest PHP version for major version {$major_version} from all tried mirrors.");
     }
 }

src/SPC/toolchain/ZigToolchain.php

@@ -67,7 +67,8 @@ class ZigToolchain implements ToolchainInterface
         $cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
         $has_avx512 = str_contains($cflags, '-mavx512') || str_contains($cflags, '-march=x86-64-v4');
         if (!$has_avx512) {
-            GlobalEnvManager::putenv('SPC_EXTRA_PHP_VARS=php_cv_have_avx512=no php_cv_have_avx512vbmi=no');
+            $extra_vars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
+            GlobalEnvManager::putenv("SPC_EXTRA_PHP_VARS=php_cv_have_avx512=no php_cv_have_avx512vbmi=no {$extra_vars}");
         }
     }
 

src/SPC/util/ConfigValidator.php

@@ -393,7 +393,7 @@ class ConfigValidator
         }
         // check php-version
         if (isset($craft['php-version'])) {
-            // validdate version, accept 8.x, 7.x, 8.x.x, 7.x.x, 8, 7
+            // validate version, accept 8.x, 7.x, 8.x.x, 7.x.x, 8, 7
             $version = strval($craft['php-version']);
             if (!preg_match('/^(\d+)(\.\d+)?(\.\d+)?$/', $version, $matches)) {
                 throw new ValidationException('Craft file php-version is invalid');