Add google analytics for docs

2026-07-03 06:45:39 +08:00 · 2025-11-04 09:45:25 +08:00
69 changed files with 734 additions and 2214 deletions
--- a/bin/spc-alpine-docker
+++ b/bin/spc-alpine-docker
@@ -162,47 +162,6 @@ 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
@@ -224,5 +183,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 "${NEW_ARGS[@]}"
+    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc $@
 fi
--- a/bin/spc-gnu-docker
+++ b/bin/spc-gnu-docker
@@ -174,47 +174,6 @@ 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
@@ -237,5 +196,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 "${NEW_ARGS[@]}"
+    $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 $@
 fi
--- a/composer.lock
+++ b/composer.lock
--- a/config/env.ini
+++ b/config/env.ini
@@ -1,41 +1,40 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; 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 should only be defined before static-php-cli running.
+; Please note that these vars cannot be defined in this file, they are only be defined before static-php-cli running.
 ;
-; Here's a list of env vars, these variables will be defined if not defined:
+; Here's a list of env vars, these value cannot be changed anywhere:
 ;
+;   SPC_VERSION:        the version of static-php-cli.
+;   WORKING_DIR:        the working directory of the build process. (default: `$(pwd)`)
+;   ROOT_DIR:           the root directory of static-php-cli. (default: `/path/to/static-php-cli`, when running in phar or micro mode: `phar://path/to/spc.phar`)
 ;   BUILD_ROOT_PATH:    the root path of the build process. (default: `$(pwd)/buildroot`)
 ;   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`)
-;   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}`)
+;   PKG_ROOT_PATH:      the root path of the package files. (default: `$(pwd)/pkgroot`)
 ;   SOURCE_PATH:        the path of the source files. (default: `$(pwd)/source`)
 ;   DOWNLOAD_PATH:      the path of the download files. (default: `$(pwd)/downloads`)
-;   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.
+;   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`)
 ;
-; 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 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.
 ;
-;   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.
+;   * 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.

 [global]
 ; Build concurrency for make -jN, default is CPU_COUNT, this value are used in every libs.
@@ -45,7 +44,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/mercure/caddy --with github.com/dunglas/vulcain/caddy --with github.com/dunglas/caddy-cbrotli"
+SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES="--with github.com/dunglas/frankenphp/caddy --with github.com/dunglas/mercure/caddy --with github.com/dunglas/vulcain/caddy --with github.com/dunglas/caddy-cbrotli"
 ; The display message for php version output (PHP >= 8.4 available)
 PHP_BUILD_PROVIDER="static-php-cli ${SPC_VERSION}"

@@ -110,7 +109,9 @@ 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"
-; EXTRA_CFLAGS for `configure` and `make` php
+; CFLAGS for configuring php
+SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -fPIE"
+; EXTRA_CFLAGS for `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=""
@@ -140,8 +141,10 @@ 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"
-; 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}"
+; 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}"

 [freebsd]
 ; compiler environments
--- a/config/ext.json
+++ b/config/ext.json
@@ -232,13 +232,11 @@
            "BSD": "wip"
        },
        "type": "external",
-        "source": "ext-grpc",
+        "source": "grpc",
        "arg-type-unix": "enable-path",
        "cpp-extension": true,
        "lib-depends": [
-            "zlib",
-            "openssl",
-            "libcares"
+            "grpc"
        ]
    },
    "iconv": {
@@ -360,18 +358,6 @@
            "liblz4"
        ]
    },
-    "maxminddb": {
-        "support": {
-            "BSD": "wip",
-            "Windows": "wip"
-        },
-        "type": "external",
-        "source": "ext-maxminddb",
-        "arg-type": "with",
-        "lib-depends": [
-            "libmaxminddb"
-        ]
-    },
    "mbregex": {
        "type": "builtin",
        "arg-type": "custom",
@@ -489,36 +475,6 @@
            "zlib"
        ]
    },
-    "mysqlnd_ed25519": {
-        "type": "external",
-        "source": "mysqlnd_ed25519",
-        "arg-type": "enable",
-        "target": [
-            "shared"
-        ],
-        "ext-depends": [
-            "mysqlnd"
-        ],
-        "lib-depends": [
-            "libsodium",
-            "openssl"
-        ]
-    },
-    "mysqlnd_parsec": {
-        "type": "external",
-        "source": "mysqlnd_parsec",
-        "arg-type": "enable",
-        "target": [
-            "shared"
-        ],
-        "ext-depends": [
-            "mysqlnd"
-        ],
-        "lib-depends": [
-            "libsodium",
-            "openssl"
-        ]
-    },
    "oci8": {
        "type": "wip",
        "support": {
@@ -599,13 +555,6 @@
        "type": "builtin",
        "unix-only": true
    },
-    "pcov": {
-        "type": "external",
-        "source": "pcov",
-        "target": [
-            "shared"
-        ]
-    },
    "pdo": {
        "type": "builtin"
    },
--- a/config/lib.json
+++ b/config/lib.json
@@ -7,14 +7,12 @@
        "source": "php-src",
        "lib-depends": [
            "lib-base",
-            "micro",
-            "frankenphp"
+            "micro"
        ],
        "lib-depends-macos": [
            "lib-base",
            "micro",
-            "libxml2",
-            "frankenphp"
+            "libxml2"
        ],
        "lib-suggests-linux": [
            "libacl",
@@ -26,10 +24,6 @@
            "watcher"
        ]
    },
-    "frankenphp": {
-        "source": "frankenphp",
-        "type": "target"
-    },
    "micro": {
        "type": "target",
        "source": "micro"
@@ -104,9 +98,7 @@
            "ngtcp2",
            "zstd",
            "libcares",
-            "ldap",
-            "idn2",
-            "krb5"
+            "ldap"
        ],
        "lib-suggests-windows": [
            "brotli",
@@ -236,24 +228,6 @@
            "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,
@@ -301,26 +275,6 @@
            "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": [
@@ -506,16 +460,6 @@
            "liblz4.a"
        ]
    },
-    "libmaxminddb": {
-        "source": "libmaxminddb",
-        "static-libs-unix": [
-            "libmaxminddb.a"
-        ],
-        "headers": [
-            "maxminddb.h",
-            "maxminddb_config.h"
-        ]
-    },
    "libmemcached": {
        "source": "libmemcached",
        "cpp-library": true,
@@ -562,16 +506,13 @@
    },
    "librdkafka": {
        "source": "librdkafka",
-        "pkg-configs": [
-            "rdkafka++-static",
-            "rdkafka-static"
+        "static-libs-unix": [
+            "librdkafka.a",
+            "librdkafka++.a",
+            "librdkafka-static.a"
        ],
        "cpp-library": true,
        "lib-suggests": [
-            "curl",
-            "liblz4",
-            "openssl",
-            "zlib",
            "zstd"
        ]
    },
@@ -618,16 +559,6 @@
            "zstd"
        ]
    },
-    "libunistring": {
-        "source": "libunistring",
-        "static-libs-unix": [
-            "libunistring.a"
-        ],
-        "headers": [
-            "unistr.h",
-            "unistring/"
-        ]
-    },
    "liburing": {
        "source": "liburing",
        "pkg-configs": [
--- a/config/source.json
+++ b/config/source.json
@@ -11,6 +11,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/amqp",
        "path": "php-src/ext/amqp",
+        "filename": "amqp.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -20,6 +21,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/APCu",
        "path": "php-src/ext/apcu",
+        "filename": "apcu.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -29,6 +31,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/ast",
        "path": "php-src/ext/ast",
+        "filename": "ast.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -85,6 +88,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/dio",
        "path": "php-src/ext/dio",
+        "filename": "dio.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -94,6 +98,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/ev",
        "path": "php-src/ext/ev",
+        "filename": "ev.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -113,6 +118,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/ds",
        "path": "php-src/ext/ds",
+        "filename": "ds.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -145,21 +151,11 @@
            "path": "LICENSE"
        }
    },
-    "ext-grpc": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/grpc",
-        "path": "php-src/ext/grpc",
-        "license": {
-            "type": "file",
-            "path": [
-                "LICENSE"
-            ]
-        }
-    },
    "ext-imagick": {
        "type": "url",
        "url": "https://pecl.php.net/get/imagick",
        "path": "php-src/ext/imagick",
+        "filename": "imagick.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -169,6 +165,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/imap",
        "path": "php-src/ext/imap",
+        "filename": "imap.tgz",
        "license": {
            "type": "file",
            "path": [
@@ -187,18 +184,11 @@
            ]
        }
    },
-    "ext-maxminddb": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/maxminddb",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
    "ext-memcache": {
        "type": "url",
        "url": "https://pecl.php.net/get/memcache",
        "path": "php-src/ext/memcache",
+        "filename": "memcache.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -217,6 +207,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/simdjson",
        "path": "php-src/ext/simdjson",
+        "filename": "simdjson.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -236,6 +227,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/ssh2",
        "path": "php-src/ext/ssh2",
+        "filename": "ssh2.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -245,6 +237,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/trader",
        "path": "php-src/ext/trader",
+        "filename": "trader.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -254,6 +247,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/uuid",
        "path": "php-src/ext/uuid",
+        "filename": "uuid.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -263,6 +257,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/uv",
        "path": "php-src/ext/uv",
+        "filename": "uv.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -281,6 +276,7 @@
    "ext-zip": {
        "type": "url",
        "url": "https://pecl.php.net/get/zip",
+        "filename": "ext-zip.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -305,19 +301,10 @@
            "path": "LICENSE.MIT"
        }
    },
-    "frankenphp": {
-        "type": "ghtar",
-        "repo": "php/frankenphp",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
    "freetype": {
-        "type": "ghtagtar",
-        "repo": "freetype/freetype",
-        "match": "VER-2-\\d+-\\d+",
+        "type": "git",
+        "rev": "VER-2-13-2",
+        "url": "https://github.com/freetype/freetype",
        "license": {
            "type": "file",
            "path": "LICENSE.TXT"
@@ -388,6 +375,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/igbinary",
        "path": "php-src/ext/igbinary",
+        "filename": "igbinary.tgz",
        "license": {
            "type": "file",
            "path": "COPYING"
@@ -414,6 +402,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/inotify",
        "path": "php-src/ext/inotify",
+        "filename": "inotify.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -432,16 +421,6 @@
            "path": "COPYING"
        }
    },
-    "krb5": {
-        "type": "ghtagtar",
-        "repo": "krb5/krb5",
-        "match": "krb5.+-final",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "NOTICE"
-        }
-    },
    "ldap": {
        "type": "filelist",
        "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/",
@@ -600,15 +579,6 @@
            "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",
@@ -643,16 +613,6 @@
            "path": "LICENSE"
        }
    },
