Enhance release-build.yml with release deployment step

Added a deployment step for release tags to the self-hosted OSS workflow.
2026-07-02 14:25:41 +08:00 · 2026-02-13 13:21:25 +08:00
62 changed files with 160 additions and 963 deletions
--- a/.github/workflows/build-unix.yml
+++ b/.github/workflows/build-unix.yml
@@ -29,9 +29,6 @@ on:
        description: Extensions to build (comma separated)
        required: true
        type: string
-      shared-extensions:
-        description: Shared extensions to build (optional, comma separated)
-        type: string
      extra-libs:
        description: Extra libraries to build (optional, comma separated)
        type: string
@@ -45,22 +42,10 @@ on:
      build-fpm:
        description: Build fpm binary
        type: boolean
-      build-frankenphp:
-        description: Build frankenphp binary (requires ZTS)
-        type: boolean
-        default: false
-      enable-zts:
-        description: Enable ZTS
-        type: boolean
-        default: false
      prefer-pre-built:
        description: Prefer pre-built binaries (reduce build time)
        type: boolean
        default: true
-      with-suggested-libs:
-        description: Build with suggested libs
-        type: boolean
-        default: false
      debug:
        description: Show full build logs
        type: boolean
@@ -84,9 +69,6 @@ on:
        description: Extensions to build (comma separated)
        required: true
        type: string
-      shared-extensions:
-        description: Shared extensions to build (optional, comma separated)
-        type: string
      extra-libs:
        description: Extra libraries to build (optional, comma separated)
        type: string
@@ -100,22 +82,10 @@ on:
      build-fpm:
        description: Build fpm binary
        type: boolean
-      build-frankenphp:
-        description: Build frankenphp binary (requires ZTS)
-        type: boolean
-        default: false
-      enable-zts:
-        description: Enable ZTS
-        type: boolean
-        default: false
      prefer-pre-built:
        description: Prefer pre-built binaries (reduce build time)
        type: boolean
        default: true
-      with-suggested-libs:
-        description: Include suggested libs
-        type: boolean
-        default: false
      debug:
        description: Show full build logs
        type: boolean
@@ -174,19 +144,8 @@ jobs:
              RUNS_ON="macos-15"
              ;;
          esac
-          STATIC_EXTS="${{ inputs.extensions }}"
-          SHARED_EXTS="${{ inputs['shared-extensions'] }}"
-          BUILD_FRANKENPHP="${{ inputs['build-frankenphp'] }}"
-          ENABLE_ZTS="${{ inputs['enable-zts'] }}"
-          ALL_EXTS="$STATIC_EXTS"
-          if [ -n "$SHARED_EXTS" ]; then
-            ALL_EXTS="$ALL_EXTS,$SHARED_EXTS"
-          fi
-          DOWN_CMD="$DOWN_CMD --with-php=${{ inputs.php-version }} --for-extensions=$ALL_EXTS --ignore-cache-sources=php-src"
-          BUILD_CMD="$BUILD_CMD $STATIC_EXTS"
-          if [ -n "$SHARED_EXTS" ]; then
-            BUILD_CMD="$BUILD_CMD --build-shared=$SHARED_EXTS"
-          fi
+          DOWN_CMD="$DOWN_CMD --with-php=${{ inputs.php-version }} --for-extensions=${{ inputs.extensions }} --ignore-cache-sources=php-src"
+          BUILD_CMD="$BUILD_CMD ${{ inputs.extensions }}"
          if [ -n "${{ inputs.extra-libs }}" ]; then
            DOWN_CMD="$DOWN_CMD --for-libs=${{ inputs.extra-libs }}"
            BUILD_CMD="$BUILD_CMD --with-libs=${{ inputs.extra-libs }}"
@@ -198,9 +157,6 @@ jobs:
          if [ ${{ inputs.prefer-pre-built }} == true ]; then
              DOWN_CMD="$DOWN_CMD --prefer-pre-built"
          fi
-          if [ ${{ inputs.with-suggested-libs }} == true ]; then
-              BUILD_CMD="$BUILD_CMD --with-suggested-libs"
-          fi
          if [ ${{ inputs.build-cli }} == true ]; then
              BUILD_CMD="$BUILD_CMD --build-cli"
          fi
@@ -210,12 +166,6 @@ jobs:
          if [ ${{ inputs.build-fpm }} == true ]; then
              BUILD_CMD="$BUILD_CMD --build-fpm"
          fi
-          if [ "$BUILD_FRANKENPHP" = "true" ]; then
-              BUILD_CMD="$BUILD_CMD --build-frankenphp"
-          fi
-          if [ "$ENABLE_ZTS" = "true" ]; then
-              BUILD_CMD="$BUILD_CMD --enable-zts"
-          fi
          echo 'download='"$DOWN_CMD" >> "$GITHUB_OUTPUT"
          echo 'build='"$BUILD_CMD" >> "$GITHUB_OUTPUT"
          echo 'run='"$RUNS_ON" >> "$GITHUB_OUTPUT"
@@ -238,27 +188,6 @@ jobs:
        env:
          phpts: nts

-      - if: ${{ inputs['build-frankenphp'] == true }}
-        name: "Install go-xcaddy for FrankenPHP"
-        run: |
-          case "${{ inputs.os }}" in
-            linux-x86_64|linux-aarch64)
-              ./bin/spc-alpine-docker install-pkg go-xcaddy
-              ;;
-            linux-x86_64-glibc|linux-aarch64-glibc)
-              ./bin/spc-gnu-docker install-pkg go-xcaddy
-              ;;
-            macos-x86_64|macos-aarch64)
-              composer update --no-dev --classmap-authoritative
-              ./bin/spc doctor --auto-fix
-              ./bin/spc install-pkg go-xcaddy
-              ;;
-            *)
-              echo "Unsupported OS for go-xcaddy install: ${{ inputs.os }}"
-              exit 1
-              ;;
-          esac
-
      # Cache downloaded source
      - id: cache-download
        uses: actions/cache@v4
@@ -273,14 +202,6 @@ jobs:
 #        if: ${{ failure() }}
 #        uses: mxschmitt/action-tmate@v3