-    "libmaxminddb": {
-        "type": "ghrel",
-        "repo": "maxmind/libmaxminddb",
-        "match": "libmaxminddb-.+\\.tar\\.gz",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
    "libmemcached": {
        "type": "ghtagtar",
        "repo": "awesomized/libmemcached",
@@ -663,10 +623,9 @@
        }
    },
    "libpng": {
-        "type": "ghtagtar",
-        "repo": "pnggroup/libpng",
-        "match": "v1\\.6\\.\\d+",
-        "query": "?per_page=150",
+        "type": "git",
+        "url": "https://github.com/glennrp/libpng.git",
+        "rev": "libpng16",
        "provide-pre-built": true,
        "license": {
            "type": "file",
@@ -674,9 +633,9 @@
        }
    },
    "librabbitmq": {
-        "type": "ghtar",
-        "repo": "alanxz/rabbitmq-c",
-        "prefer-stable": true,
+        "type": "git",
+        "url": "https://github.com/alanxz/rabbitmq-c.git",
+        "rev": "master",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -721,16 +680,6 @@
            "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",
@@ -744,7 +693,6 @@
        "type": "git",
        "url": "https://github.com/static-php/libuuid.git",
        "rev": "master",
-        "provide-pre-built": true,
        "license": {
            "type": "file",
            "path": "COPYING"
@@ -765,9 +713,8 @@
        ]
    },
    "libwebp": {
-        "type": "ghtagtar",
-        "repo": "webmproject/libwebp",
-        "match": "v1\\.\\d+\\.\\d+$",
+        "type": "url",
+        "url": "https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.2.tar.gz",
        "provide-pre-built": true,
        "license": {
            "type": "file",
@@ -775,10 +722,8 @@
        }
    },
    "libxml2": {
-        "type": "ghtagtar",
-        "repo": "GNOME/libxml2",
-        "match": "v2\\.\\d+\\.\\d+$",
-        "provide-pre-built": false,
+        "type": "url",
+        "url": "https://github.com/GNOME/libxml2/archive/refs/tags/v2.12.5.tar.gz",
        "license": {
            "type": "file",
            "path": "Copyright"
@@ -818,6 +763,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/memcached",
        "path": "php-src/ext/memcached",
+        "filename": "memcached.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -858,24 +804,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/msgpack",
        "path": "php-src/ext/msgpack",
-        "license": {
-            "type": "file",
-            "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",
+        "filename": "msgpack.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -960,6 +889,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/opentelemetry",
        "path": "php-src/ext/opentelemetry",
+        "filename": "opentelemetry.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -969,14 +899,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/parallel",
        "path": "php-src/ext/parallel",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "pcov": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/pcov",
+        "filename": "parallel.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -986,6 +909,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/pdo_sqlsrv",
        "path": "php-src/ext/pdo_sqlsrv",
+        "filename": "pdo_sqlsrv.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -1021,6 +945,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/protobuf",
        "path": "php-src/ext/protobuf",
+        "filename": "protobuf.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -1082,6 +1007,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/redis",
        "path": "php-src/ext/redis",
+        "filename": "redis.tgz",
        "license": {
            "type": "file",
            "path": [
@@ -1121,6 +1047,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/sqlsrv",
        "path": "php-src/ext/sqlsrv",
+        "filename": "sqlsrv.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -1175,8 +1102,9 @@
        }
    },
    "xdebug": {
-        "type": "pie",
-        "repo": "xdebug/xdebug",
+        "type": "url",
+        "url": "https://pecl.php.net/get/xdebug",
+        "filename": "xdebug.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -1186,6 +1114,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/xhprof",
        "path": "php-src/ext/xhprof-src",
+        "filename": "xhprof.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -1195,6 +1124,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/xlswriter",
        "path": "php-src/ext/xlswriter",
+        "filename": "xlswriter.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -1215,6 +1145,7 @@
        "type": "url",
        "url": "https://pecl.php.net/get/yac",
        "path": "php-src/ext/yac",
+        "filename": "yac.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
--- a/docs/.vitepress/config.ts
+++ b/docs/.vitepress/config.ts
@@ -1,5 +1,6 @@
 import sidebarEn from "./sidebar.en";
 import sidebarZh from "./sidebar.zh";
+import sidebarJa from "./sidebar.ja";


 // https://vitepress.dev/reference/site-config
@@ -61,5 +62,19 @@ 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');`
+    ]
+  ]
 }
--- a/docs/public/favicon.ico
+++ b/docs/public/favicon.ico
--- a/src/SPC/ConsoleApplication.php
+++ b/src/SPC/ConsoleApplication.php
@@ -34,7 +34,7 @@ use Symfony\Component\Console\Application;
 */
 final class ConsoleApplication extends Application
 {
-    public const string VERSION = '2.7.11';
+    public const string VERSION = '2.7.6';

    public function __construct()
    {
--- a/src/SPC/builder/BuilderBase.php
+++ b/src/SPC/builder/BuilderBase.php
@@ -160,7 +160,7 @@ abstract class BuilderBase
        }
        if (!$skip_extract) {
            $this->emitPatchPoint('before-php-extract');
-            SourceManager::initSource(sources: [$this->getPhpSrcName()], source_only: true);
+            SourceManager::initSource(sources: ['php-src'], source_only: true);
            $this->emitPatchPoint('after-php-extract');
            if ($this->getPHPVersionID() >= 80000) {
                $this->emitPatchPoint('before-micro-extract');
@@ -319,7 +319,7 @@ abstract class BuilderBase
    public function getPHPVersionFromArchive(?string $file = null): false|string
    {
        if ($file === null) {
-            $lock = LockFile::get($this->getPhpSrcName());
+            $lock = LockFile::get('php-src');
            if ($lock === null) {
                return false;
            }
@@ -498,14 +498,6 @@ abstract class BuilderBase
        }
    }

-    /**
-     * Get the php-src name to use for lock file lookups (supports version-specific names like php-src-8.2)
-     */
-    protected function getPhpSrcName(): string
-    {
-        return getenv('SPC_PHP_SRC_NAME') ?: 'php-src';
-    }
-
    /**
     * Generate micro extension test php code.
     */
--- a/src/SPC/builder/Extension.php
+++ b/src/SPC/builder/Extension.php
@@ -4,7 +4,6 @@ declare(strict_types=1);

 namespace SPC\builder;

-use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\EnvironmentException;
 use SPC\exception\SPCException;
 use SPC\exception\ValidationException;
@@ -221,7 +220,7 @@ class Extension
     */
    public function patchBeforeSharedMake(): bool
    {
-        $config = (new SPCConfigUtil($this->builder))->getExtensionConfig($this);
+        $config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs()));
        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
        $lstdcpp = str_contains($sharedLibs, '-l:libstdc++.a') ? '-l:libstdc++.a' : null;
        $lstdcpp ??= str_contains($sharedLibs, '-lstdc++') ? '-lstdc++' : '';
@@ -385,9 +384,6 @@ 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) {
@@ -452,15 +448,6 @@ class Extension
            ->exec('make clean')
            ->exec('make -j' . $this->builder->concurrency)
            ->exec('make install');
-
-        // process *.so file
-        $soFile = BUILD_MODULES_PATH . '/' . $this->getName() . '.so';
-        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, $soFile, false);
    }

    /**
@@ -499,46 +486,18 @@ 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))->getExtensionConfig($this);
+        $config = (new SPCConfigUtil($this->builder))->config(
+            [$this->getName()],
+            array_map(fn ($l) => $l->getName(), $this->getLibraryDependencies(recursive: true)),
+            $this->builder->getOption('with-suggested-exts'),
+            $this->builder->getOption('with-suggested-libs'),
+        );
        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
        $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
        $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
@@ -560,7 +519,7 @@ class Extension
            }
            logger()->info("enabling {$this->name} without library {$name}");
        } else {
-            $this->dependencies[$name] = $depLib;
+            $this->dependencies[] = $depLib;
        }
    }

@@ -573,7 +532,7 @@ class Extension
            }
            logger()->info("enabling {$this->name} without extension {$name}");
        } else {
-            $this->dependencies[$name] = $depExt;
+            $this->dependencies[] = $depExt;
        }
    }

@@ -608,4 +567,37 @@ 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;
+    }
 }
--- a/src/SPC/builder/LibraryBase.php
+++ b/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,19 +346,19 @@ 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/{$source}/{$index}.txt", $license['text']);
+                FileSystem::writeFile(BUILD_ROOT_PATH . '/source-licenses/' . $this->getName() . "/{$index}.txt", $license['text']);
                continue;
            }
            if ($license['type'] === 'file') {
-                copy($this->source_dir . '/' . $license['path'], BUILD_ROOT_PATH . "/source-licenses/{$source}/{$index}.txt");
+                copy($this->source_dir . '/' . $license['path'], BUILD_ROOT_PATH . '/source-licenses/' . $this->getName() . "/{$index}.txt");
            }
        }
    }
@@ -375,17 +375,8 @@ 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) {
-            $found = false;
-            foreach ($search_paths as $path) {
-                if (file_exists($path . "/{$name}.pc")) {
-                    $found = true;
-                    break;
-                }
-            }
-            if (!$found) {
+            if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$name}.pc")) {
                return false;
            }
        }
--- a/src/SPC/builder/extension/grpc.php
+++ b/src/SPC/builder/extension/grpc.php
@@ -21,14 +21,18 @@ class grpc extends Extension
        if ($this->builder instanceof WindowsBuilder) {
            throw new ValidationException('grpc extension does not support windows yet');
        }
-        FileSystem::replaceFileStr(
-            $this->source_dir . '/src/php/ext/grpc/call.c',
-            'zend_exception_get_default(TSRMLS_C),',
-            'zend_ce_exception,',
-        );
+        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(
-                $this->source_dir . '/config.m4',
+                SOURCE_PATH . '/php-src/ext/grpc/config.m4',
                '/GRPC_LIBDIR=.*$/m',
                'GRPC_LIBDIR=' . BUILD_LIB_PATH . "\n" . 'LDFLAGS="$LDFLAGS -framework CoreFoundation"'
            );
@@ -39,7 +43,7 @@ class grpc extends Extension
    public function patchBeforeConfigure(): bool
    {
        $util = new SPCConfigUtil($this->builder, ['libs_only_deps' => true]);
-        $config = $util->getExtensionConfig($this);
+        $config = $util->config(['grpc']);
        $libs = $config['libs'];
        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/configure', '-lgrpc', $libs);
        return true;
--- a/src/SPC/builder/extension/imagick.php
+++ b/src/SPC/builder/extension/imagick.php
@@ -5,8 +5,6 @@ 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')]
@@ -21,9 +19,7 @@ class imagick extends Extension
    protected function splitLibsIntoStaticAndShared(string $allLibs): array
    {
        [$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
-        if (ToolchainManager::getToolchainClass() !== ZigToolchain::class &&
-            (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset'))
-        ) {
+        if (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
            $static .= ' -l:libstdc++.a';
            $shared = str_replace('-lstdc++', '', $shared);
        }
--- a/src/SPC/builder/extension/maxminddb.php
+++ b/src/SPC/builder/extension/maxminddb.php
@@ -1,25 +0,0 @@
-<?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;
-    }
-}
--- a/src/SPC/builder/extension/memcache.php
+++ b/src/SPC/builder/extension/memcache.php
@@ -43,9 +43,4 @@ EOF
        );
        return true;
    }
-
-    protected function getExtraEnv(): array
-    {
-        return ['CFLAGS' => '-std=c17'];
-    }
 }
--- a/src/SPC/builder/extension/mongodb.php
+++ b/src/SPC/builder/extension/mongodb.php
@@ -24,9 +24,4 @@ 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'];
-    }
 }
--- a/src/SPC/builder/extension/mysqlnd_ed25519.php
+++ b/src/SPC/builder/extension/mysqlnd_ed25519.php
@@ -1,22 +0,0 @@
-<?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();
-    }
-}
--- a/src/SPC/builder/extension/mysqlnd_parsec.php
+++ b/src/SPC/builder/extension/mysqlnd_parsec.php
@@ -1,22 +0,0 @@
-<?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();
-    }
-}
--- a/src/SPC/builder/extension/pgsql.php
+++ b/src/SPC/builder/extension/pgsql.php
@@ -45,7 +45,7 @@ class pgsql extends Extension
    protected function getExtraEnv(): array
    {
        return [
-            'CFLAGS' => '-std=c17 -Wno-int-conversion',
+            'CFLAGS' => '-Wno-int-conversion',
        ];
    }
 }
--- a/src/SPC/builder/extension/rdkafka.php
+++ b/src/SPC/builder/extension/rdkafka.php
@@ -7,7 +7,6 @@ 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
@@ -16,7 +15,6 @@ 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;
    }

@@ -39,7 +37,8 @@ class rdkafka extends Extension

    public function getUnixConfigureArg(bool $shared = false): string
    {
-        $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']}\"";
+        $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 . '"';
    }
 }
--- a/src/SPC/builder/extension/swoole.php
+++ b/src/SPC/builder/extension/swoole.php
@@ -17,7 +17,6 @@ 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';
@@ -71,7 +70,7 @@ 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))->getLibraryConfig($this->builder->getLib('unixodbc'));
+            $config = (new SPCConfigUtil($this->builder, ['libs_only_deps' => true]))->config([], ['unixodbc']);
            $arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"';
        }

--- a/src/SPC/builder/extension/trader.php
+++ b/src/SPC/builder/extension/trader.php
@@ -1,19 +0,0 @@
-<?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;
-    }
-}
--- a/src/SPC/builder/freebsd/BSDBuilder.php
+++ b/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->deploySAPIBinary(BUILD_TARGET_CLI);
+        $this->deployBinary(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->deploySAPIBinary(BUILD_TARGET_MICRO);
+        $this->deployBinary(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->deploySAPIBinary(BUILD_TARGET_FPM);
+        $this->deployBinary(BUILD_TARGET_FPM);
    }

    /**
--- a/src/SPC/builder/linux/LinuxBuilder.php
+++ b/src/SPC/builder/linux/LinuxBuilder.php
@@ -8,7 +8,6 @@ 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\util\GlobalEnvManager;
@@ -91,7 +90,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_MAKE_EXTRA_CFLAGS'),
+            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_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!
@@ -195,7 +194,15 @@ class LinuxBuilder extends UnixBuilderBase
            SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src', true);
        }

-        $this->deploySAPIBinary(BUILD_TARGET_CLI);
+        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);
    }

    protected function buildCgi(): void
@@ -206,7 +213,15 @@ class LinuxBuilder extends UnixBuilderBase
            ->exec('sed -i "s|//lib|/lib|g" Makefile')
            ->exec("make {$concurrency} {$vars} cgi");

-        $this->deploySAPIBinary(BUILD_TARGET_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);
    }

    /**
@@ -217,33 +232,29 @@ class LinuxBuilder extends UnixBuilderBase
        if ($this->getPHPVersionID() < 80000) {
            throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
        }
-        try {
-            if ($this->getExt('phar')) {
-                $this->phar_patched = true;
-                SourcePatcher::patchMicroPhar($this->getPHPVersionID());
-            }
+        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");

-            // deploy micro.sfx
-            $dst = $this->deploySAPIBinary(BUILD_TARGET_MICRO);
+        $this->processMicroUPX();

-            // patch after UPX-ed micro.sfx
-            $this->processUpxedMicroSfx($dst);
-        } finally {
-            if ($this->phar_patched) {
-                SourcePatcher::unpatchMicroPhar();
-            }
+        $this->deployBinary(BUILD_TARGET_MICRO);
+
+        if ($this->phar_patched) {
+            SourcePatcher::unpatchMicroPhar();
        }
    }

@@ -258,7 +269,14 @@ class LinuxBuilder extends UnixBuilderBase
            ->exec('sed -i "s|//lib|/lib|g" Makefile')
            ->exec("make {$concurrency} {$vars} fpm");

-        $this->deploySAPIBinary(BUILD_TARGET_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);
    }

    /**
@@ -271,9 +289,6 @@ class LinuxBuilder extends UnixBuilderBase
            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')
@@ -281,54 +296,10 @@ 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");

-        // process libphp.so for shared embed
-        $libphpSo = BUILD_LIB_PATH . '/libphp.so';
-        if (file_exists($libphpSo)) {
-            // post actions: rename libphp.so to libphp-<release>.so if -release is set in LDFLAGS
-            $this->processLibphpSoFile($libphpSo);
-            // deploy libphp.so
-            $this->deployBinary($libphpSo, $libphpSo, false);
-        }
-
-        // 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');
-            // export dynamic symbols
-            SystemUtil::exportDynamicSymbols(BUILD_LIB_PATH . '/libphp.a');
-        }
-
-        // patch embed php scripts
-        $this->patchPhpScripts();
-    }
-
-    /**
-     * Return extra variables for php make command.
-     */
-    private function getMakeExtraVars(): array
-    {
-        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true, 'absolute_libs' => true]))->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
-        $static = SPCTarget::isStatic() ? '-all-static' : '';
-        $lib = BUILD_LIB_PATH;
-        return array_filter([
-            'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
-            'EXTRA_LIBS' => $config['libs'],
-            'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
-            'EXTRA_LDFLAGS_PROGRAM' => "-L{$lib} {$static} -pie",
-        ]);
-    }
-
-    private function processLibphpSoFile(string $libphpSo): void
-    {
        $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();

@@ -390,29 +361,60 @@ class LinuxBuilder extends UnixBuilderBase
                }
            }
        }
+
+        if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'static') {
+            $AR = getenv('AR') ?: 'ar';
+            f_passthru("{$AR} -t " . BUILD_LIB_PATH . "/libphp.a | grep '\\.a$' | xargs -n1 {$AR} d " . BUILD_LIB_PATH . '/libphp.a');
+            // export dynamic symbols
+            SystemUtil::exportDynamicSymbols(BUILD_LIB_PATH . '/libphp.a');
+        }
+
+        if (!$this->getOption('no-strip', false) && file_exists(BUILD_LIB_PATH . '/' . $realLibName)) {
+            shell()->cd(BUILD_LIB_PATH)->exec("strip --strip-unneeded {$realLibName}");
+        }
+        $this->patchPhpScripts();
    }

    /**
-     * 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
+     * Return extra variables for php make command.
     */
-    private function processUpxedMicroSfx(string $dst): void
+    private function getMakeExtraVars(): array
    {
-        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');
+        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true, 'absolute_libs' => true]))->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
+        $static = SPCTarget::isStatic() ? '-all-static' : '';
+        $lib = BUILD_LIB_PATH;
+        return array_filter([
+            'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
+            'EXTRA_LIBS' => $config['libs'],
+            'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
+            'EXTRA_LDFLAGS_PROGRAM' => "-L{$lib} {$static} -pie",
+        ]);
+    }
+
+    /**
+     * 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 :(
+     */
+    private function processMicroUPX(): 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));
            }
-            $offset = hexdec($offset);
-            // remove upx extra wastes
-            file_put_contents($dst, substr(file_get_contents($dst), 0, $offset));
        }
    }
 }
--- a/src/SPC/builder/linux/library/idn2.php
+++ b/src/SPC/builder/linux/library/idn2.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\linux\library;
-
-class idn2 extends LinuxLibraryBase
-{
-    use \SPC\builder\unix\library\idn2;
-
-    public const NAME = 'idn2';
-}
--- a/src/SPC/builder/linux/library/krb5.php
+++ b/src/SPC/builder/linux/library/krb5.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\linux\library;
-
-class krb5 extends LinuxLibraryBase
-{
-    use \SPC\builder\unix\library\krb5;
-
-    public const NAME = 'krb5';
-}
--- a/src/SPC/builder/linux/library/libmaxminddb.php
+++ b/src/SPC/builder/linux/library/libmaxminddb.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\linux\library;
-
-class libmaxminddb extends LinuxLibraryBase
-{
-    use \SPC\builder\unix\library\libmaxminddb;
-
-    public const NAME = 'libmaxminddb';
-}
--- a/src/SPC/builder/linux/library/libunistring.php
+++ b/src/SPC/builder/linux/library/libunistring.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\linux\library;
-
-class libunistring extends LinuxLibraryBase
-{
-    use \SPC\builder\unix\library\libunistring;
-
-    public const NAME = 'libunistring';
-}
--- a/src/SPC/builder/linux/library/liburing.php
+++ b/src/SPC/builder/linux/library/liburing.php
@@ -6,8 +6,6 @@ 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;