-      # Upload debug logs
-      - if: ${{ inputs.debug && failure() }}
-        name: "Upload build logs on failure"
-        uses: actions/upload-artifact@v4
-        with:
-          name: spc-logs-${{ inputs.php-version }}-${{ inputs.os }}
-          path: log/*.log
-
      # Upload cli executable
      - if: ${{ inputs.build-cli == true }}
        name: "Upload PHP cli SAPI"
@@ -305,22 +226,7 @@ jobs:
          name: php-fpm-${{ inputs.php-version }}-${{ inputs.os }}
          path: buildroot/bin/php-fpm

-      # Upload frankenphp executable
-      - if: ${{ inputs['build-frankenphp'] == true }}
-        name: "Upload FrankenPHP SAPI"
-        uses: actions/upload-artifact@v4
-        with:
-          name: php-frankenphp-${{ inputs.php-version }}-${{ inputs.os }}
-          path: buildroot/bin/frankenphp
-
      # Upload extensions metadata
-      - if: ${{ inputs['shared-extensions'] != '' }}
-        name: "Upload shared extensions"
-        uses: actions/upload-artifact@v4
-        with:
-          name: php-shared-ext-${{ inputs.php-version }}-${{ inputs.os }}
-          path: |
-            buildroot/modules/*.so
      - uses: actions/upload-artifact@v4
        name: "Upload License Files"
        with:
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -120,7 +120,7 @@ jobs:
        with:
          files: dist/${{ matrix.operating-system.filename }}

-      - name: "Deploy to self-hosted OSS"
+      - name: "Deploy to self-hosted OSS (nightly)"
        # only run this step if the repository is static-php-cli and the branch is main
        if: github.repository == 'crazywhalecc/static-php-cli' && github.ref == 'refs/heads/main'
        uses: static-php/upload-s3-action@v1.0.0
@@ -132,6 +132,18 @@ jobs:
          destination_dir: static-php-cli/spc-bin/nightly/
          endpoint: ${{ secrets.AWS_ENDPOINT }}

+      - name: "Deploy to self-hosted OSS (release)"
+        # only run this step if the repository is static-php-cli and release tag
+        if: github.repository == 'crazywhalecc/static-php-cli' && startsWith(github.ref, 'refs/tags/')
+        uses: static-php/upload-s3-action@v1.0.0
+        with:
+          aws_key_id: ${{ secrets.AWS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws_bucket: ${{ secrets.AWS_BUCKET }}
+          source_dir: "dist/"
+          destination_dir: static-php-cli/spc-bin/${{ github.event.release.tag_name }}/
+          endpoint: ${{ secrets.AWS_ENDPOINT }}
+
      - name: "Upload Artifact"
        uses: actions/upload-artifact@v4
        with:
--- a/config/env.ini
+++ b/config/env.ini
@@ -148,8 +148,6 @@ SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-
 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}"
-; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
-SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
 ; minimum compatible macOS version (LLVM vars, availability not guaranteed)
 MACOSX_DEPLOYMENT_TARGET=12.0

--- a/config/ext.json
+++ b/config/ext.json
@@ -63,8 +63,7 @@
        ],
        "ext-depends-windows": [
            "zlib",
-            "openssl",
-            "brotli"
+            "openssl"
        ]
    },
    "dba": {
@@ -74,19 +73,6 @@
            "qdbm"
        ]
    },
-    "decimal": {
-        "type": "external",
-        "source": "ext-decimal",
-        "arg-type": "custom",
-        "lib-depends": [
-            "libmpdec"
-        ]
-    },
-    "deepclone": {
-        "type": "external",
-        "source": "deepclone",
-        "arg-type": "enable"
-    },
    "dio": {
        "support": {
            "BSD": "wip"
@@ -266,7 +252,6 @@
        "arg-type-unix": "enable-path",
        "cpp-extension": true,
        "lib-depends": [
-            "grpc",
            "zlib",
            "openssl",
            "libcares"
--- a/config/lib.json
+++ b/config/lib.json
@@ -109,7 +109,8 @@
            "krb5"
        ],
        "lib-suggests-windows": [
-            "brotli"
+            "brotli",
+            "zstd"
        ],
        "frameworks": [
            "CoreFoundation",
@@ -142,7 +143,9 @@
            "zlib"
        ],
        "lib-suggests": [
-            "libpng"
+            "libpng",
+            "bzip2",
+            "brotli"
        ]
    },
    "gettext": {
@@ -352,9 +355,6 @@
        "static-libs-unix": [
            "libaom.a"
        ],
-        "static-libs-windows": [
-            "aom.lib"
-        ],
        "cpp-library": true
    },
    "libargon2": {
@@ -373,15 +373,6 @@
        ],
        "static-libs-windows": [
            "avif.lib"
-        ],
-        "lib-depends": [
-            "libaom"
-        ],
-        "lib-suggests": [
-            "libwebp",
-            "libjpeg",
-            "libxml2",
-            "libpng"
        ]
    },
    "libcares": {
@@ -493,7 +484,7 @@
        "static-libs-windows": [
            "libjpeg_a.lib"
        ],
-        "lib-depends": [
+        "lib-suggests-windows": [
            "zlib"
        ]
    },
@@ -528,18 +519,6 @@
            "maxminddb_config.h"
        ]
    },
-    "libmpdec": {
-        "source": "libmpdec",
-        "static-libs-unix": [
-            "libmpdec.a"
-        ],
-        "static-libs-windows": [
-            "libmpdec_a.lib"
-        ],
-        "headers": [
-            "mpdecimal.h"
-        ]
-    },
    "libmemcached": {
        "source": "libmemcached",
        "cpp-library": true,
@@ -774,6 +753,7 @@
            "xz"
        ],
        "lib-suggests-windows": [
+            "zstd",
            "openssl"
        ]
    },
@@ -873,9 +853,6 @@
    },
    "openssl": {
        "source": "openssl",
-        "pkg-configs": [
-            "openssl"
-        ],
        "static-libs-unix": [
            "libssl.a",
            "libcrypto.a"
@@ -988,11 +965,6 @@
    },
    "unixodbc": {
        "source": "unixodbc",
-        "pkg-configs": [
-            "odbc",
-            "odbccr",
-            "odbcinst"
-        ],
        "static-libs-unix": [
            "libodbc.a",
            "libodbccr.a",
@@ -1010,9 +982,6 @@
        ],
        "headers": [
            "wtr/watcher-c.h"
-        ],
-        "frameworks": [
-            "CoreServices"
        ]
    },
    "xz": {
@@ -1037,9 +1006,6 @@
    },
    "zlib": {
        "source": "zlib",
-        "pkg-configs": [
-            "zlib"
-        ],
        "static-libs-unix": [
            "libz.a"
        ],
@@ -1053,9 +1019,6 @@
    },
    "zstd": {
        "source": "zstd",
-        "pkg-configs": [
-            "libzstd"
-        ],
        "static-libs-unix": [
            "libzstd.a"
        ],
--- a/config/source.json
+++ b/config/source.json
@@ -84,25 +84,6 @@
            "path": "COPYING"
        }
    },
-    "ext-decimal": {
-        "type": "ghtagtar",
-        "repo": "php-decimal/ext-decimal",
-        "match": "v2\\.\\d.*",
-        "path": "php-src/ext/decimal",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "deepclone": {
-        "type": "ghtagtar",
-        "repo": "symfony/php-ext-deepclone",
-        "path": "php-src/ext/deepclone",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
    "dio": {
        "type": "url",
        "url": "https://pecl.php.net/get/dio",
@@ -246,7 +227,7 @@
    },
    "ext-rdkafka": {
        "type": "ghtar",
-        "repo": "php-rdkafka/php-rdkafka",
+        "repo": "arnaud-lb/php-rdkafka",
        "path": "php-src/ext/rdkafka",
        "license": {
            "type": "file",
@@ -380,7 +361,7 @@
    },
    "gmp": {
        "type": "filelist",
-        "url": "https://ftp.gnu.org/gnu/gmp/",
+        "url": "https://gmplib.org/download/gmp/",
        "regex": "/href=\"(?<file>gmp-(?<version>[^\"]+)\\.tar\\.xz)\"/",
        "provide-pre-built": true,
        "alt": {
@@ -481,8 +462,10 @@
        }
    },
    "krb5": {
-        "type": "url",
-        "url": "https://web.mit.edu/kerberos/dist/krb5/1.22/krb5-1.22.2.tar.gz",
+        "type": "ghtagtar",
+        "repo": "krb5/krb5",
+        "match": "krb5.+-final",
+        "prefer-stable": true,
        "license": {
            "type": "file",
            "path": "NOTICE"
@@ -543,7 +526,7 @@
    "libavif": {
        "type": "ghtar",
        "repo": "AOMediaCodec/libavif",
-        "provide-pre-built": false,
+        "provide-pre-built": true,
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -658,7 +641,6 @@
    "libjpeg": {
        "type": "ghtar",
        "repo": "libjpeg-turbo/libjpeg-turbo",
-        "prefer-stable": true,
        "license": {
            "type": "file",
            "path": "LICENSE.md"
@@ -700,14 +682,6 @@
            "path": "LICENSE"
        }
    },
-    "libmpdec": {
-        "type": "url",
-        "url": "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-4.0.1.tar.gz",
-        "license": {
-            "type": "file",
-            "path": "COPYRIGHT.txt"
-        }
-    },
    "libmemcached": {
        "type": "ghtagtar",
        "repo": "awesomized/libmemcached",
@@ -1000,7 +974,7 @@
    "openssl": {
        "type": "ghrel",
        "repo": "openssl/openssl",
-        "match": "openssl-3.+\\.tar\\.gz",
+        "match": "openssl.+\\.tar\\.gz",
        "prefer-stable": true,
        "alt": {
            "type": "filelist",
@@ -1080,7 +1054,7 @@
    },
    "protobuf": {
        "type": "url",
-        "url": "https://pecl.php.net/get/protobuf-5.34.1.tgz",
+        "url": "https://pecl.php.net/get/protobuf",
        "path": "php-src/ext/protobuf",
        "filename": "protobuf.tgz",
        "license": {
@@ -1194,6 +1168,7 @@
        "path": "php-src/ext/swoole",
        "type": "ghtar",
        "repo": "swoole/swoole-src",
+        "match": "v6\\.+",
        "prefer-stable": true,
        "license": {
            "type": "file",
--- a/docs/en/guide/action-build.md
+++ b/docs/en/guide/action-build.md
@@ -16,10 +16,8 @@ while also defining the extensions to compile.

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

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

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

 如果你选择了 `debug`，则会在构建时输出所有日志，包括编译的日志，以供排查错误。

--- a/phpstan.neon
+++ b/phpstan.neon
@@ -14,7 +14,6 @@ parameters:
    - PHP_OS_FAMILY
  excludePaths:
      analyseAndScan:
-            - ./src/globals/ext-tests/decimal.php
            - ./src/globals/ext-tests/swoole.php
            - ./src/globals/ext-tests/swoole.phpt
            - ./src/globals/test-extensions.php
--- 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.8.6';
+    public const string VERSION = '2.8.2';

    public function __construct()
    {
--- a/src/SPC/builder/Extension.php
+++ b/src/SPC/builder/Extension.php
@@ -11,9 +11,6 @@ use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
-use SPC\toolchain\ToolchainManager;
-use SPC\toolchain\ZigToolchain;
-use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;

@@ -99,8 +96,7 @@ class Extension
            fn ($x) => $x->getStaticLibFiles(),
            $this->getLibraryDependencies(recursive: true)
        );
-        $libs = implode(' ', $ret);
-        return deduplicate_flags($libs);
+        return implode(' ', $ret);
    }

    /**
@@ -234,7 +230,7 @@ class Extension
        if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
            $prefix = $matches[1];
            $currentLibs = trim($matches[2]);
-            $newLibs = clean_spaces("{$currentLibs} {$staticLibs} {$lstdcpp}");
+            $newLibs = trim("{$currentLibs} {$staticLibs} {$lstdcpp}");
            $deduplicatedLibs = deduplicate_flags($newLibs);

            FileSystem::replaceFileRegex(
@@ -546,11 +542,6 @@ class Extension
     */
    protected function getSharedExtensionEnv(): array
    {
-        $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
-        if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
-            GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
-        }
        $config = (new SPCConfigUtil($this->builder, ['no_php' => true]))->getExtensionConfig($this);
        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
        $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