@@ -17,19 +15,26 @@ class liburing extends LinuxLibraryBase

    public function patchBeforeBuild(): bool
    {
-        if (SystemUtil::isMuslDist()) {
-            FileSystem::replaceFileStr($this->source_dir . '/configure', 'realpath -s', 'realpath');
-            return true;
+        if (!SystemUtil::isMuslDist()) {
+            return false;
        }
-        return false;
+        FileSystem::replaceFileStr($this->source_dir . '/configure', 'realpath -s', 'realpath');
+        return true;
    }

    protected function build(): void
    {
-        $use_libc = ToolchainManager::getToolchainClass() !== GccNativeToolchain::class || version_compare(SPCTarget::getLibcVersion(), '2.30', '>=');
+        $use_libc = SPCTarget::getLibc() !== 'glibc' || version_compare(SPCTarget::getLibcVersion(), '2.30', '>=');
        $make = UnixAutoconfExecutor::create($this);

-        if ($use_libc) {
+        if (!$use_libc) {
+            $make->appendEnv([
+                'CC' => 'gcc', // libc-less version fails to compile with clang or zig
+                'CXX' => 'g++',
+                'AR' => 'ar',
+                'LD' => 'ld',
+            ]);
+        } else {
            $make->appendEnv([
                'CFLAGS' => '-D_GNU_SOURCE',
            ]);
@@ -46,7 +51,7 @@ class liburing extends LinuxLibraryBase
                $use_libc ? '--use-libc' : '',
            )
            ->configure()
-            ->make('library ENABLE_SHARED=0', 'install ENABLE_SHARED=0', with_clean: false);
+            ->make('library', 'install ENABLE_SHARED=0', with_clean: false);

        $this->patchPkgconfPrefix();
    }
--- a/src/SPC/builder/linux/library/openssl.php
+++ b/src/SPC/builder/linux/library/openssl.php
@@ -62,7 +62,6 @@ class openssl extends LinuxLibraryBase
                "{$zlib_extra}" .
                'enable-pie ' .
                'no-legacy ' .
-                'no-tests ' .
                "linux-{$arch}"
            )
            ->exec('make clean')
--- a/src/SPC/builder/macos/MacOSBuilder.php
+++ b/src/SPC/builder/macos/MacOSBuilder.php
@@ -8,7 +8,6 @@ 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;
@@ -106,7 +105,7 @@ class MacOSBuilder extends UnixBuilderBase

        // prepare build php envs
        $envs_build_php = SystemUtil::makeEnvVarString([
-            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
+            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
            'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
            'LDFLAGS' => '-L' . BUILD_LIB_PATH,
        ]);
@@ -190,7 +189,10 @@ 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");
-        $this->deploySAPIBinary(BUILD_TARGET_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);
    }

    protected function buildCgi(): void
@@ -200,7 +202,10 @@ 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");
-        $this->deploySAPIBinary(BUILD_TARGET_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);
    }

    /**
@@ -211,30 +216,31 @@ 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());
+        }

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

-            // patch fake cli for micro
-            $vars['EXTRA_CFLAGS'] .= $enable_fake_cli;
-            $vars = SystemUtil::makeEnvVarString($vars);
+        $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');
+        }

-            $shell = shell()->cd(SOURCE_PATH . '/php-src');
-            // build
-            $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
-            $shell->exec("make {$concurrency} {$vars} micro");
+        $this->deployBinary(BUILD_TARGET_MICRO);

-            $this->deploySAPIBinary(BUILD_TARGET_MICRO);
-        } finally {
-            if ($this->phar_patched) {
-                SourcePatcher::unpatchMicroPhar();
-            }
+        if ($this->phar_patched) {
+            SourcePatcher::unpatchMicroPhar();
        }
    }

@@ -248,7 +254,10 @@ 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");
-        $this->deploySAPIBinary(BUILD_TARGET_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);
    }

    /**
@@ -263,25 +272,9 @@ 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');
--- a/src/SPC/builder/macos/library/idn2.php
+++ b/src/SPC/builder/macos/library/idn2.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\macos\library;
-
-class idn2 extends MacOSLibraryBase
-{
-    use \SPC\builder\unix\library\idn2;
-
-    public const NAME = 'idn2';
-}
--- a/src/SPC/builder/macos/library/krb5.php
+++ b/src/SPC/builder/macos/library/krb5.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\macos\library;
-
-class krb5 extends MacOSLibraryBase
-{
-    use \SPC\builder\unix\library\krb5;
-
-    public const NAME = 'krb5';
-}
--- a/src/SPC/builder/macos/library/libmaxminddb.php
+++ b/src/SPC/builder/macos/library/libmaxminddb.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\macos\library;
-
-class libmaxminddb extends MacOSLibraryBase
-{
-    use \SPC\builder\unix\library\libmaxminddb;
-
-    public const NAME = 'libmaxminddb';
-}
--- a/src/SPC/builder/macos/library/libunistring.php
+++ b/src/SPC/builder/macos/library/libunistring.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\macos\library;
-
-class libunistring extends MacOSLibraryBase
-{
-    use \SPC\builder\unix\library\libunistring;
-
-    public const NAME = 'libunistring';
-}
--- a/src/SPC/builder/traits/UnixLibraryTrait.php
+++ b/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_LIB_PATH . '/pkgconfig/' . $name);
+            $realpath = realpath(BUILD_ROOT_PATH . '/lib/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/ !');
            }
--- a/src/SPC/builder/unix/UnixBuilderBase.php
+++ b/src/SPC/builder/unix/UnixBuilderBase.php
@@ -5,7 +5,6 @@ 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;
@@ -14,7 +13,6 @@ 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;
@@ -80,91 +78,6 @@ 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.
     */
@@ -295,20 +208,23 @@ abstract class UnixBuilderBase extends BuilderBase
    }

    /**
-     * Deploy binaries that produces executable SAPI
+     * 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
     */
-    protected function deploySAPIBinary(int $type): string
+    protected function deployBinary(int $type): bool
    {
        $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}"),
        };
-        $dst = BUILD_BIN_PATH . '/' . basename($src);
-        return $this->deployBinary($src, $dst);
+        logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');
+        FileSystem::createDir(BUILD_BIN_PATH);
+        shell()->exec('cp ' . escapeshellarg($src) . ' ' . escapeshellarg(BUILD_BIN_PATH));
+        return true;
    }

    /**
@@ -349,75 +265,22 @@ 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) {
-            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');
-        $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}";
+        // 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;
+        }
        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);
        }
-
-        $frankenPhpVersion = $this->getFrankenPHPVersion();
+        [, $out] = shell()->execWithResult('go list -m github.com/dunglas/frankenphp@latest');
+        $frankenPhpVersion = str_replace('github.com/dunglas/frankenphp v', '', $out[0]);
        $libphpVersion = $this->getPHPVersion();
        $dynamic_exports = '';
        if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
@@ -427,6 +290,7 @@ 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 = '';
@@ -437,7 +301,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') . ' -DFRANKENPHP_VERSION=' . $frankenPhpVersion;
+        $cflags = "{$this->arch_c_flags} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS');
        $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') ||
@@ -451,7 +315,7 @@ 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 . ' ' .
+                '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' . $debugFlags .
                '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .
                "v{$frankenPhpVersion} PHP {$libphpVersion} Caddy'\\\" " .
                "-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
@@ -461,7 +325,13 @@ abstract class UnixBuilderBase extends BuilderBase
            ->setEnv($env)
            ->exec("xcaddy build --output frankenphp {$xcaddyModules}");

-        $this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP);
+        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');
+            }
+        }
    }

    /**
--- a/src/SPC/builder/unix/library/curl.php
+++ b/src/SPC/builder/unix/library/curl.php
@@ -23,8 +23,6 @@ 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',
--- a/src/SPC/builder/unix/library/gmp.php
+++ b/src/SPC/builder/unix/library/gmp.php
@@ -10,14 +10,7 @@ trait gmp
 {
    protected function build(): void
    {
-        UnixAutoconfExecutor::create($this)
-            ->appendEnv([
-                'CFLAGS' => '-std=c17',
-            ])
-            ->configure(
-                '--enable-fat'
-            )
-            ->make();
+        UnixAutoconfExecutor::create($this)->configure()->make();
        $this->patchPkgconfPrefix(['gmp.pc']);
    }
 }
--- a/src/SPC/builder/unix/library/idn2.php
+++ b/src/SPC/builder/unix/library/idn2.php
@@ -1,27 +0,0 @@
-<?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();
-    }
-}
--- a/src/SPC/builder/unix/library/krb5.php
+++ b/src/SPC/builder/unix/library/krb5.php
@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-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('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';
-        }
-        UnixAutoconfExecutor::create($this)
-            ->appendEnv($extraEnv)
-            ->optionalLib('ldap', '--with-ldap', '--without-ldap')
-            ->optionalLib('libedit', '--with-libedit', '--without-libedit')
-            ->configure(...$args)
-            ->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;
-    }
-}
--- a/src/SPC/builder/unix/library/libjxl.php
+++ b/src/SPC/builder/unix/library/libjxl.php
@@ -29,17 +29,13 @@ trait libjxl
            );

        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $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->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();
--- a/src/SPC/builder/unix/library/libmaxminddb.php
+++ b/src/SPC/builder/unix/library/libmaxminddb.php
@@ -1,20 +0,0 @@
-<?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();
-    }
-}
--- a/src/SPC/builder/unix/library/librdkafka.php
+++ b/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\UnixCMakeExecutor;
+use SPC\util\executor\UnixAutoconfExecutor;

 trait librdkafka
 {
@@ -26,18 +26,34 @@ trait librdkafka

    protected function build(): void
    {
-        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',
+        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'
            )
-            ->build();
+            ->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");
    }
 }
--- a/src/SPC/builder/unix/library/libunistring.php
+++ b/src/SPC/builder/unix/library/libunistring.php
@@ -1,18 +0,0 @@
-<?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();
-    }
-}
--- a/src/SPC/builder/unix/library/libwebp.php
+++ b/src/SPC/builder/unix/library/libwebp.php
@@ -10,26 +10,8 @@ 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=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' : ''
-            )
+            ->addConfigureArgs('-DWEBP_BUILD_EXTRAS=ON')
            ->build();
        // patch pkgconfig
        $this->patchPkgconfPrefix(patch_option: PKGCONF_PATCH_PREFIX | PKGCONF_PATCH_LIBDIR);
--- a/src/SPC/builder/unix/library/ncurses.php
+++ b/src/SPC/builder/unix/library/ncurses.php
@@ -16,7 +16,6 @@ trait ncurses

        UnixAutoconfExecutor::create($this)
            ->appendEnv([
-                'CFLAGS' => '-std=c17',
                'LDFLAGS' => SPCTarget::isStatic() ? '-static' : '',
            ])
            ->configure(
@@ -30,7 +29,7 @@ trait ncurses
                '--without-tests',
                '--without-dlsym',
                '--without-debug',
-                '--enable-symlinks',
+                '-enable-symlinks',
                "--bindir={$this->getBinDir()}",
                "--includedir={$this->getIncludeDir()}",
                "--libdir={$this->getLibDir()}",
--- a/src/SPC/builder/unix/library/postgresql.php
+++ b/src/SPC/builder/unix/library/postgresql.php
@@ -47,7 +47,7 @@ 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', false));
+        $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs'));

        $env_vars = [
            'CFLAGS' => $config['cflags'],
--- a/src/SPC/builder/windows/WindowsBuilder.php
+++ b/src/SPC/builder/windows/WindowsBuilder.php
@@ -67,6 +67,21 @@ 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 ';

@@ -130,7 +145,7 @@ class WindowsBuilder extends BuilderBase
        }
    }

-    public function testPHP(int $build_target = BUILD_TARGET_NONE): void
+    public function testPHP(int $build_target = BUILD_TARGET_NONE)
    {
        $this->sanityCheck($build_target);
    }
@@ -141,27 +156,12 @@ 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 {$debug_overrides}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 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->deploySAPIBinary(BUILD_TARGET_CLI);
+        $this->deployBinary(BUILD_TARGET_CLI);
    }

    public function buildCgi(): void
@@ -170,23 +170,12 @@ 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 {$debug_overrides}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 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->deploySAPIBinary(BUILD_TARGET_CGI);
+        $this->deployBinary(BUILD_TARGET_CGI);
    }

    public function buildEmbed(): void
@@ -213,20 +202,9 @@ 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 {$debug_overrides}LIBS_MICRO=\"ws2_32.lib shell32.lib {$extra_libs}\" CFLAGS_MICRO=\"/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1{$fake_cli}\" %*";
+        $wrapper = "nmake /nologo 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
@@ -243,7 +221,7 @@ class WindowsBuilder extends BuilderBase
            }
        }

-        $this->deploySAPIBinary(BUILD_TARGET_MICRO);
+        $this->deployBinary(BUILD_TARGET_MICRO);
    }

    public function proveLibs(array $sorted_libraries): void
@@ -357,53 +335,28 @@ class WindowsBuilder extends BuilderBase
     *
     * @param int $type Deploy type
     */
-    public function deploySAPIBinary(int $type): void
+    public function deployBinary(int $type): bool
    {
-        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\\{$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'],
+            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",
            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($dst));
+                cmd()->exec(getenv('UPX_EXEC') . ' --best ' . escapeshellarg($src));
            }
        }
+
+        logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');
+        FileSystem::createDir(BUILD_BIN_PATH);
+
+        cmd()->exec('copy ' . escapeshellarg($src) . ' ' . escapeshellarg(BUILD_BIN_PATH . '\\'));
+        return true;
    }

    /**
--- a/src/SPC/command/BuildPHPCommand.php
+++ b/src/SPC/command/BuildPHPCommand.php
@@ -48,8 +48,6 @@ 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');
-        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'PHP version to build (e.g., 8.2, 8.3, 8.4). Uses php-src-X.Y if available, otherwise php-src');
    }

    public function handle(): int
@@ -121,31 +119,6 @@ class BuildPHPCommand extends BuildCommand
                logger()->warning('Some cases micro.sfx cannot be packed via UPX due to dynamic size bug, be aware!');
            }
        }
-
-        // Determine which php-src to use based on --with-php option
-        $php_version = $this->getOption('with-php');
-        if ($php_version !== null) {
-            // Check if version-specific php-src exists in lock file
-            $version_specific_name = "php-src-{$php_version}";
-            $lock_file_path = DOWNLOAD_PATH . '/.lock.json';
-            if (file_exists($lock_file_path)) {
-                $lock_content = json_decode(file_get_contents($lock_file_path), true);
-                if (isset($lock_content[$version_specific_name])) {
-                    // Use version-specific php-src
-                    f_putenv("SPC_PHP_SRC_NAME={$version_specific_name}");
-                    logger()->info("Building with PHP {$php_version} (using {$version_specific_name})");
-                } else {
-                    logger()->error('No php-src found in downloads. Please run download command first.');
-                    return static::FAILURE;
-                }
-            } else {
-                logger()->error('Lock file not found. Please download sources first.');
-                return static::FAILURE;
-            }
-        } else {
-            f_putenv('SPC_PHP_SRC_NAME=php-src');
-        }
-
        // create builder
        $builder = BuilderProvider::makeBuilderByInput($this->input);
        $include_suggest_ext = $this->getOption('with-suggested-exts');
--- a/src/SPC/command/DownloadCommand.php
+++ b/src/SPC/command/DownloadCommand.php
@@ -9,9 +9,7 @@ use SPC\exception\DownloaderException;
 use SPC\exception\SPCException;
 use SPC\store\Config;
 use SPC\store\Downloader;
-use SPC\store\FileSystem;
 use SPC\store\LockFile;
-use SPC\store\source\CustomSourceBase;
 use SPC\util\DependencyUtil;
 use SPC\util\SPCTarget;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -29,10 +27,10 @@ class DownloadCommand extends BaseCommand

    public function configure(): void
    {
-        $this->addArgument('sources', InputArgument::OPTIONAL, 'The sources will be compiled, comma separated');
+        $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, comma-separated for multiple versions (default 8.4)', '8.4');
+        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format (default 8.4)', '8.4');
        $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"');
@@ -45,31 +43,10 @@ class DownloadCommand extends BaseCommand
        $this->addOption('retry', 'R', InputOption::VALUE_REQUIRED, 'Set retry time when downloading failed (default: 0)', '0');
        $this->addOption('prefer-pre-built', 'P', null, 'Download pre-built libraries when available');
        $this->addOption('no-alt', null, null, 'Do not download alternative sources');
-        $this->addOption('update', null, null, 'Check and update downloaded sources');
    }

    public function initialize(InputInterface $input, OutputInterface $output): void
    {
-        // mode: --update
-        if ($input->getOption('update') && empty($input->getArgument('sources')) && empty($input->getOption('for-extensions')) && empty($input->getOption('for-libs'))) {
-            if (!file_exists(LockFile::LOCK_FILE)) {
-                parent::initialize($input, $output);
-                return;
-            }
-            $lock_content = json_decode(file_get_contents(LockFile::LOCK_FILE), true);
-            if (is_array($lock_content)) {
-                // Filter out pre-built sources
-                $sources_to_check = array_filter($lock_content, function ($name) {
-                    return
-                        !str_contains($name, '-Linux-') &&
-                        !str_contains($name, '-Windows-') &&
-                        !str_contains($name, '-Darwin-');
-                }, ARRAY_FILTER_USE_KEY);
-                $input->setArgument('sources', implode(',', array_keys($sources_to_check)));
-            }
-            parent::initialize($input, $output);
-            return;
-        }
        // mode: --all
        if ($input->getOption('all')) {
            $input->setArgument('sources', implode(',', array_keys(Config::getSources())));
@@ -117,29 +94,17 @@ class DownloadCommand extends BaseCommand
            return $this->downloadFromZip($path);
        }

-        if ($this->getOption('update')) {
-            return $this->handleUpdate();
-        }
-
-        // Define PHP major version(s)
-        $php_versions_str = $this->getOption('with-php');
-        $php_versions = array_map('trim', explode(',', $php_versions_str));
-
-        // Validate all versions
-        foreach ($php_versions as $ver) {
-            if ($ver !== 'git' && !preg_match('/^\d+\.\d+$/', $ver)) {
-                // If not git, we need to check the version format
-                if (!preg_match('/^\d+\.\d+(\.\d+)?$/', $ver)) {
-                    logger()->error("bad version arg: {$ver}, x.y or x.y.z required!");
-                    return static::FAILURE;
-                }
+        // Define PHP major version
+        $ver = $this->php_major_ver = $this->getOption('with-php');
+        define('SPC_BUILD_PHP_VERSION', $ver);
+        if ($ver !== 'git' && !preg_match('/^\d+\.\d+$/', $ver)) {
+            // If not git, we need to check the version format
+            if (!preg_match('/^\d+\.\d+(\.\d+)?$/', $ver)) {
+                logger()->error("bad version arg: {$ver}, x.y or x.y.z required!");
+                return static::FAILURE;
            }
        }

-        // Set the first version as the default for backward compatibility
-        $this->php_major_ver = $php_versions[0];
-        define('SPC_BUILD_PHP_VERSION', $this->php_major_ver);
-
        // retry
        $retry = (int) $this->getOption('retry');
        f_putenv('SPC_DOWNLOAD_RETRIES=' . $retry);
@@ -160,20 +125,6 @@ class DownloadCommand extends BaseCommand

        $chosen_sources = array_map('trim', array_filter(explode(',', $this->getArgument('sources'))));

-        // Handle multiple PHP versions
-        // If php-src is in the sources, replace it with version-specific sources
-        if (in_array('php-src', $chosen_sources)) {
-            // Remove php-src from the list
-            $chosen_sources = array_diff($chosen_sources, ['php-src']);
-            // Add version-specific php-src for each version
-            foreach ($php_versions as $ver) {
-                $version_specific_name = "php-src-{$ver}";
-                $chosen_sources[] = $version_specific_name;
-                // Store the version for this specific php-src
-                f_putenv("SPC_PHP_VERSION_{$version_specific_name}={$ver}");
-            }
-        }
-
        $sss = $this->getOption('ignore-cache-sources');
        if ($sss === false) {
            // false is no-any-ignores, that is, default.
@@ -250,16 +201,7 @@ class DownloadCommand extends BaseCommand
                logger()->info("[{$ni}/{$cnt}] Downloading source {$source} from custom git: {$new_config['url']}");
                Downloader::downloadSource($source, $new_config, true);
            } else {
-                // Handle version-specific php-src (php-src-8.2, php-src-8.3, etc.)
-                if (preg_match('/^php-src-[\d.]+$/', $source)) {
-                    $config = Config::getSource('php-src');
-                    if ($config === null) {
-                        logger()->error('php-src configuration not found in source.json');
-                        return static::FAILURE;
-                    }
-                } else {
-                    $config = Config::getSource($source);
-                }
+                $config = Config::getSource($source);
                // Prefer pre-built, we need to search pre-built library
                if ($this->getOption('prefer-pre-built') && ($config['provide-pre-built'] ?? false) === true) {
                    // We need to replace pattern
@@ -280,9 +222,8 @@ class DownloadCommand extends BaseCommand
                    logger()->warning("Pre-built content not found for {$source}, fallback to source download");
                }
                logger()->info("[{$ni}/{$cnt}] Downloading source {$source}");
-                $force_download = $force_all || in_array($source, $force_list) || str_starts_with($source, 'php-src-') && in_array('php-src', $force_list);
                try {
-                    Downloader::downloadSource($source, $config, $force_download);
+                    Downloader::downloadSource($source, $config, $force_all || in_array($source, $force_list));
                } catch (SPCException $e) {
                    // if `--no-alt` option is set, we will not download alternative sources
                    if ($this->getOption('no-alt')) {
@@ -300,7 +241,7 @@ class DownloadCommand extends BaseCommand
                        logger()->notice("Trying to download alternative sources for {$source}");
                        $alt_config = array_merge($config, $alt_sources);
                    }
-                    Downloader::downloadSource($source, $alt_config, $force_download);
+                    Downloader::downloadSource($source, $alt_config, $force_all || in_array($source, $force_list));
                }
            }
        }
@@ -421,284 +362,4 @@ class DownloadCommand extends BaseCommand
        }
        return static::FAILURE;
    }
-
-    private function handleUpdate(): int
-    {
-        logger()->info('Checking sources for updates...');
-
-        // Get lock file content
-        $lock_file_path = LockFile::LOCK_FILE;
-        if (!file_exists($lock_file_path)) {
-            logger()->warning('No lock file found. Please download sources first using "bin/spc download"');
-            return static::FAILURE;
-        }
-
-        $lock_content = json_decode(file_get_contents($lock_file_path), true);
-        if ($lock_content === null || !is_array($lock_content)) {
-            logger()->error('Failed to parse lock file');
-            return static::FAILURE;
-        }
-
-        // Filter sources to check
-        $sources_arg = $this->getArgument('sources');
-        if (!empty($sources_arg)) {
-            $requested_sources = array_map('trim', array_filter(explode(',', $sources_arg)));
-            $sources_to_check = [];
-            foreach ($requested_sources as $source) {
-                if (isset($lock_content[$source])) {
-                    $sources_to_check[$source] = $lock_content[$source];
-                } else {
-                    logger()->warning("Source '{$source}' not found in lock file, skipping");
-                }
-            }
-        } else {
-            $sources_to_check = $lock_content;
-        }
-
-        // Filter out pre-built sources (they are derivatives)
-        $sources_to_check = array_filter($sources_to_check, function ($lock_item, $name) {
-            // Skip pre-built sources (they contain OS/arch in the name)
-            if (str_contains($name, '-Linux-') || str_contains($name, '-Windows-') || str_contains($name, '-Darwin-')) {
-                logger()->debug("Skipping pre-built source: {$name}");
-                return false;
-            }
-            return true;
-        }, ARRAY_FILTER_USE_BOTH);
-
-        if (empty($sources_to_check)) {
-            logger()->warning('No sources to check');
-            return static::FAILURE;
-        }
-
-        $total = count($sources_to_check);
-        $current = 0;
-        $updated_sources = [];
-
-        foreach ($sources_to_check as $name => $lock_item) {
-            ++$current;
-            try {
-                // Handle version-specific php-src (php-src-8.2, php-src-8.3, etc.)
-                if (preg_match('/^php-src-[\d.]+$/', $name)) {
-                    $config = Config::getSource('php-src');
-                } else {
-                    $config = Config::getSource($name);
-                }
-
-                if ($config === null) {
-                    logger()->warning("[{$current}/{$total}] Source '{$name}' not found in source config, skipping");
-                    continue;
-                }
-
-                // Check and update based on source type
-                $source_type = $lock_item['source_type'] ?? 'unknown';
-
-                if ($source_type === SPC_SOURCE_ARCHIVE) {
-                    if ($this->checkArchiveSourceUpdate($name, $lock_item, $config, $current, $total)) {
-                        $updated_sources[] = $name;
-                    }
-                } elseif ($source_type === SPC_SOURCE_GIT) {
-                    if ($this->checkGitSourceUpdate($name, $lock_item, $config, $current, $total)) {
-                        $updated_sources[] = $name;
-                    }
-                } elseif ($source_type === SPC_SOURCE_LOCAL) {
-                    logger()->debug("[{$current}/{$total}] Source '{$name}' is local, skipping");
-                } else {
-                    logger()->warning("[{$current}/{$total}] Unknown source type '{$source_type}' for '{$name}', skipping");
-                }
-            } catch (\Throwable $e) {
-                logger()->error("[{$current}/{$total}] Error checking '{$name}': {$e->getMessage()}");
-                continue;
-            }
-        }
-
-        // Output summary
-        if (empty($updated_sources)) {
-            logger()->info('All sources are up to date.');
-        } else {
-            logger()->info('Updated sources: ' . implode(', ', $updated_sources));
-
-            // Write updated sources to file
-            $date = date('Y-m-d');
-            $update_file = DOWNLOAD_PATH . '/.update-' . $date . '.txt';
-            if (file_exists($update_file)) {
-                $existing_content = file_get_contents($update_file);
-                $existing_sources = array_map('trim', explode(',', $existing_content));
-                $updated_sources = array_unique(array_merge($existing_sources, $updated_sources));
-            }
-            $content = implode(',', $updated_sources);
-            file_put_contents($update_file, $content);
-            logger()->debug("Updated sources written to: {$update_file}");
-        }
-
-        return static::SUCCESS;
-    }
-
-    private function checkCustomSourceUpdate(string $name, array $lock, array $config, int $current, int $total): ?array
-    {
-        $classes = FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/store/source', 'SPC\store\source');
-        foreach ($classes as $class) {
-            // Support php-src and php-src-X.Y patterns
-            $matches = ($class::NAME === $name) ||
-                ($class::NAME === 'php-src' && preg_match('/^php-src(-[\d.]+)?$/', $name));
-            if (is_a($class, CustomSourceBase::class, true) && $matches) {
-                try {
-                    $config['source_name'] = $name;
-                    return (new $class())->update($lock, $config);
-                } catch (\Throwable $e) {
-                    logger()->warning("[{$current}/{$total}] Failed to check '{$name}': {$e->getMessage()}");
-                    return null;
-                }
-            }
-        }
-        logger()->debug("[{$current}/{$total}] Custom source handler for '{$name}' not found");
-        return null;
-    }
-
-    /**
-     * Check and update an archive source
-     *
-     * @param  string $name    Source name
-     * @param  array  $lock    Lock file entry
-     * @param  array  $config  Source configuration
-     * @param  int    $current Current progress number
-     * @param  int    $total   Total sources to check
-     * @return bool   True if updated, false otherwise
-     */
-    private function checkArchiveSourceUpdate(string $name, array $lock, array $config, int $current, int $total): bool
-    {
-        $type = $config['type'] ?? 'unknown';
-        $locked_filename = $lock['filename'] ?? '';
-
-        // Skip local types that don't support version detection
-        if (in_array($type, ['local', 'unknown'])) {
-            logger()->debug("[{$current}/{$total}] Source '{$name}' (type: {$type}) doesn't support version detection, skipping");
-            return false;
-        }
-
-        try {
-            $latest_info = match ($type) {
-                'ghtar' => Downloader::getLatestGithubTarball($name, $config),
-                'ghtagtar' => Downloader::getLatestGithubTarball($name, $config, 'tags'),
-                'ghrel' => Downloader::getLatestGithubRelease($name, $config),
-                'pie' => Downloader::getPIEInfo($name, $config),
-                'bitbuckettag' => Downloader::getLatestBitbucketTag($name, $config),
-                'filelist' => Downloader::getFromFileList($name, $config),
-                'url' => Downloader::getLatestUrlInfo($name, $config),
-                'custom' => $this->checkCustomSourceUpdate($name, $lock, $config, $current, $total),
-                default => null,
-            };
-
-            if ($latest_info === null) {
-                logger()->warning("[{$current}/{$total}] Could not get version info for '{$name}' (type: {$type})");
-                return false;
-            }
-
-            $latest_filename = $latest_info[1] ?? '';
-
-            // Compare filenames
-            if ($locked_filename !== $latest_filename) {
-                logger()->info("[{$current}/{$total}] Update available for '{$name}': {$locked_filename} → {$latest_filename}");
-                $this->downloadSourceForUpdate($name, $config, $current, $total);
-                return true;
-            }
-
-            logger()->info("[{$current}/{$total}] Source '{$name}' is up to date");
-            return false;
-        } catch (DownloaderException $e) {
-            logger()->warning("[{$current}/{$total}] Failed to check '{$name}': {$e->getMessage()}");
-            return false;
-        }
-    }
-
-    /**
-     * Check and update a git source
-     *
-     * @param  string $name    Source name
-     * @param  array  $lock    Lock file entry
-     * @param  array  $config  Source configuration
-     * @param  int    $current Current progress number
-     * @param  int    $total   Total sources to check
-     * @return bool   True if updated, false otherwise
-     */
-    private function checkGitSourceUpdate(string $name, array $lock, array $config, int $current, int $total): bool
-    {
-        $locked_hash = $lock['hash'] ?? '';
-        $url = $config['url'] ?? '';
-        $branch = $config['rev'] ?? 'main';
-
-        if (empty($url)) {
-            logger()->warning("[{$current}/{$total}] No URL found for git source '{$name}'");
-            return false;
-        }
-
-        try {
-            $remote_hash = $this->getRemoteGitCommit($url, $branch);
-
-            if ($remote_hash === null) {
-                logger()->warning("[{$current}/{$total}] Could not fetch remote commit for '{$name}'");
-                return false;
-            }
-
-            // Compare hashes (use first 7 chars for display)
-            $locked_short = substr($locked_hash, 0, 7);
-            $remote_short = substr($remote_hash, 0, 7);
-
-            if ($locked_hash !== $remote_hash) {
-                logger()->info("[{$current}/{$total}] Update available for '{$name}': {$locked_short} → {$remote_short}");
-                $this->downloadSourceForUpdate($name, $config, $current, $total);
-                return true;
-            }
-
-            logger()->info("[{$current}/{$total}] Source '{$name}' is up to date");
-            return false;
-        } catch (\Throwable $e) {
-            logger()->warning("[{$current}/{$total}] Failed to check '{$name}': {$e->getMessage()}");
-            return false;
-        }
-    }
-
-    /**
-     * Download a source after removing old lock entry
-     *
-     * @param string $name    Source name
-     * @param array  $config  Source configuration
-     * @param int    $current Current progress number
-     * @param int    $total   Total sources to check
-     */
-    private function downloadSourceForUpdate(string $name, array $config, int $current, int $total): void
-    {
-        logger()->info("[{$current}/{$total}] Downloading '{$name}'...");
-
-        // Remove old lock entry
-        LockFile::put($name, null);
-
-        // Download new version
-        Downloader::downloadSource($name, $config, true);
-    }
-
-    /**
-     * Get remote git commit hash without cloning
-     *
-     * @param  string      $url    Git repository URL
-     * @param  string      $branch Branch or tag to check
-     * @return null|string Remote commit hash or null on failure
-     */
-    private function getRemoteGitCommit(string $url, string $branch): ?string
-    {
-        try {
-            $cmd = SPC_GIT_EXEC . ' ls-remote ' . escapeshellarg($url) . ' ' . escapeshellarg($branch);
-            f_exec($cmd, $output, $ret);
-
-            if ($ret !== 0 || empty($output)) {
-                return null;
-            }
-
-            // Output format: "commit_hash\trefs/heads/branch" or "commit_hash\tHEAD"
-            $parts = preg_split('/\s+/', $output[0]);
-            return $parts[0] ?? null;
-        } catch (\Throwable $e) {
-            logger()->debug("Failed to fetch remote git commit: {$e->getMessage()}");
-            return null;
-        }
-    }
 }