--- a/src/SPC/builder/LibraryBase.php
+++ b/src/SPC/builder/LibraryBase.php
@@ -365,27 +365,6 @@ abstract class LibraryBase

    protected function isLibraryInstalled(): bool
    {
-        if ($pkg_configs = Config::getLib(static::NAME, 'pkg-configs', [])) {
-            $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
-            $search_paths = array_unique(array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path)));
-
-            foreach ($pkg_configs as $name) {
-                $found = false;
-                foreach ($search_paths as $path) {
-                    if (file_exists($path . "/{$name}.pc")) {
-                        $found = true;
-                        break;
-                    }
-                }
-                if (!$found) {
-                    return false;
-                }
-            }
-            // allow using system dependencies if pkg_config_path is explicitly defined
-            if (count($search_paths) > 1) {
-                return true;
-            }
-        }
        foreach (Config::getLib(static::NAME, 'static-libs', []) as $name) {
            if (!file_exists(BUILD_LIB_PATH . "/{$name}")) {
                return false;
--- a/src/SPC/builder/extension/decimal.php
+++ b/src/SPC/builder/extension/decimal.php
@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\store\FileSystem;
-use SPC\util\CustomExt;
-
-#[CustomExt('decimal')]
-class decimal extends Extension
-{
-    // TODO: remove this when https://github.com/php-decimal/ext-decimal/issues/92 is merged
-    public function patchBeforeBuildconf(): bool
-    {
-        FileSystem::replaceFileStr(
-            $this->source_dir . '/php_decimal.c',
-            [
-                'zend_module_entry decimal_module_entry',
-                'ZEND_GET_MODULE(decimal)',
-            ],
-            [
-                'zend_module_entry php_decimal_module_entry',
-                'ZEND_GET_MODULE(php_decimal)',
-            ]
-        );
-        FileSystem::replaceFileStr(
-            $this->source_dir . '/config.w32',
-            'ARG_WITH("decimal", "for decimal support", "no");',
-            'ARG_WITH("decimal", "for decimal support",  "no");' . "\n" .
-            'ADD_EXTENSION_DEP("decimal", "json");'
-        );
-        return true;
-    }
-
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        return '--enable-decimal --with-libmpdec-path="' . BUILD_ROOT_PATH . '"';
-    }
-
-    public function getWindowsConfigureArg(bool $shared = false): string
-    {
-        return '--with-decimal';
-    }
-}
--- a/src/SPC/builder/extension/ffi.php
+++ b/src/SPC/builder/extension/ffi.php
@@ -5,21 +5,11 @@ declare(strict_types=1);
 namespace SPC\builder\extension;

 use SPC\builder\Extension;
-use SPC\builder\linux\SystemUtil;
-use SPC\store\SourcePatcher;
 use SPC\util\CustomExt;

 #[CustomExt('ffi')]
 class ffi extends Extension
 {
-    public function patchBeforeBuildconf(): bool
-    {
-        if (PHP_OS_FAMILY === 'Linux' && SystemUtil::getOSRelease()['dist'] === 'centos') {
-            return SourcePatcher::patchFfiCentos7FixO3strncmp();
-        }
-        return false;
-    }
-
    public function getUnixConfigureArg(bool $shared = false): string
    {
        return '--with-ffi' . ($shared ? '=shared' : '') . ' --enable-zend-signals';
--- a/src/SPC/builder/extension/grpc.php
+++ b/src/SPC/builder/extension/grpc.php
@@ -11,6 +11,7 @@ use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
+use SPC\util\SPCTarget;

 #[CustomExt('grpc')]
 class grpc extends Extension
@@ -20,59 +21,18 @@ class grpc extends Extension
        if ($this->builder instanceof WindowsBuilder) {
            throw new ValidationException('grpc extension does not support windows yet');
        }
-
-        // Fix deprecated PHP API usage in call.c
        FileSystem::replaceFileStr(
-            "{$this->source_dir}/src/php/ext/grpc/call.c",
+            $this->source_dir . '/src/php/ext/grpc/call.c',
            'zend_exception_get_default(TSRMLS_C),',
            'zend_ce_exception,',
        );
-
-        // Fix include path conflict with pdo_sqlsrv: grpc's PHP ext dir is added to the global include path via
-        $grpc_php_dir = "{$this->source_dir}/src/php/ext/grpc";
-        if (file_exists("{$grpc_php_dir}/version.h")) {
-            copy("{$grpc_php_dir}/version.h", "{$grpc_php_dir}/php_grpc_version.h");
-            unlink("{$grpc_php_dir}/version.h");
-            FileSystem::replaceFileStr("{$grpc_php_dir}/php_grpc.h", '#include "version.h"', '#include "php_grpc_version.h"');
-            FileSystem::replaceFileStr("{$grpc_php_dir}/php_grpc.c", '#include "version.h"', '#include "php_grpc_version.h"');
+        if (SPCTarget::getTargetOS() === 'Darwin') {
+            FileSystem::replaceFileRegex(
+                $this->source_dir . '/config.m4',
+                '/GRPC_LIBDIR=.*$/m',
+                'GRPC_LIBDIR=' . BUILD_LIB_PATH . "\n" . 'LDFLAGS="$LDFLAGS -framework CoreFoundation"'
+            );
        }
-
-        $config_m4 = <<<'M4'
-PHP_ARG_ENABLE(grpc, [whether to enable grpc support], [AS_HELP_STRING([--enable-grpc], [Enable grpc support])])
-
-if test "$PHP_GRPC" != "no"; then
-  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/include)
-  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/php/ext/grpc)
-  GRPC_LIBDIR=@@build_lib_path@@
-  PHP_ADD_LIBPATH($GRPC_LIBDIR)
-  PHP_ADD_LIBRARY(grpc,,GRPC_SHARED_LIBADD)
-  LIBS="-lpthread $LIBS"
-  PHP_ADD_LIBRARY(pthread)
-
-  case $host in
-    *darwin*)
-      PHP_ADD_LIBRARY(c++,1,GRPC_SHARED_LIBADD)
-      ;;
-    *)
-      PHP_ADD_LIBRARY(stdc++,1,GRPC_SHARED_LIBADD)
-      PHP_ADD_LIBRARY(rt,,GRPC_SHARED_LIBADD)
-      PHP_ADD_LIBRARY(rt)
-      ;;
-    esac
-
-  PHP_NEW_EXTENSION(grpc, @grpc_c_files@, $ext_shared, , -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1)
-  PHP_SUBST(GRPC_SHARED_LIBADD)
-  PHP_INSTALL_HEADERS([ext/grpc], [php_grpc.h])
-fi
-M4;
-        $replace = get_pack_replace();
-        // load grpc c files from src/php/ext/grpc
-        $c_files = glob($this->source_dir . '/src/php/ext/grpc/*.c');
-        $replace['@grpc_c_files@'] = implode(" \\\n    ", array_map(fn ($f) => 'src/php/ext/grpc/' . basename($f), $c_files));
-        $config_m4 = str_replace(array_keys($replace), array_values($replace), $config_m4);
-        file_put_contents($this->source_dir . '/config.m4', $config_m4);
-
-        copy($this->source_dir . '/src/php/ext/grpc/php_grpc.h', $this->source_dir . '/php_grpc.h');
        return true;
    }

@@ -88,6 +48,7 @@ M4;
    public function patchBeforeMake(): bool
    {
        parent::patchBeforeMake();
+        // add -Wno-strict-prototypes
        GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -Wno-strict-prototypes');
        return true;
    }
--- a/src/SPC/builder/extension/mongodb.php
+++ b/src/SPC/builder/extension/mongodb.php
@@ -5,22 +5,11 @@ declare(strict_types=1);
 namespace SPC\builder\extension;

 use SPC\builder\Extension;
-use SPC\store\FileSystem;
 use SPC\util\CustomExt;

 #[CustomExt('mongodb')]
 class mongodb extends Extension
 {
-    public function patchBeforeBuildconf(): bool
-    {
-        FileSystem::replaceFileRegex(
-            SOURCE_PATH . '/php-src/ext/mongodb/config.m4',
-            '/^(\s+)(src\/libmongoc\/)/m',
-            '$1${ac_config_dir}/$2'
-        );
-        return true;
-    }
-
    public function getUnixConfigureArg(bool $shared = false): string
    {
        $arg = ' --enable-mongodb' . ($shared ? '=shared' : '') . ' ';
--- a/src/SPC/builder/extension/password_argon2.php
+++ b/src/SPC/builder/extension/password_argon2.php
@@ -26,7 +26,7 @@ class password_argon2 extends Extension

    public function getConfigureArg(bool $shared = false): string
    {
-        if ($this->builder->getExt('openssl')?->isBuildStatic() || $this->isBuildShared()) {
+        if ($this->builder->getLib('openssl') !== null) {
            if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
                return '--without-password-argon2'; // use --with-openssl-argon2 in openssl extension instead
            }
--- a/src/SPC/builder/extension/sqlsrv.php
+++ b/src/SPC/builder/extension/sqlsrv.php
@@ -33,14 +33,4 @@ class sqlsrv extends Extension
        }
        return false;
    }
-
-    public function patchBeforeMake(): bool
-    {
-        $makefile = SOURCE_PATH . '/php-src/Makefile';
-        $makeContent = file_get_contents($makefile);
-        $makeContent = preg_replace('/^(CFLAGS_(?:PDO_)?SQLSRV=.*?)\s+\/W4\b/m', '$1', $makeContent);
-        $makeContent = preg_replace('/^(CFLAGS_(?:PDO_)?SQLSRV=.*?)\s+\/WX\b/m', '$1', $makeContent);
-        file_put_contents($makefile, $makeContent);
-        return true;
-    }
 }
--- a/src/SPC/builder/extension/swoole.php
+++ b/src/SPC/builder/extension/swoole.php
@@ -50,16 +50,19 @@ class swoole extends Extension

        // commonly used feature: coroutine-time
        $arg .= ' --enable-swoole-coro-time --with-pic';
-        $arg .= ' --enable-swoole-ssh --enable-swoole-curl';

        $arg .= $this->builder->getOption('enable-zts') ? ' --enable-swoole-thread --disable-thread-context' : ' --disable-swoole-thread --enable-thread-context';

+        // required features: curl, openssl (but curl hook is buggy for php 8.0)
+        $arg .= $this->builder->getPHPVersionID() >= 80100 ? ' --enable-swoole-curl' : ' --disable-swoole-curl';
+        $arg .= ' --enable-openssl';
+
        // additional features that only require libraries
        $arg .= $this->builder->getLib('libcares') ? ' --enable-cares' : '';
        $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : '';
        $arg .= $this->builder->getLib('nghttp2') ? (' --with-nghttp2-dir=' . BUILD_ROOT_PATH) : '';
        $arg .= $this->builder->getLib('zstd') ? ' --enable-zstd' : '';
-        $arg .= $this->builder->getLib('liburing') && getenv('SPC_LIBC') !== 'glibc' ? ' --enable-iouring --enable-uring-socket' : '--disable-iouring';
+        $arg .= $this->builder->getLib('liburing') ? ' --enable-iouring' : '';
        $arg .= $this->builder->getExt('sockets') ? ' --enable-sockets' : '';

        // enable additional features that require the pdo extension, but conflict with pdo_* extensions
@@ -71,7 +74,6 @@ class swoole extends Extension
            $config = (new SPCConfigUtil($this->builder))->getLibraryConfig($this->builder->getLib('unixodbc'));
            $arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"';
        }
-        $arg .= $this->builder->getExt('ftp')?->isBuildStatic() ? ' --disable-swoole-ftp' : ' --enable-swoole-ftp';

        if ($this->getExtVersion() >= '6.1.0') {
            $arg .= ' --enable-swoole-stdext';
--- a/src/SPC/builder/extension/xlswriter.php
+++ b/src/SPC/builder/extension/xlswriter.php
@@ -7,7 +7,6 @@ namespace SPC\builder\extension;
 use SPC\builder\Extension;
 use SPC\store\SourcePatcher;
 use SPC\util\CustomExt;
-use SPC\util\GlobalEnvManager;

 #[CustomExt('xlswriter')]
 class xlswriter extends Extension
@@ -29,13 +28,6 @@ class xlswriter extends Extension
    public function patchBeforeMake(): bool
    {
        $patched = parent::patchBeforeMake();
-
-        // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
-        if (PHP_OS_FAMILY !== 'Windows') {
-            GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');
-            $patched = true;
-        }
-
        if (PHP_OS_FAMILY === 'Windows') {
            // fix windows build with openssl extension duplicate symbol bug
            SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $this->source_dir);
@@ -48,10 +40,4 @@ class xlswriter extends Extension
        }
        return $patched;
    }
-
-    // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
-    protected function getExtraEnv(): array
-    {
-        return ['CFLAGS' => '-std=gnu17'];
-    }
 }
--- a/src/SPC/builder/freebsd/library/libmpdec.php
+++ b/src/SPC/builder/freebsd/library/libmpdec.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\freebsd\library;
-
-class libmpdec extends BSDLibraryBase
-{
-    use \SPC\builder\unix\library\libmpdec;
-
-    public const NAME = 'libmpdec';
-}
--- a/src/SPC/builder/linux/LinuxBuilder.php
+++ b/src/SPC/builder/linux/LinuxBuilder.php
@@ -11,8 +11,6 @@ use SPC\store\Config;
 use SPC\store\DirDiff;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
-use SPC\toolchain\ToolchainManager;
-use SPC\toolchain\ZigToolchain;
 use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;
@@ -67,8 +65,7 @@ class LinuxBuilder extends UnixBuilderBase
            // php 8.5 contains opcache extension by default,
            // if opcache_jit is enabled for 8.5 or opcache enabled,
            // we need to disable undefined behavior sanitizer.
-            $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
-            f_putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
+            f_putenv('SPC_COMPILER_EXTRA=-fno-sanitize=undefined');
        }

        if ($this->getOption('enable-zts', false)) {
@@ -165,7 +162,7 @@ class LinuxBuilder extends UnixBuilderBase
                throw new WrongUsageException(
                    "You're building against musl libc statically (the default on Linux), but you're trying to build shared extensions.\n" .
                    'Static musl libc does not implement `dlopen`, so your php binary is not able to load shared extensions.' . "\n" .
-                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc` or use SPC_MUSL_DYNAMIC=true on alpine.'
+                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, or use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc`.'
                );
            }
            logger()->info('Building shared extensions...');
@@ -269,11 +266,6 @@ class LinuxBuilder extends UnixBuilderBase
     */
    protected function buildEmbed(): void
    {
-        $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
-        if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
-            GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
-        }
        $sharedExts = array_filter($this->exts, static fn ($ext) => $ext->isBuildShared());
        $sharedExts = array_filter($sharedExts, static function ($ext) {
            return Config::getExt($ext->getName(), 'build-with-php') === true;
--- a/src/SPC/builder/linux/library/libmpdec.php
+++ b/src/SPC/builder/linux/library/libmpdec.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\linux\library;
-
-class libmpdec extends LinuxLibraryBase
-{
-    use \SPC\builder\unix\library\libmpdec;
-
-    public const NAME = 'libmpdec';
-}
--- a/src/SPC/builder/macos/library/libmpdec.php
+++ b/src/SPC/builder/macos/library/libmpdec.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\macos\library;
-
-class libmpdec extends MacOSLibraryBase
-{
-    use \SPC\builder\unix\library\libmpdec;
-
-    public const NAME = 'libmpdec';
-}
--- a/src/SPC/builder/traits/UnixSystemUtilTrait.php
+++ b/src/SPC/builder/traits/UnixSystemUtilTrait.php
@@ -50,7 +50,7 @@ trait UnixSystemUtilTrait
        $defined = array_unique($defined);
        sort($defined);
        // export
-        if (SPCTarget::getTargetOS() === 'Linux' && ToolchainManager::getToolchainClass() !== ZigToolchain::class) {
+        if (SPCTarget::getTargetOS() === 'Linux') {
            file_put_contents("{$lib_file}.dynsym", "{\n" . implode("\n", array_map(fn ($x) => "  {$x};", $defined)) . "};\n");
        } else {
            file_put_contents("{$lib_file}.dynsym", implode("\n", $defined) . "\n");
--- a/src/SPC/builder/unix/UnixBuilderBase.php
+++ b/src/SPC/builder/unix/UnixBuilderBase.php
@@ -365,7 +365,6 @@ abstract class UnixBuilderBase extends BuilderBase
        $frankenphpAppPath = $this->getOption('with-frankenphp-app');

        if ($frankenphpAppPath) {
-            $frankenphpAppPath = trim($frankenphpAppPath, "\"'");
            if (!is_dir($frankenphpAppPath)) {
                throw new WrongUsageException("The path provided to --with-frankenphp-app is not a valid directory: {$frankenphpAppPath}");
            }
@@ -456,17 +455,14 @@ abstract class UnixBuilderBase extends BuilderBase
            'CGO_LDFLAGS' => "{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs}",
            'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
                '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' .
-                '-X \'github.com/caddyserver/caddy/v2/modules/caddyhttp.ServerHeader=FrankenPHP Caddy\' ' .
-                '-X \'github.com/caddyserver/caddy/v2.CustomBinaryName=frankenphp\' ' .
                '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .
                "v{$frankenPhpVersion} PHP {$libphpVersion} Caddy'\\\" " .
                "-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
        ], ...GoXcaddy::getEnvironment()];
-        $pgo = file_exists("{$frankenphpSourceDir}/caddy/frankenphp/default.pgo") ? "--pgo {$frankenphpSourceDir}/caddy/frankenphp/default.pgo " : '';
        shell()->cd(BUILD_BIN_PATH)
            ->setEnv($env)
-            ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddyModules}");
+            ->exec("xcaddy build --output frankenphp {$xcaddyModules}");

        $this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP);
    }
--- a/src/SPC/builder/unix/library/curl.php
+++ b/src/SPC/builder/unix/library/curl.php
@@ -4,7 +4,6 @@ declare(strict_types=1);

 namespace SPC\builder\unix\library;

-use SPC\store\FileSystem;
 use SPC\util\executor\UnixCMakeExecutor;

 trait curl
@@ -33,16 +32,8 @@ trait curl
            )
            ->build();

+        // patch pkgconf
        $this->patchPkgconfPrefix(['libcurl.pc']);
-        // On glibc <2.28 without built-in pthreads, FindThreads sets
-        // INTERFACE_LINK_LIBRARIES to '-lpthread'
-        // curls .pc generator walks and prepends '-l' to each
-        // entry, resulting in -l-lpthread
-        FileSystem::replaceFileRegex(
-            BUILD_LIB_PATH . '/pkgconfig/libcurl.pc',
-            '/-l(-l\S+)/',
-            '$1'
-        );
        shell()->cd(BUILD_LIB_PATH . '/cmake/CURL/')
            ->exec("sed -ie 's|\"/lib/libcurl.a\"|\"" . BUILD_LIB_PATH . "/libcurl.a\"|g' CURLTargets-release.cmake");
    }
--- a/src/SPC/builder/unix/library/freetype.php
+++ b/src/SPC/builder/unix/library/freetype.php
@@ -13,8 +13,8 @@ trait freetype
    {
        $cmake = UnixCMakeExecutor::create($this)
            ->optionalLib('libpng', ...cmake_boolean_args('FT_DISABLE_PNG', true))
-            ->addConfigureArgs('-DFT_DISABLE_BZIP2=ON')
-            ->addConfigureArgs('-DFT_DISABLE_BROTLI=ON')
+            ->optionalLib('bzip2', ...cmake_boolean_args('FT_DISABLE_BZIP2', true))
+            ->optionalLib('brotli', ...cmake_boolean_args('FT_DISABLE_BROTLI', true))
            ->addConfigureArgs('-DFT_DISABLE_HARFBUZZ=ON');

        // fix cmake 4.0 compatibility
--- a/src/SPC/builder/unix/library/krb5.php
+++ b/src/SPC/builder/unix/library/krb5.php
@@ -4,8 +4,6 @@ declare(strict_types=1);

 namespace SPC\builder\unix\library;

-use SPC\toolchain\ToolchainManager;
-use SPC\toolchain\ZigToolchain;
 use SPC\util\executor\UnixAutoconfExecutor;
 use SPC\util\SPCConfigUtil;

@@ -15,10 +13,7 @@ trait krb5
    {
        $origin_source_dir = $this->source_dir;
        $this->source_dir .= '/src';
-        shell()->cd($this->source_dir)->exec('ls -lah');
-        if (!file_exists($this->source_dir . '/configure')) {
-            shell()->cd($this->source_dir)->exec('autoreconf -if');
-        }
+        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));
@@ -41,16 +36,12 @@ trait krb5
            $extraEnv['LDFLAGS'] = '-framework Kerberos';
            $args[] = 'ac_cv_func_secure_getenv=no';
        }