--- a/src/SPC/doctor/item/LinuxMuslCheck.php
+++ b/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() && !str_contains((string) getenv('SPC_TARGET'), 'gnu'));
+            (getenv('SPC_TOOLCHAIN') === ZigToolchain::class && !SystemUtil::isMuslDist());
    }

    /** @noinspection PhpUnused */
--- a/src/SPC/exception/ExceptionHandler.php
+++ b/src/SPC/exception/ExceptionHandler.php
@@ -159,9 +159,7 @@ class ExceptionHandler
    public static function handleDefaultException(\Throwable $e): void
    {
        $class = get_class($e);
-        $file = $e->getFile();
-        $line = $e->getLine();
-        self::logError("✗ Unhandled exception {$class} on {$file} line {$line}:\n\t{$e->getMessage()}\n");
+        self::logError("✗ Unhandled exception {$class}:\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');
--- a/src/SPC/store/DirDiff.php
+++ b/src/SPC/store/DirDiff.php
@@ -1,95 +0,0 @@
-<?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);
-    }
-}
--- a/src/SPC/store/Downloader.php
+++ b/src/SPC/store/Downloader.php
@@ -97,9 +97,8 @@ class Downloader
    public static function getLatestGithubTarball(string $name, array $source, string $type = 'releases'): array
    {
        logger()->debug("finding {$name} source from github {$type} tarball");
-        $source['query'] ??= '';
        $data = json_decode(self::curlExec(
-            url: "https://api.github.com/repos/{$source['repo']}/{$type}{$source['query']}",
+            url: "https://api.github.com/repos/{$source['repo']}/{$type}",
            hooks: [[CurlHook::class, 'setupGithubToken']],
            retries: self::getRetryAttempts()
        ), true, 512, JSON_THROW_ON_ERROR);
@@ -109,9 +108,6 @@ class Downloader
            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;
                break;
@@ -220,39 +216,6 @@ class Downloader
        return [$source['url'] . end($versions), end($versions), key($versions)];
    }

-    /**
-     * Get latest version from direct URL (detect redirect and filename)
-     *
-     * @param  string             $name   Source name
-     * @param  array              $source Source meta info: [url]
-     * @return array<int, string> [url, filename]
-     */
-    public static function getLatestUrlInfo(string $name, array $source): array
-    {
-        logger()->debug("finding {$name} source from direct url");
-        $url = $source['url'];
-        $headers = self::curlExec(
-            url: $url,
-            method: 'HEAD',
-            retries: self::getRetryAttempts()
-        );
-
-        // Find redirect location if any
-        if (preg_match('/^location:\s+(?<url>.+)$/im', $headers, $matches)) {
-            $url = trim($matches['url']);
-            // If it's a relative URL, we need to handle it, but usually it's absolute for downloads
-        }
-
-        // Find filename from content-disposition
-        if (preg_match('/^content-disposition:\s+attachment;\s*filename=("?)(?<filename>.+)\1/im', $headers, $matches)) {
-            $filename = trim($matches['filename']);
-        } else {
-            $filename = $source['filename'] ?? basename($url);
-        }
-
-        return [$url, $filename];
-    }
-
    /**
     * Download file from URL
     *
@@ -280,7 +243,7 @@ class Downloader
        if ($download_as === SPC_DOWNLOAD_PRE_BUILT) {
            $name = self::getPreBuiltLockName($name);
        }
-        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_ARCHIVE, 'url' => $url, 'filename' => $filename, 'move_path' => $move_path, 'lock_as' => $download_as]);
+        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_ARCHIVE, 'filename' => $filename, 'move_path' => $move_path, 'lock_as' => $download_as]);
    }

    /**
@@ -339,7 +302,7 @@ class Downloader
        }
        // Lock
        logger()->debug("Locking git source {$name}");
-        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_GIT, 'url' => $url, 'rev' => $branch, 'dirname' => $name, 'move_path' => $move_path, 'lock_as' => $lock_as]);
+        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_GIT, 'dirname' => $name, 'move_path' => $move_path, 'lock_as' => $lock_as]);

        /*
        // 复制目录过去
@@ -689,7 +652,8 @@ class Downloader
                    self::downloadFile($name, $url, $filename, $conf['path'] ?? $conf['extract'] ?? null, $download_as);
                    break;
                case 'url': // Direct download URL
-                    [$url, $filename] = self::getLatestUrlInfo($name, $conf);
+                    $url = $conf['url'];
+                    $filename = $conf['filename'] ?? basename($conf['url']);
                    self::downloadFile($name, $url, $filename, $conf['path'] ?? $conf['extract'] ?? null, $download_as);
                    break;
                case 'git': // Git repo
@@ -699,8 +663,6 @@ class Downloader
                    LockFile::lockSource($name, [
                        'source_type' => SPC_SOURCE_LOCAL,
                        'dirname' => $conf['dirname'],
-                        'url' => null,
-                        'path' => $conf['path'] ?? null,
                        'move_path' => $conf['path'] ?? $conf['extract'] ?? null,
                        'lock_as' => $download_as,
                    ]);
@@ -716,11 +678,7 @@ class Downloader
                        ...FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/store/pkg', 'SPC\store\pkg'),
                    ];
                    foreach ($classes as $class) {
-                        // Support php-src and php-src-X.Y patterns
-                        $matches = ($class::NAME === $name) ||
-                                   ($class::NAME === 'php-src' && preg_match('/^php-src(-[\d.]+)?$/', $name));
-                        if (is_a($class, CustomSourceBase::class, true) && $matches) {
-                            $conf['source_name'] = $name; // Pass the actual source name
+                        if (is_a($class, CustomSourceBase::class, true) && $class::NAME === $name) {
                            (new $class())->fetch($force, $conf, $download_as);
                            break;
                        }
--- a/src/SPC/store/FileSystem.php
+++ b/src/SPC/store/FileSystem.php
@@ -174,9 +174,6 @@ 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);
        }
@@ -408,15 +405,15 @@ class FileSystem
                continue;
            }
            $sub_file = self::convertPath($dir . '/' . $v);
-            if (is_link($sub_file) || is_file($sub_file)) {
-                if (!unlink($sub_file)) {
-                    return false;
-                }
-            } elseif (is_dir($sub_file)) {
+            if (is_dir($sub_file)) {
                # 如果是 目录 且 递推 , 则递推添加下级文件
                if (!self::removeDir($sub_file)) {
                    return false;
                }
+            } elseif (is_link($sub_file) || is_file($sub_file)) {
+                if (!unlink($sub_file)) {
+                    return false;
+                }
            }
        }
        if (is_link($dir)) {
@@ -572,44 +569,6 @@ 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
@@ -686,6 +645,36 @@ 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
     */
--- a/src/SPC/store/LockFile.php
+++ b/src/SPC/store/LockFile.php
@@ -155,7 +155,6 @@ class LockFile
     * @param string $name Source name
     * @param array{
     *     source_type: string,
-     *     url: ?string,
     *     dirname?: ?string,
     *     filename?: ?string,
     *     move_path: ?string,
--- a/src/SPC/store/SourceManager.php
+++ b/src/SPC/store/SourceManager.php
@@ -39,14 +39,7 @@ class SourceManager

        // start check
        foreach ($sources_extracted as $source => $item) {
-            $extract_dir_name = $source;
-            // Handle version-specific php-src (php-src-8.2, php-src-8.3, etc.)
-            $source_config = Config::getSource($source);
-            if ($source_config === null && preg_match('/^php-src-[\d.]+$/', $source)) {
-                $source_config = Config::getSource('php-src');
-                $extract_dir_name = 'php-src';
-            }
-            if ($source_config === null) {
+            if (Config::getSource($source) === null) {
                throw new WrongUsageException("Source [{$source}] does not exist, please check the name and correct it !");
            }
            // check source downloaded
@@ -63,12 +56,12 @@ class SourceManager
            $lock_content = LockFile::get($lock_name);

            // check source dir exist
-            $check = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $extract_dir_name);
+            $check = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $source);
            // $check = $lock[$lock_name]['move_path'] === null ? (SOURCE_PATH . '/' . $source) : (SOURCE_PATH . '/' . $lock[$lock_name]['move_path']);
            if (!is_dir($check)) {
                logger()->debug("Extracting source [{$source}] to {$check} ...");
                $filename = LockFile::getLockFullPath($lock_content);
-                FileSystem::extractSource($extract_dir_name, $lock_content['source_type'], $filename, $check);
+                FileSystem::extractSource($source, $lock_content['source_type'], $filename, $check);
                LockFile::putLockSourceHash($lock_content, $check);
                continue;
            }
@@ -96,7 +89,7 @@ class SourceManager
            logger()->notice("Source [{$source}] hash mismatch, removing old source dir and extracting again ...");
            FileSystem::removeDir($check);
            $filename = LockFile::getLockFullPath($lock_content);
-            $move_path = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $extract_dir_name);
+            $move_path = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $source);
            FileSystem::extractSource($source, $lock_content['source_type'], $filename, $move_path);
            LockFile::putLockSourceHash($lock_content, $check);
        }
--- a/src/SPC/store/SourcePatcher.php
+++ b/src/SPC/store/SourcePatcher.php
@@ -25,7 +25,6 @@ class SourcePatcher
        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']);
@@ -433,23 +432,6 @@ 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'");
--- a/src/SPC/store/pkg/GoXcaddy.php
+++ b/src/SPC/store/pkg/GoXcaddy.php
@@ -48,10 +48,10 @@ class GoXcaddy extends CustomPackage
            'macos' => 'darwin',
            default => throw new \InvalidArgumentException('Unsupported OS: ' . $name),
        };
-        [$go_version] = explode("\n", Downloader::curlExec('https://go.dev/VERSION?m=text'));
+        $go_version = '1.25.0';
        $config = [
            'type' => 'url',
-            'url' => "https://go.dev/dl/{$go_version}.{$os}-{$arch}.tar.gz",
+            'url' => "https://go.dev/dl/go{$go_version}.{$os}-{$arch}.tar.gz",
        ];
        Downloader::downloadPackage($name, $config, $force);
    }