-        $make = UnixAutoconfExecutor::create($this)
+        UnixAutoconfExecutor::create($this)
            ->appendEnv($extraEnv)
            ->optionalLib('ldap', '--with-ldap', '--without-ldap')
            ->optionalLib('libedit', '--with-libedit', '--without-libedit')
-            ->configure(...$args);
-
-        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $make->exec('find . -name Makefile -exec sed -i "s/-Werror=incompatible-pointer-types//g" {} +');
-        }
-        $make->make();
+            ->configure(...$args)
+            ->make();
        $this->patchPkgconfPrefix([
            'krb5-gssapi.pc',
            'krb5.pc',
--- a/src/SPC/builder/unix/library/libavif.php
+++ b/src/SPC/builder/unix/library/libavif.php
@@ -11,11 +11,6 @@ trait libavif
    protected function build(): void
    {
        UnixCMakeExecutor::create($this)
-            ->optionalLib('libaom', '-DAVIF_CODEC_AOM=SYSTEM', '-DAVIF_CODEC_AOM=OFF')
-            ->optionalLib('libsharpyuv', '-DAVIF_LIBSHARPYUV=SYSTEM', '-DAVIF_LIBSHARPYUV=OFF')
-            ->optionalLib('libjpeg', '-DAVIF_JPEG=SYSTEM', '-DAVIF_JPEG=OFF')
-            ->optionalLib('libxml2', '-DAVIF_LIBXML2=SYSTEM', '-DAVIF_LIBXML2=OFF')
-            ->optionalLib('libpng', '-DAVIF_LIBPNG=SYSTEM', '-DAVIF_LIBPNG=OFF')
            ->addConfigureArgs('-DAVIF_LIBYUV=OFF')
            ->build();
        // patch pkgconfig
--- a/src/SPC/builder/unix/library/libde265.php
+++ b/src/SPC/builder/unix/library/libde265.php
@@ -11,11 +11,7 @@ trait libde265
    protected function build(): void
    {
        UnixCMakeExecutor::create($this)
-            ->addConfigureArgs(
-                '-DENABLE_SDL=OFF',
-                '-DENABLE_DECODER=OFF',
-                '-DHAVE_NEON=OFF',
-            )
+            ->addConfigureArgs('-DENABLE_SDL=OFF')
            ->build();
        $this->patchPkgconfPrefix(['libde265.pc']);
    }
--- a/src/SPC/builder/unix/library/libjpeg.php
+++ b/src/SPC/builder/unix/library/libjpeg.php
@@ -14,10 +14,6 @@ trait libjpeg
            ->addConfigureArgs(
                '-DENABLE_STATIC=ON',
                '-DENABLE_SHARED=OFF',
-                '-DWITH_SYSTEM_ZLIB=ON',
-                '-DWITH_TOOLS=OFF',
-                '-DWITH_TESTS=OFF',
-                '-DWITH_SIMD=OFF',
            )
            ->build();
        // patch pkgconfig
--- a/src/SPC/builder/unix/library/libmpdec.php
+++ b/src/SPC/builder/unix/library/libmpdec.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\util\executor\UnixAutoconfExecutor;
-
-trait libmpdec
-{
-    protected function build(): void
-    {
-        UnixAutoconfExecutor::create($this)
-            ->configure('--disable-cxx --disable-shared --enable-static')
-            ->make();
-    }
-}
--- a/src/SPC/builder/unix/library/postgresql.php
+++ b/src/SPC/builder/unix/library/postgresql.php
@@ -93,7 +93,8 @@ trait postgresql

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

        FileSystem::replaceFileStr("{$this->getLibDir()}/pkgconfig/libpq.pc", '-lldap', '-lldap -llber');
--- a/src/SPC/builder/unix/library/unixodbc.php
+++ b/src/SPC/builder/unix/library/unixodbc.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace SPC\builder\unix\library;

 use SPC\exception\WrongUsageException;
-use SPC\store\FileSystem;
 use SPC\util\executor\UnixAutoconfExecutor;

 trait unixodbc
@@ -31,15 +30,7 @@ trait unixodbc
                '--enable-gui=no',
            )
            ->make();
-        $pkgConfigs = ['odbc.pc', 'odbccr.pc', 'odbcinst.pc'];
-        $this->patchPkgconfPrefix($pkgConfigs);
-        foreach ($pkgConfigs as $file) {
-            FileSystem::replaceFileStr(
-                BUILD_LIB_PATH . "/pkgconfig/{$file}",
-                '$(top_build_prefix)libltdl/libltdlc.la',
-                ''
-            );
-        }
+        $this->patchPkgconfPrefix(['odbc.pc', 'odbccr.pc', 'odbcinst.pc']);
        $this->patchLaDependencyPrefix();
    }
 }
--- a/src/SPC/builder/windows/library/brotli.php
+++ b/src/SPC/builder/windows/library/brotli.php
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\windows\library;
-
-use SPC\store\FileSystem;
-
-class brotli extends WindowsLibraryBase
-{
-    public const NAME = 'brotli';
-
-    protected function build(): void
-    {
-        // reset cmake
-        FileSystem::resetDir($this->source_dir . '\build');
-
-        // start build
-        cmd()->cd($this->source_dir)
-            ->execWithWrapper(
-                $this->builder->makeSimpleWrapper('cmake'),
-                '-B build ' .
-                '-A x64 ' .
-                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
-                '-DCMAKE_BUILD_TYPE=Release ' .
-                '-DBUILD_SHARED_LIBS=OFF ' .
-                '-DBROTLI_BUILD_TOOLS=OFF ' .
-                '-DBROTLI_BUNDLED_MODE=OFF ' .
-                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
-            )
-            ->execWithWrapper(
-                $this->builder->makeSimpleWrapper('cmake'),
-                "--build build --config Release --target install -j{$this->builder->concurrency}"
-            );
-    }
-}
--- a/src/SPC/builder/windows/library/freetype.php
+++ b/src/SPC/builder/windows/library/freetype.php
@@ -24,8 +24,6 @@ class freetype extends WindowsLibraryBase
                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
                '-DCMAKE_BUILD_TYPE=Release ' .
                '-DBUILD_SHARED_LIBS=OFF ' .
-                '-DFT_DISABLE_BROTLI=TRUE ' .
-                '-DFT_DISABLE_BZIP2=TRUE ' .
                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
            )
            ->execWithWrapper(
--- a/src/SPC/builder/windows/library/icu_static_win.php
+++ b/src/SPC/builder/windows/library/icu_static_win.php
@@ -12,16 +12,16 @@ class icu_static_win extends WindowsLibraryBase

    protected function build(): void
    {
-        copy("{$this->source_dir}\\lib\\icudt.lib", "{$this->getLibDir()}\\icudt.lib");
-        copy("{$this->source_dir}\\lib\\icuin.lib", "{$this->getLibDir()}\\icuin.lib");
-        copy("{$this->source_dir}\\lib\\icuio.lib", "{$this->getLibDir()}\\icuio.lib");
-        copy("{$this->source_dir}\\lib\\icuuc.lib", "{$this->getLibDir()}\\icuuc.lib");
+        copy("{$this->source_dir}\\x64-windows-static\\lib\\icudt.lib", "{$this->getLibDir()}\\icudt.lib");
+        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuin.lib", "{$this->getLibDir()}\\icuin.lib");
+        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuio.lib", "{$this->getLibDir()}\\icuio.lib");
+        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuuc.lib", "{$this->getLibDir()}\\icuuc.lib");

        // create libpq folder in buildroot/includes/libpq
        if (!file_exists("{$this->getIncludeDir()}\\unicode")) {
            mkdir("{$this->getIncludeDir()}\\unicode");
        }

-        FileSystem::copyDir("{$this->source_dir}\\include\\unicode", "{$this->getIncludeDir()}\\unicode");
+        FileSystem::copyDir("{$this->source_dir}\\x64-windows-static\\include\\unicode", "{$this->getIncludeDir()}\\unicode");
    }
 }
--- a/src/SPC/builder/windows/library/libaom.php
+++ b/src/SPC/builder/windows/library/libaom.php
@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\windows\library;
-
-use SPC\store\FileSystem;
-
-class libaom extends WindowsLibraryBase
-{
-    public const NAME = 'libaom';
-
-    protected function build(): void
-    {
-        // libaom source tree contains a build/cmake/ directory with its own
-        // cmake modules, so we must use a different name for the build dir.
-        FileSystem::resetDir($this->source_dir . '\builddir');
-
-        // start build
-        cmd()->cd($this->source_dir)
-            ->execWithWrapper(
-                $this->builder->makeSimpleWrapper('cmake'),
-                '-S . -B builddir ' .
-                '-A x64 ' .
-                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
-                '-DCMAKE_BUILD_TYPE=Release ' .
-                '-DBUILD_SHARED_LIBS=OFF ' .
-                '-DAOM_TARGET_CPU=generic ' .
-                '-DENABLE_DOCS=OFF ' .
-                '-DENABLE_EXAMPLES=OFF ' .
-                '-DENABLE_TESTDATA=OFF ' .
-                '-DENABLE_TESTS=OFF ' .
-                '-DENABLE_TOOLS=OFF ' .
-                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
-            )
-            ->execWithWrapper(
-                $this->builder->makeSimpleWrapper('cmake'),
-                "--build builddir --config Release --target install -j{$this->builder->concurrency}"
-            );
-    }
-}
--- a/src/SPC/builder/windows/library/libjpeg.php
+++ b/src/SPC/builder/windows/library/libjpeg.php
@@ -28,7 +28,6 @@ class libjpeg extends WindowsLibraryBase
                '-DENABLE_STATIC=ON ' .
                '-DBUILD_TESTING=OFF ' .
                '-DWITH_JAVA=OFF ' .
-                '-DWITH_SIMD=OFF ' .
                '-DWITH_CRT_DLL=OFF ' .
                "-DENABLE_ZLIB_COMPRESSION={$zlib} " .
                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