--- a/src/SPC/store/pkg/Zig.php
+++ b/src/SPC/store/pkg/Zig.php
@@ -72,11 +72,8 @@ class Zig extends CustomPackage

        $latest_version = null;
        foreach ($index_json as $version => $data) {
-            // Skip the master branch, get the latest stable release
-            if ($version !== 'master') {
-                $latest_version = $version;
-                break;
-            }
+            $latest_version = $version;
+            break;
        }

        if (!$latest_version) {
--- a/src/SPC/store/source/CustomSourceBase.php
+++ b/src/SPC/store/source/CustomSourceBase.php
@@ -25,13 +25,4 @@ abstract class CustomSourceBase
     * @param int        $lock_as Lock type constant
     */
    abstract public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_DOWNLOAD_SOURCE): void;
-
-    /**
-     * Update the source from its repository
-     *
-     * @param  array      $lock   Lock file entry
-     * @param  array      $config Optional configuration array
-     * @return null|array Latest version info [url, filename], or null if no update needed
-     */
-    abstract public function update(array $lock, ?array $config = null): ?array;
 }
--- a/src/SPC/store/source/PhpSource.php
+++ b/src/SPC/store/source/PhpSource.php
@@ -7,7 +7,6 @@ namespace SPC\store\source;
 use JetBrains\PhpStorm\ArrayShape;
 use SPC\exception\DownloaderException;
 use SPC\store\Downloader;
-use SPC\store\LockFile;

 class PhpSource extends CustomSourceBase
 {
@@ -15,46 +14,14 @@ class PhpSource extends CustomSourceBase

    public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_DOWNLOAD_SOURCE): void
    {
-        $source_name = $config['source_name'] ?? 'php-src';
-
-        // Try to extract version from source name (e.g., "php-src-8.2" -> "8.2")
-        if (preg_match('/^php-src-([\d.]+)$/', $source_name, $matches)) {
-            $major = $matches[1];
+        $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') {
+            Downloader::downloadSource('php-src', ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
        } else {
-            $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
+            Downloader::downloadSource('php-src', $this->getLatestPHPInfo($major), $force);
        }
-
-        if ($major === 'git') {
-            Downloader::downloadSource($source_name, ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
-        } else {
-            Downloader::downloadSource($source_name, $this->getLatestPHPInfo($major), $force);
-        }
-
-        if ($source_name !== 'php-src') {
-            LockFile::put('php-src', LockFile::get($source_name));
-        }
-    }
-
-    public function update(array $lock, ?array $config = null): ?array
-    {
-        $source_name = $config['source_name'] ?? 'php-src';
-
-        // Try to extract version from source name (e.g., "php-src-8.2" -> "8.2")
-        if (preg_match('/^php-src-([\d.]+)$/', $source_name, $matches)) {
-            $major = $matches[1];
-        } else {
-            $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
-        }
-
-        if ($major === 'git') {
-            return null;
-        }
-
-        $latest_php = $this->getLatestPHPInfo($major);
-        $latest_url = $latest_php['url'];
-        $filename = basename($latest_url);
-
-        return [$latest_url, $filename];
    }

    /**
--- a/src/SPC/store/source/PostgreSQLSource.php
+++ b/src/SPC/store/source/PostgreSQLSource.php
@@ -15,13 +15,6 @@ class PostgreSQLSource extends CustomSourceBase
        Downloader::downloadSource('postgresql', self::getLatestInfo(), $force);
    }

-    public function update(array $lock, ?array $config = null): ?array
-    {
-        $latest = $this->getLatestInfo();
-        $filename = basename($latest['url']);
-        return [$latest['url'], $filename];
-    }
-
    public function getLatestInfo(): array
    {
        [, $filename, $version] = Downloader::getFromFileList('postgresql', [
--- a/src/SPC/toolchain/ZigToolchain.php
+++ b/src/SPC/toolchain/ZigToolchain.php
@@ -67,8 +67,7 @@ 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) {
-            $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}");
+            GlobalEnvManager::putenv('SPC_EXTRA_PHP_VARS=php_cv_have_avx512=no php_cv_have_avx512vbmi=no');
        }
    }

--- a/src/SPC/util/SPCConfigUtil.php
+++ b/src/SPC/util/SPCConfigUtil.php
@@ -7,7 +7,6 @@ namespace SPC\util;
 use SPC\builder\BuilderBase;
 use SPC\builder\BuilderProvider;
 use SPC\builder\Extension;
-use SPC\builder\LibraryBase;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use Symfony\Component\Console\Input\ArgvInput;
@@ -54,9 +53,6 @@ class SPCConfigUtil
     */
    public function config(array $extensions = [], array $libraries = [], bool $include_suggest_ext = false, bool $include_suggest_lib = false): array
    {
-        logger()->debug('config extensions: ' . implode(',', $extensions));
-        logger()->debug('config libs: ' . implode(',', $libraries));
-        logger()->debug('config suggest for [ext, lib]: ' . ($include_suggest_ext ? 'true' : 'false') . ',' . ($include_suggest_lib ? 'true' : 'false'));
        $extra_exts = [];
        foreach ($extensions as $ext) {
            $extra_exts = array_merge($extra_exts, Config::getExt($ext, 'ext-suggests', []));
@@ -128,63 +124,6 @@ class SPCConfigUtil
        ];
    }

-    /**
-     * [Helper function]
-     * Get configuration for a specific extension(s) dependencies.
-     *
-     * @param Extension|Extension[] $extension           Extension instance or list
-     * @param bool                  $include_suggest_ext Whether to include suggested extensions
-     * @param bool                  $include_suggest_lib Whether to include suggested libraries
-     * @return array{
-     *     cflags: string,
-     *     ldflags: string,
-     *     libs: string
-     * }
-     */
-    public function getExtensionConfig(array|Extension $extension, bool $include_suggest_ext = false, bool $include_suggest_lib = false): array
-    {
-        if (!is_array($extension)) {
-            $extension = [$extension];
-        }
-        $libs = array_map(fn ($y) => $y->getName(), array_merge(...array_map(fn ($x) => $x->getLibraryDependencies(true), $extension)));
-        return $this->config(
-            extensions: array_map(fn ($x) => $x->getName(), $extension),
-            libraries: $libs,
-            include_suggest_ext: $include_suggest_ext ?: $this->builder?->getOption('with-suggested-exts') ?? false,
-            include_suggest_lib: $include_suggest_lib ?: $this->builder?->getOption('with-suggested-libs') ?? false,
-        );
-    }
-
-    /**
-     * [Helper function]
-     * Get configuration for a specific library(s) dependencies.
-     *
-     * @param LibraryBase|LibraryBase[] $lib                 Library instance or list
-     * @param bool                      $include_suggest_lib Whether to include suggested libraries
-     * @return array{
-     *     cflags: string,
-     *     ldflags: string,
-     *     libs: string
-     * }
-     */
-    public function getLibraryConfig(array|LibraryBase $lib, bool $include_suggest_lib = false): array
-    {
-        if (!is_array($lib)) {
-            $lib = [$lib];
-        }
-        $save_no_php = $this->no_php;
-        $this->no_php = true;
-        $save_libs_only_deps = $this->libs_only_deps;
-        $this->libs_only_deps = true;
-        $ret = $this->config(
-            libraries: array_map(fn ($x) => $x->getName(), $lib),
-            include_suggest_lib: $include_suggest_lib ?: $this->builder?->getOption('with-suggested-libs') ?? false,
-        );
-        $this->no_php = $save_no_php;
-        $this->libs_only_deps = $save_libs_only_deps;
-        return $ret;
-    }
-
    private function hasCpp(array $extensions, array $libraries): bool
    {
        // judge cpp-extension
@@ -226,17 +165,9 @@ class SPCConfigUtil
        // parse pkg-configs
        foreach ($libraries as $library) {
            $pc = Config::getLib($library, 'pkg-configs', []);
-            $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
-            $search_paths = array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path));
            foreach ($pc as $file) {
-                $found = false;
-                foreach ($search_paths as $path) {
-                    if (file_exists($path . "/{$file}.pc")) {
-                        $found = true;
-                    }
-                }
-                if (!$found) {
-                    throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$library}] does not exist. Please build it first.");
+                if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$file}.pc")) {
+                    throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$library}] does not exist in '" . BUILD_LIB_PATH . "/pkgconfig'. Please build it first.");
                }
            }
            $pc_cflags = implode(' ', $pc);
@@ -265,17 +196,9 @@ class SPCConfigUtil
        foreach ($libraries as $library) {
            // add pkg-configs libs
            $pkg_configs = Config::getLib($library, 'pkg-configs', []);
-            $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
-            $search_paths = array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path));
-            foreach ($pkg_configs as $file) {
-                $found = false;
-                foreach ($search_paths as $path) {
-                    if (file_exists($path . "/{$file}.pc")) {
-                        $found = true;
-                    }
-                }
-                if (!$found) {
-                    throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$library}] does not exist. Please build it first.");
+            foreach ($pkg_configs as $pkg_config) {
+                if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$pkg_config}.pc")) {
+                    throw new WrongUsageException("pkg-config file '{$pkg_config}.pc' for lib [{$library}] does not exist in '" . BUILD_LIB_PATH . "/pkgconfig'. Please build it first.");
                }
            }
            $pkg_configs = implode(' ', $pkg_configs);
--- a/src/globals/test-extensions.php
+++ b/src/globals/test-extensions.php
@@ -13,7 +13,7 @@ declare(strict_types=1);

 // test php version (8.1 ~ 8.4 available, multiple for matrix)
 $test_php_version = [
-    // '8.1',
+    '8.1',
    '8.2',
    '8.3',
    '8.4',
@@ -28,8 +28,8 @@ $test_os = [
    'ubuntu-latest', // bin/spc-alpine-docker for x86_64
    'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
    'ubuntu-24.04', // bin/spc for x86_64
-    // 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
-    // 'ubuntu-24.04-arm', // bin/spc for arm64
+    'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
+    'ubuntu-24.04-arm', // bin/spc for arm64
    // 'windows-2022', // .\bin\spc.ps1
    // 'windows-2025',
 ];
@@ -50,13 +50,13 @@ $prefer_pre_built = false;

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

 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
 $shared_extensions = match (PHP_OS_FAMILY) {
-    'Linux' => 'grpc,mysqlnd_parsec,mysqlnd_ed25519',
+    'Linux' => '',
    'Darwin' => '',
    'Windows' => '',
 };
@@ -66,7 +66,7 @@ $with_suggested_libs = false;

 // If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true.
 $with_libs = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'libwebp',
+    'Linux', 'Darwin' => '',
    'Windows' => '',
 };

@@ -74,7 +74,7 @@ $with_libs = match (PHP_OS_FAMILY) {
 // You can use `common`, `bulk`, `minimal` or `none`.
 // note: combination is only available for *nix platform. Windows must use `none` combination
 $base_combination = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'minimal',
+    'Linux', 'Darwin' => 'none',
    'Windows' => 'none',
 };