--- a/src/SPC/builder/windows/library/libmpdec.php
+++ b/src/SPC/builder/windows/library/libmpdec.php
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\windows\library;
-
-class libmpdec extends WindowsLibraryBase
-{
-    public const NAME = 'libmpdec';
-
-    protected function build(): void
-    {
-        $makefile_dir = $this->source_dir . '\libmpdec';
-        $nmake = $this->builder->makeSimpleWrapper('nmake /nologo');
-
-        cmd()->cd($makefile_dir)
-            ->exec('copy /y Makefile.vc Makefile')
-            ->execWithWrapper($nmake, 'clean')
-            ->execWithWrapper($nmake, 'MACHINE=x64');
-
-        // Copy static lib (rename from versioned name to libmpdec_a.lib)
-        $libs = glob($makefile_dir . '\libmpdec-*.lib');
-        foreach ($libs as $lib) {
-            if (!str_contains($lib, '.dll.')) {
-                copy($lib, BUILD_LIB_PATH . '\libmpdec_a.lib');
-                break;
-            }
-        }
-        copy($makefile_dir . '\mpdecimal.h', BUILD_INCLUDE_PATH . '\mpdecimal.h');
-    }
-}
--- a/src/SPC/builder/windows/library/ngtcp2.php
+++ b/src/SPC/builder/windows/library/ngtcp2.php
@@ -29,7 +29,6 @@ class ngtcp2 extends WindowsLibraryBase
                '-DBUILD_SHARED_LIBS=OFF ' .
                '-DENABLE_STATIC_CRT=ON ' .
                '-DENABLE_LIB_ONLY=ON ' .
-                '-DENABLE_OPENSSL=OFF ' .
                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
            )
            ->execWithWrapper(
--- a/src/SPC/builder/windows/library/postgresql_win.php
+++ b/src/SPC/builder/windows/library/postgresql_win.php
@@ -10,9 +10,9 @@ class postgresql_win extends WindowsLibraryBase

    protected function build(): void
    {
-        copy($this->source_dir . '\lib\libpq.lib', BUILD_LIB_PATH . '\libpq.lib');
-        copy($this->source_dir . '\lib\libpgport.lib', BUILD_LIB_PATH . '\libpgport.lib');
-        copy($this->source_dir . '\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');
+        copy($this->source_dir . '\pgsql\lib\libpq.lib', BUILD_LIB_PATH . '\libpq.lib');
+        copy($this->source_dir . '\pgsql\lib\libpgport.lib', BUILD_LIB_PATH . '\libpgport.lib');
+        copy($this->source_dir . '\pgsql\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');

        // create libpq folder in buildroot/includes/libpq
        if (!file_exists(BUILD_INCLUDE_PATH . '\libpq')) {
@@ -21,7 +21,7 @@ class postgresql_win extends WindowsLibraryBase

        $headerFiles = ['libpq-fe.h', 'postgres_ext.h', 'pg_config_ext.h', 'libpq\libpq-fs.h'];
        foreach ($headerFiles as $header) {
-            copy($this->source_dir . '\include\\' . $header, BUILD_INCLUDE_PATH . '\\' . $header);
+            copy($this->source_dir . '\pgsql\include\\' . $header, BUILD_INCLUDE_PATH . '\\' . $header);
        }
    }
 }
--- a/src/SPC/builder/windows/library/zlib.php
+++ b/src/SPC/builder/windows/library/zlib.php
@@ -31,24 +31,8 @@ class zlib extends WindowsLibraryBase
                $this->builder->makeSimpleWrapper('cmake'),
                "--build build --config Release --target install -j{$this->builder->concurrency}"
            );
-        $detect_list = [
-            'zlibstatic.lib',
-            'zs.lib',
-            'libzs.lib',
-            'libz.lib',
-        ];
-        foreach ($detect_list as $item) {
-            if (file_exists(BUILD_LIB_PATH . '\\' . $item)) {
-                FileSystem::copy(BUILD_LIB_PATH . '\\' . $item, BUILD_LIB_PATH . '\zlib_a.lib');
-                FileSystem::copy(BUILD_LIB_PATH . '\\' . $item, BUILD_LIB_PATH . '\zlibstatic.lib');
-                break;
-            }
-        }
-        FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '\bin\zlib.dll');
-        FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\zlib.lib');
-        FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\libz.dll');
-        FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\libz.lib');
-        FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\z.lib');
-        FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\z.dll');
+        copy(BUILD_LIB_PATH . '\zlibstatic.lib', BUILD_LIB_PATH . '\zlib_a.lib');
+        unlink(BUILD_ROOT_PATH . '\bin\zlib.dll');
+        unlink(BUILD_LIB_PATH . '\zlib.lib');
    }
 }
--- a/src/SPC/command/DownloadCommand.php
+++ b/src/SPC/command/DownloadCommand.php
@@ -30,7 +30,7 @@ class DownloadCommand extends BaseCommand
        $this->addArgument('sources', InputArgument::REQUIRED, 'The sources will be compiled, comma separated');
        $this->addOption('shallow-clone', null, null, 'Clone shallow');
        $this->addOption('with-openssl11', null, null, 'Use openssl 1.1');
-        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format (default 8.5)', '8.5');
+        $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"');
--- a/src/SPC/doctor/item/LinuxToolCheckList.php
+++ b/src/SPC/doctor/item/LinuxToolCheckList.php
@@ -109,7 +109,7 @@ class LinuxToolCheckList
    public function fixBuildTools(array $distro, array $missing): bool
    {
        $install_cmd = match ($distro['dist']) {
-            'ubuntu', 'debian', 'linuxmint', 'Deepin' => 'apt-get install -y',
+            'ubuntu', 'debian', 'Deepin' => 'apt-get install -y',
            'alpine' => 'apk add',
            'redhat' => 'dnf install -y',
            'centos' => 'yum install -y',
--- a/src/SPC/store/Downloader.php
+++ b/src/SPC/store/Downloader.php
@@ -98,50 +98,31 @@ class Downloader
    {
        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']}",
+            hooks: [[CurlHook::class, 'setupGithubToken']],
+            retries: self::getRetryAttempts()
+        ), true, 512, JSON_THROW_ON_ERROR);

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

        return [$url, $filename];
--- a/src/SPC/store/FileSystem.php
+++ b/src/SPC/store/FileSystem.php
@@ -152,7 +152,7 @@ class FileSystem
        $src_path = FileSystem::convertPath($from);
        switch (PHP_OS_FAMILY) {
            case 'Windows':
-                f_passthru('xcopy "' . $src_path . '" "' . $dst_path . '" /s/e/y/i');
+                f_passthru('xcopy "' . $src_path . '" "' . $dst_path . '" /s/e/v/y/i');
                break;
            case 'Linux':
            case 'Darwin':
--- a/src/SPC/store/SourcePatcher.php
+++ b/src/SPC/store/SourcePatcher.php
@@ -22,7 +22,7 @@ class SourcePatcher
        FileSystem::addSourceExtractHook('swoole', [__CLASS__, 'patchSwoole']);
        FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchPhpLibxml212']);
        FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchGDWin32']);
-        // FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchFfiCentos7FixO3strncmp']);
+        FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchFfiCentos7FixO3strncmp']);
        FileSystem::addSourceExtractHook('sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
        FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
        FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVPhp85']);
@@ -95,10 +95,6 @@ class SourcePatcher
        // patch php-src/build/php.m4 PKG_CHECK_MODULES -> PKG_CHECK_MODULES_STATIC
        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/build/php.m4', 'PKG_CHECK_MODULES(', 'PKG_CHECK_MODULES_STATIC(');

-        if ($builder->getPHPVersionID() >= 80300 && $builder->getPHPVersionID() < 80400) {
-            self::patchFile('spc_fix_avx512_cache_before_80400.patch', SOURCE_PATH . '/php-src');
-        }
-
        if ($builder->getOption('enable-micro-win32')) {
            self::patchMicroWin32();
        } else {
@@ -129,15 +125,6 @@ class SourcePatcher
            FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/configure', '/have_capstone="yes"/', 'have_capstone="no"');
        }

-        // PHP 8.2 and below: bcmath libbcmath uses K&R style C function
-        if (is_unix() && $builder->getPHPVersionID() < 80300) {
-            FileSystem::replaceFileStr(
-                SOURCE_PATH . '/php-src/configure',
-                "for ac_arg in '' -std=gnu23",
-                "for ac_arg in '' -std=gnu17",
-            );
-        }
-
        if (file_exists(SOURCE_PATH . '/php-src/configure.ac.bak')) {
            // restore configure.ac
            FileSystem::restoreBackupFile(SOURCE_PATH . '/php-src/configure.ac');
@@ -647,13 +634,7 @@ class SourcePatcher
                FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/gd/libgd/gdft.c', '#ifndef MSWIN32', '#ifndef _WIN32');
            }
            // custom config.w32, because official config.w32 is hard-coded many things
-            if ($ver_id >= 80500) {
-                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_85.w32');
-            } elseif ($ver_id >= 80100) {
-                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32');
-            } else {
-                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
-            }
+            $origin = $ver_id >= 80100 ? file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32') : file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
            file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32.bak', file_get_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32'));
            return file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32', $origin) !== false;
        }
--- a/src/SPC/store/pkg/GoXcaddy.php
+++ b/src/SPC/store/pkg/GoXcaddy.php
@@ -30,8 +30,8 @@ class GoXcaddy extends CustomPackage
    public function fetch(string $name, bool $force = false, ?array $config = null): void
    {
        $pkgroot = PKG_ROOT_PATH;
-        $go_exec = "{$pkgroot}/go-xcaddy/bin/go";
-        $xcaddy_exec = "{$pkgroot}/go-xcaddy/bin/xcaddy";
+        $go_exec = "{$pkgroot}/{$name}/bin/go";
+        $xcaddy_exec = "{$pkgroot}/{$name}/bin/xcaddy";
        if ($force) {
            FileSystem::removeDir("{$pkgroot}/{$name}");
        }
@@ -85,7 +85,7 @@ class GoXcaddy extends CustomPackage
                'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
                'GOPATH' => "{$pkgroot}/go",
            ])
-            ->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master');
+            ->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
    }

    public static function getEnvironment(): array
--- a/src/SPC/store/source/PhpSource.php
+++ b/src/SPC/store/source/PhpSource.php
@@ -6,21 +6,15 @@ namespace SPC\store\source;

 use JetBrains\PhpStorm\ArrayShape;
 use SPC\exception\DownloaderException;
-use SPC\exception\SPCException;
 use SPC\store\Downloader;

 class PhpSource extends CustomSourceBase
 {
-    public const string NAME = 'php-src';
-
-    public const array WEB_PHP_DOMAINS = [
-        'https://www.php.net',
-        'https://phpmirror.static-php.dev',
-    ];
+    public const NAME = 'php-src';

    public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_DOWNLOAD_SOURCE): void
    {
-        $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.5';
+        $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
        if ($major === 'git') {
            Downloader::downloadSource('php-src', ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
        } else {
@@ -34,26 +28,21 @@ class PhpSource extends CustomSourceBase
    #[ArrayShape(['type' => 'string', 'path' => 'string', 'rev' => 'string', 'url' => 'string'])]
    public function getLatestPHPInfo(string $major_version): array
    {
-        foreach (self::WEB_PHP_DOMAINS as $domain) {
-            try {
-                $info = json_decode(Downloader::curlExec(
-                    url: "{$domain}/releases/index.php?json&version={$major_version}",
-                    retries: (int) getenv('SPC_DOWNLOAD_RETRIES') ?: 0
-                ), true);
-                if (!isset($info['version'])) {
-                    throw new DownloaderException("Version {$major_version} not found.");
-                }
-                $version = $info['version'];
-                return [
-                    'type' => 'url',
-                    'url' => "{$domain}/distributions/php-{$version}.tar.xz",
-                ];
-            } catch (SPCException) {
-                logger()->warning('Failed to fetch latest PHP version for major version {$major_version} from {$domain}, trying next mirror if available.');
-                continue;
-            }
+        // 查找最新的小版本号
+        $info = json_decode(Downloader::curlExec(
+            url: "https://www.php.net/releases/index.php?json&version={$major_version}",
+            retries: (int) getenv('SPC_DOWNLOAD_RETRIES') ?: 0
+        ), true);
+        if (!isset($info['version'])) {
+            throw new DownloaderException("Version {$major_version} not found.");
        }
-        // exception if all mirrors failed
-        throw new DownloaderException("Failed to fetch latest PHP version for major version {$major_version} from all tried mirrors.");
+
+        $version = $info['version'];
+
+        // 从官网直接下载
+        return [
+            'type' => 'url',
+            'url' => "https://www.php.net/distributions/php-{$version}.tar.xz",
+        ];
    }
 }
--- a/src/SPC/util/ConfigValidator.php
+++ b/src/SPC/util/ConfigValidator.php
@@ -393,7 +393,7 @@ class ConfigValidator
        }
        // check php-version
        if (isset($craft['php-version'])) {
-            // validate version, accept 8.x, 7.x, 8.x.x, 7.x.x, 8, 7
+            // validdate version, accept 8.x, 7.x, 8.x.x, 7.x.x, 8, 7
            $version = strval($craft['php-version']);
            if (!preg_match('/^(\d+)(\.\d+)?(\.\d+)?$/', $version, $matches)) {
                throw new ValidationException('Craft file php-version is invalid');
--- a/src/SPC/util/executor/UnixAutoconfExecutor.php
+++ b/src/SPC/util/executor/UnixAutoconfExecutor.php
@@ -16,11 +16,12 @@ class UnixAutoconfExecutor extends Executor

    protected array $configure_args = [];

+    protected array $ignore_args = [];
+
    public function __construct(protected BSDLibraryBase|LinuxLibraryBase|MacOSLibraryBase $library)
    {
        parent::__construct($library);
        $this->initShell();
-        $this->configure_args = $this->getDefaultConfigureArgs();
    }

    /**
@@ -28,12 +29,19 @@ class UnixAutoconfExecutor extends Executor
     */
    public function configure(...$args): static
    {
-        $args = array_merge($args, $this->configure_args);
+        // remove all the ignored args
+        $args = array_merge($args, $this->getDefaultConfigureArgs(), $this->configure_args);
+        $args = array_diff($args, $this->ignore_args);
        $configure_args = implode(' ', $args);

        return $this->seekLogFileOnException(fn () => $this->shell->exec("./configure {$configure_args}"));
    }

+    public function getConfigureArgsString(): string
+    {
+        return implode(' ', array_merge($this->getDefaultConfigureArgs(), $this->configure_args));
+    }
+
    /**
     * Run make
     *
@@ -103,7 +111,7 @@ class UnixAutoconfExecutor extends Executor
     */
    public function removeConfigureArgs(...$args): static
    {
-        $this->configure_args = array_diff($this->configure_args, $args);
+        $this->ignore_args = [...$this->ignore_args, ...$args];
        return $this;
    }

@@ -125,8 +133,8 @@ class UnixAutoconfExecutor extends Executor
    private function getDefaultConfigureArgs(): array
    {
        return [
-            '--enable-static',
            '--disable-shared',
+            '--enable-static',
            "--prefix={$this->library->getBuildRootPath()}",
            '--with-pic',
            '--enable-pic',
--- a/src/SPC/util/executor/UnixCMakeExecutor.php
+++ b/src/SPC/util/executor/UnixCMakeExecutor.php
@@ -182,8 +182,7 @@ class UnixCMakeExecutor extends Executor
        $target_arch = arch2gnu(php_uname('m'));
        $cflags = getenv('SPC_DEFAULT_C_FLAGS');
        $cc = getenv('CC');
-        $cxx = getenv('CXX');
-        $include = BUILD_INCLUDE_PATH;
+        $cxx = getenv('CCX');
        logger()->debug("making cmake tool chain file for {$os} {$target_arch} with CFLAGS='{$cflags}'");
        $root = BUILD_ROOT_PATH;
        $pkgConfigExecutable = PkgConfigUtil::findPkgConfig();
@@ -211,8 +210,6 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES "{$include}")
-set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES "{$include}")
 set(CMAKE_EXE_LINKER_FLAGS "-ldl -lpthread -lm -lutil")
 CMAKE;
        // Whoops, linux may need CMAKE_AR sometimes
--- a/src/globals/common-tests/embed.c
+++ b/src/globals/common-tests/embed.c
@@ -1,12 +1,17 @@
 #include <sapi/embed/php_embed.h>

-int main(int argc, char **argv) {
-    PHP_EMBED_START_BLOCK(argc, argv)
+int main(int argc,char **argv){
+
+    PHP_EMBED_START_BLOCK(argc,argv)
+
    zend_file_handle file_handle;
-    zend_stream_init_filename(&file_handle, "embed.php");
-    if(!php_execute_script(&file_handle)) {
+
+    zend_stream_init_filename(&file_handle,"embed.php");
+
+    if(!php_execute_script(&file_handle)){
        php_printf("Failed to execute PHP script.\n");
    }
+
    PHP_EMBED_END_BLOCK()
    return 0;
 }
--- a/src/globals/defines.php
+++ b/src/globals/defines.php
@@ -25,16 +25,12 @@ const DANGER_CMD = [
 // spc internal extensions
 const SPC_INTERNAL_EXTENSIONS = [
    'core',
-    'date',
    'hash',
    'json',
-    'lexbor',
    'pcre',
-    'random',
    'reflection',
    'spl',
    'standard',
-    'uri',
 ];

 // spc extension alias
--- a/src/globals/ext-tests/decimal.php
+++ b/src/globals/ext-tests/decimal.php
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-assert(class_exists('Decimal\Decimal'));
-assert(method_exists('Decimal\Decimal', 'valueOf'));
-assert(0.1 + 0.2 !== 0.3);
-$result = Decimal\Decimal::valueOf('0.1') + Decimal\Decimal::valueOf('0.2');
-$expected = Decimal\Decimal::valueOf('0.3');
-assert($result == $expected);
--- a/src/globals/ext-tests/openssl.php
+++ b/src/globals/ext-tests/openssl.php
@@ -31,6 +31,6 @@ if (file_exists('/etc/ssl/openssl.cnf')) {
    }
    assert($valid);
 }
-if (PHP_VERSION_ID >= 80500 && (!PHP_ZTS || PHP_OS_FAMILY !== 'Windows') && defined('OPENSSL_VERSION_NUMBER') && OPENSSL_VERSION_NUMBER >= 0x30200000) {
+if (PHP_VERSION_ID >= 80500 && defined('OPENSSL_VERSION_NUMBER') && OPENSSL_VERSION_NUMBER >= 0x30200000) {
    assert(function_exists('openssl_password_hash'));
 }
--- a/src/globals/extra/gd_config_85.w32
+++ b/src/globals/extra/gd_config_85.w32
@@ -1,94 +0,0 @@
-// vim:ft=javascript
-
-ARG_WITH("gd", "Bundled GD support", "yes");
-
-if (PHP_GD != "no") {
-    // check for gd.h (required)
-    if (!CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd")) {
-        ERROR("gd not enabled; libraries and headers not found");
-    }
-
-    // zlib ext support (required)
-    if (!CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD)) {
-        ERROR("gd not enabled; zlib not enabled");
-    }
-
-    // libjpeg lib support
-    if (CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("jpeglib.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include")) {
-        AC_DEFINE("HAVE_LIBJPEG", 1, "JPEG support");
-        AC_DEFINE("HAVE_GD_JPG", 1, "JPEG support");
-    }
-
-    // libpng16 lib support
-    if (CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + PHP_PHP_BUILD + "\\include\\libpng16")) {
-        AC_DEFINE("HAVE_LIBPNG", 1, "PNG support");
-        AC_DEFINE("HAVE_GD_PNG", 1, "PNG support");
-    }
-
-    // freetype lib support
-    if (CHECK_LIB("libfreetype_a.lib;libfreetype.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("ft2build.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\freetype2;" + PHP_PHP_BUILD + "\\include\\freetype")) {
-        AC_DEFINE("HAVE_LIBFREETYPE", 1, "FreeType support");
-        AC_DEFINE("HAVE_GD_FREETYPE", 1, "FreeType support");
-    }
-
-    // xpm lib support
-    if (CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\X11")) {
-        AC_DEFINE("HAVE_LIBXPM", 1, "XPM support");
-        AC_DEFINE("HAVE_GD_XPM", 1, "XPM support");
-    }
-
-    // iconv lib support
-    if ((CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
-        CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD)) {
-        AC_DEFINE("HAVE_LIBICONV", 1, "Iconv support");
-    }
-
-    // libwebp lib support
-    if ((CHECK_LIB("libwebp_a.lib", "gd", PHP_GD) || CHECK_LIB("libwebp.lib", "gd", PHP_GD)) &&
-        CHECK_LIB("libsharpyuv.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("decode.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp") &&
-        CHECK_HEADER_ADD_INCLUDE("encode.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp")) {
-        AC_DEFINE("HAVE_LIBWEBP", 1, "WebP support");
-        AC_DEFINE("HAVE_GD_WEBP", 1, "WebP support");
-    }
-
-    // libavif lib support
-    if (CHECK_LIB("avif_a.lib", "gd", PHP_GD) &&
-        CHECK_LIB("aom_a.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("avif.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\avif")) {
-        ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBAVIF /D HAVE_GD_AVIF");
-    } else if (CHECK_LIB("avif.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("avif.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\avif")) {
-        ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBAVIF /D HAVE_GD_AVIF");
-    }
-
-    CHECK_LIB("User32.lib", "gd", PHP_GD);
-    CHECK_LIB("Gdi32.lib", "gd", PHP_GD);
-
-    EXTENSION("gd", "gd.c", null, "-Iext/gd/libgd");
-    ADD_SOURCES("ext/gd/libgd", "gd.c \
-        gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \
-        gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c gdhelpers.c gd_io.c gd_io_dp.c \
-        gd_io_file.c gd_io_ss.c gd_jpeg.c gdkanji.c gd_png.c gd_ss.c \
-        gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c gd_xbm.c gd_security.c gd_transform.c \
-        gd_filter.c gd_rotate.c gd_color_match.c gd_webp.c gd_avif.c \
-        gd_crop.c gd_interpolation.c gd_matrix.c gd_bmp.c gd_tga.c", "gd");
-
-    AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
-    AC_DEFINE('HAVE_GD_BUNDLED', 1, "Bundled GD");
-    AC_DEFINE('HAVE_GD_BMP', 1, "BMP support");
-    AC_DEFINE('HAVE_GD_TGA', 1, "TGA support");
-    ADD_FLAG("CFLAGS_GD", " \
-/D PHP_GD_EXPORTS=1 \
-/D HAVE_GD_GET_INTERPOLATION \
-    ");
-    if (ICC_TOOLSET) {
-        ADD_FLAG("LDFLAGS_GD", "/nodefaultlib:libcmt");
-    }
-
-    PHP_INSTALL_HEADERS("", "ext/gd ext/gd/libgd");
-}
--- a/src/globals/patch/spc_fix_avx512_cache_before_80400.patch
+++ b/src/globals/patch/spc_fix_avx512_cache_before_80400.patch
@@ -1,91 +0,0 @@
--- a/build/php.m4
-+++ b/build/php.m4
-@@ -2812,27 +2812,26 @@
- dnl PHP_CHECK_AVX512_SUPPORTS
- dnl
- AC_DEFUN([PHP_CHECK_AVX512_SUPPORTS], [
-  AC_MSG_CHECKING([for avx512 supports in compiler])
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw $CFLAGS"
-
-  AC_LINK_IFELSE([AC_LANG_SOURCE([[
-    #include <immintrin.h>
-      int main(void) {
-        __m512i mask = _mm512_set1_epi32(0x1);
-        char out[32];
-        _mm512_storeu_si512(out, _mm512_shuffle_epi8(mask, mask));
-        return 0;
-    }]])], [
-+  AC_CACHE_CHECK([whether compiler supports AVX-512], [php_cv_have_avx512], [
-+    save_CFLAGS="$CFLAGS"
-+    CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw $CFLAGS"
-+    AC_LINK_IFELSE([AC_LANG_SOURCE([[
-+      #include <immintrin.h>
-+        int main(void) {
-+          __m512i mask = _mm512_set1_epi32(0x1);
-+          char out[32];
-+          _mm512_storeu_si512(out, _mm512_shuffle_epi8(mask, mask));
-+          return 0;
-+      }]])],
-+      [php_cv_have_avx512=yes],
-+      [php_cv_have_avx512=no])
-+    CFLAGS="$save_CFLAGS"
-+  ])
-+  if test "$php_cv_have_avx512" = "yes"; then
-     have_avx512_supports=1
-    AC_MSG_RESULT([yes])
-  ], [
-+  else
-     have_avx512_supports=0
-    AC_MSG_RESULT([no])
-  ])
-
-  CFLAGS="$save_CFLAGS"
-
-+  fi
-   AC_DEFINE_UNQUOTED([PHP_HAVE_AVX512_SUPPORTS],
-    [$have_avx512_supports], [Whether the compiler supports AVX512])
- ])
-@@ -2841,24 +2840,26 @@
- dnl PHP_CHECK_AVX512_VBMI_SUPPORTS
- dnl
- AC_DEFUN([PHP_CHECK_AVX512_VBMI_SUPPORTS], [
-  AC_MSG_CHECKING([for avx512 vbmi supports in compiler])
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw -mavx512vbmi $CFLAGS"
-  AC_LINK_IFELSE([AC_LANG_SOURCE([[
-    #include <immintrin.h>
-      int main(void) {
-        __m512i mask = _mm512_set1_epi32(0x1);
-        char out[32];
-        _mm512_storeu_si512(out, _mm512_permutexvar_epi8(mask, mask));
-        return 0;
-    }]])], [
-+  AC_CACHE_CHECK([whether compiler supports AVX-512 VBMI], [php_cv_have_avx512vbmi], [
-+    save_CFLAGS="$CFLAGS"
-+    CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw -mavx512vbmi $CFLAGS"
-+    AC_LINK_IFELSE([AC_LANG_SOURCE([[
-+      #include <immintrin.h>
-+        int main(void) {
-+          __m512i mask = _mm512_set1_epi32(0x1);
-+          char out[32];
-+          _mm512_storeu_si512(out, _mm512_permutexvar_epi8(mask, mask));
-+          return 0;
-+      }]])],
-+      [php_cv_have_avx512vbmi=yes],
-+      [php_cv_have_avx512vbmi=no])
-+    CFLAGS="$save_CFLAGS"
-+  ])
-+  if test "$php_cv_have_avx512vbmi" = "yes"; then
-     have_avx512_vbmi_supports=1
-    AC_MSG_RESULT([yes])
-  ], [
-+  else
-     have_avx512_vbmi_supports=0
-    AC_MSG_RESULT([no])
-  ])
-  CFLAGS="$save_CFLAGS"
-+  fi
-   AC_DEFINE_UNQUOTED([PHP_HAVE_AVX512_VBMI_SUPPORTS],
-    [$have_avx512_vbmi_supports], [Whether the compiler supports AVX512 VBMI])
- ])
--- a/src/globals/test-extensions.php
+++ b/src/globals/test-extensions.php
@@ -27,9 +27,9 @@ $test_os = [
    // 'macos-15', // bin/spc for arm64
    // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
    'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
-    // 'ubuntu-24.04', // bin/spc 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-24.04-arm', // bin/spc for arm64
    // 'windows-2022', // .\bin\spc.ps1
    // 'windows-2025',
 ];
@@ -42,16 +42,16 @@ $no_strip = false;
 // compress with upx
 $upx = false;

-// whether to test frankenphp build, only available for macOS and linux
-$frankenphp = true;
+// whether to test frankenphp build, only available for macos and linux
+$frankenphp = false;

 // prefer downloading pre-built packages to speed up the build process
-$prefer_pre_built = true;
+$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' => 'curl,gd',
-    'Windows' => 'bcmath,brotli,bz2,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,iconv,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_pgsql,pgsql,session,simdjson,simplexml,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,zip,zlib',
+    'Linux', 'Darwin' => 'pgsql',
+    'Windows' => 'com_dotnet',
 };

 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
@@ -62,7 +62,7 @@ $shared_extensions = match (PHP_OS_FAMILY) {
 };

 // If you want to test lib-suggests for all extensions and libraries, set it to true.
-$with_suggested_libs = true;
+$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) {
--- a/tests/mock/SPC_store.php
+++ b/tests/mock/SPC_store.php
@@ -12,15 +12,6 @@ use SPC\exception\SPCInternalException;
 function f_exec(string $command, mixed &$output, mixed &$result_code): bool
 {
    $result_code = 0;
-    if (str_contains($command, 'https://api.github.com/repos/AOMediaCodec/libavif/releases/latest')) {
-        $output = explode("\n", json_encode([
-            'tag_name' => 'v1.1.1',
-            'tarball_url' => 'https://api.github.com/repos/AOMediaCodec/libavif/tarball/v1.1.1',
-            'prerelease' => false,
-            'draft' => false,
-        ]));
-        return true;
-    }
    if (str_contains($command, 'https://api.github.com/repos/AOMediaCodec/libavif/releases')) {
        $output = explode("\n", gzdecode(file_get_contents(__DIR__ . '/../assets/github_api_AOMediaCodec_libavif_releases.json.gz')));
        return true;