v3 base

2026-07-13 11:55:36 +08:00 · 2025-11-29 18:58:16 +08:00
117 changed files with 802 additions and 2793 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/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,13 +32,10 @@ jobs:
          php-version: '8.4'
          extensions: curl, openssl, mbstring
          ini-values: memory_limit=-1
-          tools: pecl, composer
-
-      - name: "Install dependencies"
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
+          tools: pecl, composer, php-cs-fixer

      - name: Run PHP-CS-Fixer fix
-        run: vendor/bin/php-cs-fixer fix --dry-run --diff --ansi
+        run: php-cs-fixer fix --dry-run --diff --ansi

  phpstan:
    runs-on: ubuntu-latest
--- a/bin/spc-alpine-docker
+++ b/bin/spc-alpine-docker
@@ -108,7 +108,8 @@ RUN apk update; \
        wget \
        xz \
        gettext-dev \
-        binutils-gold
+        binutils-gold \
+        patchelf

 RUN curl -#fSL https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-linux-\$(uname -m).tar.gz | tar -xz -C /usr/local/bin && \
    chmod +x /usr/local/bin/php
--- a/bin/spc-gnu-docker
+++ b/bin/spc-gnu-docker
@@ -92,6 +92,11 @@ RUN echo "source scl_source enable devtoolset-10" >> /etc/bashrc
 RUN source /etc/bashrc
 RUN yum install -y which

+RUN curl -fsSL -o patchelf.tgz https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-$SPC_USE_ARCH.tar.gz && \
+    mkdir -p /patchelf && \
+    tar -xzf patchelf.tgz -C /patchelf --strip-components=1 && \
+    cp /patchelf/bin/patchelf /usr/bin/
+
 RUN curl -o cmake.tgz -#fSL https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$SPC_USE_ARCH.tar.gz && \
    mkdir /cmake && \
    tar -xzf cmake.tgz -C /cmake --strip-components 1
--- a/composer.lock
+++ b/composer.lock
--- a/config/env.ini
+++ b/config/env.ini
@@ -75,10 +75,8 @@ SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime
 ; - musl-native: used for alpine linux, can build `musl` and `musl -dynamic` target.
 ; - gnu-native: used for general linux distros, can build gnu target for the installed glibc version only.

-; option to specify the target, superceded by SPC_TARGET if set
+; LEGACY option to specify the target
 SPC_LIBC=musl
-; uncomment to link libc dynamically on musl
-; SPC_MUSL_DYNAMIC=true

 ; Recommended: specify your target here. Zig toolchain will be used.
 ; examples:
@@ -93,7 +91,6 @@ SPC_LIBC=musl
 CC=${SPC_LINUX_DEFAULT_CC}
 CXX=${SPC_LINUX_DEFAULT_CXX}
 AR=${SPC_LINUX_DEFAULT_AR}
-RANLIB=${SPC_LINUX_DEFAULT_RANLIB}
 LD=${SPC_LINUX_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
 SPC_DEFAULT_C_FLAGS="-fPIC -Os"
@@ -118,10 +115,6 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE
 ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""

-; optional, path to openssl conf. This affects where openssl will look for the default CA.
-; default on Debian/Alpine: /etc/ssl, default on RHEL: /etc/pki/tls
-OPENSSLDIR=""
-
 [macos]
 ; build target: macho or macho (possibly we could support macho-universal in the future)
 ; Currently we do not support universal and cross-compilation for macOS.
@@ -149,10 +142,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

 [freebsd]
 ; compiler environments
--- a/config/ext.json
+++ b/config/ext.json
@@ -43,27 +43,6 @@
    "calendar": {
        "type": "builtin"
    },
-    "clickhouse": {
-        "support": {
-            "Windows": "wip",
-            "BSD": "wip"
-        },
-        "type": "external",
-        "source": "ext-clickhouse",
-        "arg-type": "custom",
-        "cpp-extension": true,
-        "lib-suggests": [
-            "openssl"
-        ]
-    },
-    "com_dotnet": {
-        "support": {
-            "BSD": "no",
-            "Linux": "no",
-            "Darwin": "no"
-        },
-        "type": "builtin"
-    },
    "ctype": {
        "type": "builtin"
    },
@@ -76,8 +55,7 @@
        ],
        "ext-depends-windows": [
            "zlib",
-            "openssl",
-            "brotli"
+            "openssl"
        ]
    },
    "dba": {
@@ -87,19 +65,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"
@@ -162,41 +127,9 @@
            "sockets"
        ]
    },
-    "excimer": {
-        "support": {
-            "Windows": "wip",
-            "BSD": "wip"
-        },
-        "type": "external",
-        "source": "ext-excimer"
-    },
    "exif": {
        "type": "builtin"
    },
-    "fastchart": {
-        "support": {
-            "Windows": "wip",
-            "BSD": "wip"
-        },
-        "type": "external",
-        "source": "ext-fastchart",
-        "lib-depends": [
-            "freetype"
-        ],
-        "lib-suggests": [
-            "libpng",
-            "libjpeg",
-            "libwebp"
-        ]
-    },
-    "fastjson": {
-        "support": {
-            "Windows": "wip",
-            "BSD": "wip"
-        },
-        "type": "external",
-        "source": "ext-fastjson"
-    },
    "ffi": {
        "support": {
            "Linux": "partial",
@@ -287,7 +220,6 @@
        "support": {
            "BSD": "wip"
        },
-        "arg-type": "with-path",
        "type": "external",
        "source": "ext-gmssl",
        "lib-depends": [
@@ -300,14 +232,11 @@
            "BSD": "wip"
        },
        "type": "external",
-        "source": "ext-grpc",
+        "source": "grpc",
        "arg-type-unix": "enable-path",
        "cpp-extension": true,
        "lib-depends": [
-            "grpc",
-            "zlib",
-            "openssl",
-            "libcares"
+            "grpc"
        ]
    },
    "iconv": {
@@ -479,7 +408,8 @@
        "ext-depends": [
            "zlib",
            "session"
-        ]
+        ],
+        "build-with-php": true
    },
    "memcached": {
        "support": {
@@ -557,40 +487,6 @@
            "zlib"
        ]
    },
-    "mysqlnd_ed25519": {
-        "type": "external",
-        "source": "mysqlnd_ed25519",
-        "arg-type": "enable",
-        "target": [
-            "shared"
-        ],
-        "ext-depends": [
-            "mysqlnd"
-        ],
-        "lib-depends": [
-            "libsodium"
-        ],
-        "lib-suggests": [
-            "openssl"
-        ]
-    },
-    "mysqlnd_parsec": {
-        "type": "external",
-        "source": "mysqlnd_parsec",
-        "arg-type": "enable",
-        "target": [
-            "shared"
-        ],
-        "ext-depends": [
-            "mysqlnd"
-        ],
-        "lib-depends": [
-            "libsodium"
-        ],
-        "lib-suggests": [
-            "openssl"
-        ]
-    },
    "oci8": {
        "type": "wip",
        "support": {
@@ -671,13 +567,6 @@
        "type": "builtin",
        "unix-only": true
    },
-    "pcov": {
-        "type": "external",
-        "source": "pcov",
-        "target": [
-            "shared"
-        ]
-    },
    "pdo": {
        "type": "builtin"
    },
--- a/config/lib.json
+++ b/config/lib.json
@@ -109,7 +109,8 @@
            "krb5"
        ],
        "lib-suggests-windows": [
-            "brotli"
+            "brotli",
+            "zstd"
        ],
        "frameworks": [
            "CoreFoundation",
@@ -123,7 +124,7 @@
            "libfastlz.a"
        ],
        "headers": [
-            "fastlz.h"
+            "fastlz/fastlz.h"
        ]
    },
    "freetype": {
@@ -142,7 +143,9 @@
            "zlib"
        ],
        "lib-suggests": [
-            "libpng"
+            "libpng",
+            "bzip2",
+            "brotli"
        ]
    },
    "gettext": {
@@ -352,18 +355,12 @@
        "static-libs-unix": [
            "libaom.a"
        ],
-        "static-libs-windows": [
-            "aom.lib"
-        ],
        "cpp-library": true
    },
    "libargon2": {
        "source": "libargon2",
        "static-libs-unix": [
            "libargon2.a"
-        ],
-        "lib-suggests": [
-            "libsodium"
        ]
    },
    "libavif": {
@@ -373,15 +370,6 @@
        ],
        "static-libs-windows": [
            "avif.lib"
-        ],
-        "lib-depends": [
-            "libaom"
-        ],
-        "lib-suggests": [
-            "libwebp",
-            "libjpeg",
-            "libxml2",
-            "libpng"
        ]
    },
    "libcares": {
@@ -454,7 +442,6 @@
    },
    "libheif": {
        "source": "libheif",
-        "cpp-library": true,
        "static-libs-unix": [
            "libheif.a"
        ],
@@ -494,7 +481,7 @@
        "static-libs-windows": [
            "libjpeg_a.lib"
        ],
-        "lib-depends": [
+        "lib-suggests-windows": [
            "zlib"
        ]
    },
@@ -529,18 +516,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,
@@ -775,6 +750,7 @@
            "xz"
        ],
        "lib-suggests-windows": [
+            "zstd",
            "openssl"
        ]
    },
@@ -874,9 +850,6 @@
    },
    "openssl": {
        "source": "openssl",
-        "pkg-configs": [
-            "openssl"
-        ],
        "static-libs-unix": [
            "libssl.a",
            "libcrypto.a"
@@ -989,11 +962,6 @@
    },
    "unixodbc": {
        "source": "unixodbc",
-        "pkg-configs": [
-            "odbc",
-            "odbccr",
-            "odbcinst"
-        ],
        "static-libs-unix": [
            "libodbc.a",
            "libodbccr.a",
@@ -1011,9 +979,6 @@
        ],
        "headers": [
            "wtr/watcher-c.h"
-        ],
-        "frameworks": [
-            "CoreServices"
        ]
    },
    "xz": {
@@ -1038,9 +1003,6 @@
    },
    "zlib": {
        "source": "zlib",
-        "pkg-configs": [
-            "zlib"
-        ],
        "static-libs-unix": [
            "libz.a"
        ],
@@ -1054,9 +1016,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",
@@ -124,19 +105,10 @@
        }
    },
    "ext-brotli": {
-        "type": "ghtagtar",
-        "repo": "kjdev/php-ext-brotli",
+        "type": "git",
        "path": "php-src/ext/brotli",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "ext-clickhouse": {
-        "type": "ghtagtar",
-        "repo": "iliaal/php_clickhouse",
-        "match": "tarball/refs/tags/\\d",
-        "path": "php-src/ext/clickhouse",
+        "rev": "master",
+        "url": "https://github.com/kjdev/php-ext-brotli",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -154,41 +126,13 @@
    },
    "ext-event": {
        "type": "url",
-        "url": "https://bitbucket.org/osmanov/pecl-event/get/3.1.4.tar.gz",
+        "url": "https://bitbucket.org/osmanov/pecl-event/get/3.0.8.tar.gz",
        "path": "php-src/ext/event",
        "license": {
            "type": "file",
            "path": "LICENSE"
        }
    },
-    "ext-excimer": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/excimer",
-        "path": "php-src/ext/excimer",
-        "filename": "excimer.tgz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "ext-fastchart": {
-        "type": "ghtagtar",
-        "repo": "iliaal/fastchart",
-        "path": "php-src/ext/fastchart",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "ext-fastjson": {
-        "type": "ghtagtar",
-        "repo": "iliaal/fastjson",
-        "path": "php-src/ext/fastjson",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
    "ext-glfw": {
        "type": "git",
        "url": "https://github.com/mario-deluna/php-glfw",
@@ -207,18 +151,6 @@
            "path": "LICENSE"
        }
    },
-    "ext-grpc": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/grpc",
-        "path": "php-src/ext/grpc",
-        "filename": "grpc.tgz",
-        "license": {
-            "type": "file",
-            "path": [
-                "LICENSE"
-            ]
-        }
-    },
    "ext-imagick": {
        "type": "url",
        "url": "https://pecl.php.net/get/imagick",
@@ -273,7 +205,7 @@
    },
    "ext-rdkafka": {
        "type": "ghtar",
-        "repo": "php-rdkafka/php-rdkafka",
+        "repo": "arnaud-lb/php-rdkafka",
        "path": "php-src/ext/rdkafka",
        "license": {
            "type": "file",
@@ -360,9 +292,10 @@
        }
    },
    "ext-zstd": {
-        "type": "ghtar",
-        "repo": "kjdev/php-ext-zstd",
+        "type": "git",
        "path": "php-src/ext/zstd",
+        "rev": "master",
+        "url": "https://github.com/kjdev/php-ext-zstd",
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -406,7 +339,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": {
@@ -419,9 +352,9 @@
        }
    },
    "gmssl": {
-        "type": "git",
-        "url": "https://github.com/guanzhi/GmSSL.git",
-        "rev": "master",
+        "type": "ghtar",
+        "repo": "guanzhi/GmSSL",
+        "provide-pre-built": true,
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -507,8 +440,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"
@@ -569,7 +504,7 @@
    "libavif": {
        "type": "ghtar",
        "repo": "AOMediaCodec/libavif",
-        "provide-pre-built": false,
+        "provide-pre-built": true,
        "license": {
            "type": "file",
            "path": "LICENSE"
@@ -684,7 +619,6 @@
    "libjpeg": {
        "type": "ghtar",
        "repo": "libjpeg-turbo/libjpeg-turbo",
-        "prefer-stable": true,
        "license": {
            "type": "file",
            "path": "LICENSE.md"
@@ -726,14 +660,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",
@@ -744,10 +670,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",
@@ -755,9 +680,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"
@@ -774,7 +699,7 @@
    "libsodium": {
        "type": "ghrel",
        "repo": "jedisct1/libsodium",
-        "match": "libsodium-(?!1\\.0\\.21)\\d+(\\.\\d+)*\\.tar\\.gz",
+        "match": "libsodium-\\d+(\\.\\d+)*\\.tar\\.gz",
        "prefer-stable": true,
        "provide-pre-built": true,
        "license": {
@@ -846,9 +771,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",
@@ -856,10 +780,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"
@@ -946,24 +868,6 @@
            "path": "LICENSE"
        }
    },
-    "mysqlnd_ed25519": {
-        "type": "pie",
-        "repo": "mariadb/mysqlnd_ed25519",
-        "path": "php-src/ext/mysqlnd_ed25519",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "mysqlnd_parsec": {
-        "type": "pie",
-        "repo": "mariadb/mysqlnd_parsec",
-        "path": "php-src/ext/mysqlnd_parsec",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
    "ncurses": {
        "type": "filelist",
        "url": "https://ftp.gnu.org/pub/gnu/ncurses/",
@@ -1026,7 +930,7 @@
    "openssl": {
        "type": "ghrel",
        "repo": "openssl/openssl",
-        "match": "openssl-3.+\\.tar\\.gz",
+        "match": "openssl.+\\.tar\\.gz",
        "prefer-stable": true,
        "alt": {
            "type": "filelist",
@@ -1059,15 +963,6 @@
            "path": "LICENSE"
        }
    },
-    "pcov": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/pcov",
-        "filename": "pcov.tgz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
    "pdo_sqlsrv": {
        "type": "url",
        "url": "https://pecl.php.net/get/pdo_sqlsrv",
@@ -1220,6 +1115,7 @@
        "path": "php-src/ext/swoole",
        "type": "ghtar",
        "repo": "swoole/swoole-src",
+        "match": "v6\\.+",
        "prefer-stable": true,
        "license": {
            "type": "file",
@@ -1264,8 +1160,9 @@
        }
    },
    "xdebug": {
-        "type": "pie",
-        "repo": "xdebug/xdebug",
+        "type": "url",
+        "url": "https://pecl.php.net/get/xdebug",
+        "filename": "xdebug.tgz",
        "license": {
            "type": "file",
            "path": "LICENSE"
--- 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/en/guide/manual-build.md
+++ b/docs/en/guide/manual-build.md
@@ -549,24 +549,22 @@ otherwise it will be executed repeatedly in other events.

 The following are the supported `patch_point` event names and corresponding locations:

-| Event name                      | Event description                                                                                  |
-|---------------------------------|----------------------------------------------------------------------------------------------------|
-| before-libs-extract             | Triggered before the dependent libraries extracted                                                 |
-| after-libs-extract              | Triggered after the compiled dependent libraries extracted                                         |
-| before-php-extract              | Triggered before PHP source code extracted                                                         |
-| after-php-extract               | Triggered after PHP source code extracted                                                          |
-| before-micro-extract            | Triggered before phpmicro extract                                                                  |
-| after-micro-extract             | Triggered after phpmicro extracted                                                                 |
-| before-exts-extract             | Triggered before the extension (to be compiled) extracted to the PHP source directory              |
-| after-exts-extract              | Triggered after the extension extracted to the PHP source directory                                |
-| before-library[*name*]-build    | Triggered before the library named `name` is compiled (such as `before-library[postgresql]-build`) |
-| after-library[*name*]-build     | Triggered after the library named `name` is compiled                                               |
-| after-shared-ext[*name*]-build  | Triggered after the shared extension named `name` is compiled                                      |
-| before-shared-ext[*name*]-build | Triggered before the shared extension named `name` is compiled                                     |
-| before-php-buildconf            | Triggered before compiling PHP command `./buildconf`                                               |
-| before-php-configure            | Triggered before compiling PHP command `./configure`                                               |
-| before-php-make                 | Triggered before compiling PHP command `make`                                                      |
-| before-sanity-check             | Triggered after compiling PHP but before running extended checks                                   |
+| Event name                   | Event description                                                                                  |
+|------------------------------|----------------------------------------------------------------------------------------------------|
+| before-libs-extract          | Triggered before the dependent libraries extracted                                                 |
+| after-libs-extract           | Triggered after the compiled dependent libraries extracted                                         |
+| before-php-extract           | Triggered before PHP source code extracted                                                         |
+| after-php-extract            | Triggered after PHP source code extracted                                                          |
+| before-micro-extract         | Triggered before phpmicro extract                                                                  |
+| after-micro-extract          | Triggered after phpmicro extracted                                                                 |
+| before-exts-extract          | Triggered before the extension (to be compiled) extracted to the PHP source directory              |
+| after-exts-extract           | Triggered after the extension extracted to the PHP source directory                                |
+| before-library[*name*]-build | Triggered before the library named `name` is compiled (such as `before-library[postgresql]-build`) |
+| after-library[*name*]-build  | Triggered after the library named `name` is compiled                                               |
+| before-php-buildconf         | Triggered before compiling PHP command `./buildconf`                                               |
+| before-php-configure         | Triggered before compiling PHP command `./configure`                                               |
+| before-php-make              | Triggered before compiling PHP command `make`                                                      |
+| before-sanity-check          | Triggered after compiling PHP but before running extended checks                                   |

 The following is a simple example of temporarily modifying the PHP source code. 
 Enable the CLI function to search for the `php.ini` configuration in the current working directory:
--- 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/docs/zh/guide/manual-build.md
+++ b/docs/zh/guide/manual-build.md
@@ -500,8 +500,6 @@ bin/spc dev:sort-config ext
 | after-exts-extract           | 在要编译的扩展解压到 PHP 源码目录后触发                                    |
 | before-library[*name*]-build | 在名称为 `name` 的库编译前触发（如 `before-library[postgresql]-build`） |
 | after-library[*name*]-build  | 在名称为 `name` 的库编译后触发                                       |
-| after-shared-ext[*name*]-build | 在名称为 `name` 的共享扩展编译后触发（如 `after-shared-ext[redis]-build`）   |
-| before-shared-ext[*name*]-build | 在名称为 `name` 的共享扩展编译前触发                                    |
 | before-php-buildconf         | 在编译 PHP 命令 `./buildconf` 前触发                              |
 | before-php-configure         | 在编译 PHP 命令 `./configure` 前触发                              |
 | before-php-make              | 在编译 PHP 命令 `make` 前触发                                     |
--- 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 = '3.0.0-dev';

    public function __construct()
    {
--- a/src/SPC/builder/BuilderBase.php
+++ b/src/SPC/builder/BuilderBase.php
@@ -29,7 +29,7 @@ abstract class BuilderBase
    /** @var array<int, string> extension names */
    protected array $ext_list = [];

-    /** @var array<int, string> all libraries being built (resolved dep list) */
+    /** @var array<int, string> library names */
    protected array $lib_list = [];

    /** @var bool compile libs only (just mark it) */
@@ -143,7 +143,7 @@ abstract class BuilderBase
     *
     * @internal
     */
-    public function proveExts(array $static_extensions, array $shared_extensions = [], bool $skip_check_deps = false, bool $skip_extract = false, int $build_target = BUILD_TARGET_NONE): void
+    public function proveExts(array $static_extensions, array $shared_extensions = [], bool $skip_check_deps = false, bool $skip_extract = false): void
    {
        // judge ext
        foreach ($static_extensions as $ext) {
@@ -171,9 +171,7 @@ abstract class BuilderBase
            SourceManager::initSource(exts: [...$static_extensions, ...$shared_extensions]);
            $this->emitPatchPoint('after-exts-extract');
            // patch micro
-            if (($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO) {
-                SourcePatcher::patchMicro();
-            }
+            SourcePatcher::patchMicro();
        }

        foreach ([...$static_extensions, ...$shared_extensions] as $extension) {
--- a/src/SPC/builder/Extension.php
+++ b/src/SPC/builder/Extension.php
@@ -11,10 +11,8 @@ 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;

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

    /**
@@ -186,6 +183,14 @@ class Extension
     */
    public function patchBeforeMake(): bool
    {
+        if (SPCTarget::getTargetOS() === 'Linux' && $this->isBuildShared() && ($objs = getenv('SPC_EXTRA_RUNTIME_OBJECTS'))) {
+            FileSystem::replaceFileRegex(
+                SOURCE_PATH . '/php-src/Makefile',
+                "/^(shared_objects_{$this->getName()}\\s*=.*)$/m",
+                "$1 {$objs}",
+            );
+            return true;
+        }
        return false;
    }

@@ -225,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(
@@ -235,6 +240,13 @@ class Extension
            );
        }

+        if ($objs = getenv('SPC_EXTRA_RUNTIME_OBJECTS')) {
+            FileSystem::replaceFileRegex(
+                $this->source_dir . '/Makefile',
+                "/^(shared_objects_{$this->getName()}\\s*=.*)$/m",
+                "$1 {$objs}",
+            );
+        }
        return true;
    }

@@ -373,9 +385,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) {
@@ -386,12 +395,13 @@ class Extension
                    $dependency->buildShared([...$visited, $this->getName()]);
                }
            }
-            $this->builder->emitPatchPoint('before-shared-ext[' . $this->getName() . ']-build');
+            if (Config::getExt($this->getName(), 'type') === 'addon') {
+                return;
+            }
            match (PHP_OS_FAMILY) {
                'Darwin', 'Linux' => $this->buildUnixShared(),
                default => throw new WrongUsageException(PHP_OS_FAMILY . ' build shared extensions is not supported yet'),
            };
-            $this->builder->emitPatchPoint('after-shared-ext[' . $this->getName() . ']-build');
        } catch (SPCException $e) {
            $e->bindExtensionInfo(['extension_name' => $this->getName()]);
            throw $e;
@@ -442,17 +452,12 @@ class Extension

        // process *.so file
        $soFile = BUILD_MODULES_PATH . '/' . $this->getName() . '.so';
-        $soDest = $soFile;
-        preg_match('/-release\s+(\S*)/', getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $matches);
-        if (!empty($matches[1])) {
-            $soDest = str_replace('.so', '-' . $matches[1] . '.so', $soFile);
-        }
        if (!file_exists($soFile)) {
            throw new ValidationException("extension {$this->getName()} build failed: {$soFile} not found", validation_module: "Extension {$this->getName()} build");
        }
        /** @var UnixBuilderBase $builder */
        $builder = $this->builder;
-        $builder->deployBinary($soFile, $soDest, false);
+        $builder->deployBinary($soFile, $soFile, false);
    }

    /**
@@ -530,24 +535,14 @@ 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);
+        $config = (new SPCConfigUtil($this->builder))->getExtensionConfig($this);
        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
        $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
        $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
-        $extraLd = trim((string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'));
-        if (PHP_OS_FAMILY !== 'Darwin') {
-            $extraLd = trim($extraLd . ' -Wl,-Bsymbolic');
-        }
        return [
            'CFLAGS' => $config['cflags'],
            'CXXFLAGS' => $config['cflags'],
            'LDFLAGS' => $config['ldflags'],
-            'EXTRA_LDFLAGS' => $extraLd,
            'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
        ];
--- 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,46 +346,25 @@ 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");
            }
        }
    }

    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;
@@ -396,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/brotli.php
+++ b/src/SPC/builder/extension/brotli.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\util\CustomExt;
-
-#[CustomExt('brotli')]
-class brotli extends Extension
-{
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        return $this->getEnableArg($shared) . '--with-libbrotli';
-    }
-}
--- a/src/SPC/builder/extension/clickhouse.php
+++ b/src/SPC/builder/extension/clickhouse.php
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\util\CustomExt;
-
-#[CustomExt('clickhouse')]
-class clickhouse extends Extension
-{
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        $arg = '--enable-clickhouse' . ($shared ? '=shared' : '');
-        if ($this->builder->getLib('openssl')) {
-            $arg .= ' --enable-clickhouse-openssl';
-        }
-        return $arg;
-    }
-}
--- a/src/SPC/builder/extension/com_dotnet.php
+++ b/src/SPC/builder/extension/com_dotnet.php
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\util\CustomExt;
-
-#[CustomExt('com_dotnet')]
-class com_dotnet extends Extension
-{
-    public function getWindowsConfigureArg(bool $shared = false): string
-    {
-        return '--enable-com-dotnet=yes';
-    }
-}
--- 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/event.php
+++ b/src/SPC/builder/extension/event.php
@@ -38,23 +38,7 @@ class event extends Extension
        // Prevent event extension compile error on macOS
        if ($this->builder instanceof MacOSBuilder) {
            FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/main/php_config.h', '/^#define HAVE_OPENPTY 1$/m', '');
-            $patched = true;
-        }
-        return $this->patchLibeventConstPeer() || $patched;
-    }
-
-    public function patchBeforeSharedMake(): bool
-    {
-        $patched = parent::patchBeforeSharedMake();
-        return $this->patchLibeventConstPeer() || $patched;
-    }
-
-    private function patchLibeventConstPeer(): bool
-    {
-        $patched = false;
-        $file = SOURCE_PATH . '/php-src/ext/event/php8/classes/http_connection.c';
-        if (is_file($file) && FileSystem::replaceFileRegex($file, '/^\tchar \*address;$/m', "\tconst char *address;")) {
-            $patched = true;
+            return true;
        }
        return $patched;
    }
--- 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,22 @@ 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",
-            '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 (file_exists(SOURCE_PATH . '/php-src/ext/grpc')) {
+            return false;
+        }
+        // soft link to the grpc source code
+        if (is_dir($this->source_dir . '/src/php/ext/grpc')) {
+            shell()->exec('ln -s ' . $this->source_dir . '/src/php/ext/grpc ' . SOURCE_PATH . '/php-src/ext/grpc');
+        } else {
+            throw new ValidationException('Cannot find grpc source code in ' . $this->source_dir . '/src/php/ext/grpc');
+        }
+        if (SPCTarget::getTargetOS() === 'Darwin') {
+            FileSystem::replaceFileRegex(
+                SOURCE_PATH . '/php-src/ext/grpc/config.m4',
+                '/GRPC_LIBDIR=.*$/m',
+                'GRPC_LIBDIR=' . BUILD_LIB_PATH . "\n" . 'LDFLAGS="$LDFLAGS -framework CoreFoundation"'
+            );
        }
-
-        $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 +52,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/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/memcache.php
+++ b/src/SPC/builder/extension/memcache.php
@@ -18,9 +18,6 @@ class memcache extends Extension

    public function patchBeforeBuildconf(): bool
    {
-        if (!$this->isBuildStatic()) {
-            return false;
-        }
        FileSystem::replaceFileStr(
            SOURCE_PATH . '/php-src/ext/memcache/config9.m4',
            'if test -d $abs_srcdir/src ; then',
@@ -46,27 +43,4 @@ EOF
        );
        return true;
    }
-
-    public function patchBeforeSharedConfigure(): bool
-    {
-        if (!$this->isBuildShared()) {
-            return false;
-        }
-        FileSystem::replaceFileStr(
-            SOURCE_PATH . '/php-src/ext/memcache/config9.m4',
-            'if test -d $abs_srcdir/main ; then',
-            'if test -d $abs_srcdir/src ; then',
-        );
-        FileSystem::replaceFileStr(
-            SOURCE_PATH . '/php-src/ext/memcache/config9.m4',
-            'export CPPFLAGS="$CPPFLAGS $INCLUDES -I$abs_srcdir/main"',
-            'export CPPFLAGS="$CPPFLAGS $INCLUDES"',
-        );
-        return true;
-    }
-
-    protected function getExtraEnv(): array
-    {
-        return ['CFLAGS' => '-std=c17'];
-    }
 }
--- 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' : '') . ' ';
@@ -35,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/opcache.php
+++ b/src/SPC/builder/extension/opcache.php
@@ -58,10 +58,7 @@ class opcache extends Extension
        ) {
            $opcache_jit = ' --disable-opcache-jit';
        }
-        if ($phpVersionID < 80500) {
-            return '--enable-opcache' . ($shared ? '=shared' : '') . $opcache_jit;
-        }
-        return trim($opcache_jit);
+        return '--enable-opcache' . ($shared ? '=shared' : '') . $opcache_jit;
    }

    public function getDistName(): string
--- a/src/SPC/builder/extension/password_argon2.php
+++ b/src/SPC/builder/extension/password_argon2.php
@@ -24,6 +24,25 @@ class password_argon2 extends Extension
        }
    }

+    public function patchBeforeMake(): bool
+    {
+        $patched = parent::patchBeforeMake();
+        if ($this->builder->getLib('libsodium') !== null) {
+            $extraLibs = getenv('SPC_EXTRA_LIBS');
+            if ($extraLibs !== false) {
+                $extraLibs = str_replace(
+                    [BUILD_LIB_PATH . '/libargon2.a', BUILD_LIB_PATH . '/libsodium.a'],
+                    ['', BUILD_LIB_PATH . '/libargon2.a ' . BUILD_LIB_PATH . '/libsodium.a'],
+                    $extraLibs,
+                );
+                $extraLibs = trim(preg_replace('/\s+/', ' ', $extraLibs)); // normalize spacing
+                f_putenv('SPC_EXTRA_LIBS=' . $extraLibs);
+                return true;
+            }
+        }
+        return $patched;
+    }
+
    public function getConfigureArg(bool $shared = false): string
    {
        if ($this->builder->getLib('openssl') !== null) {
--- 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/spx.php
+++ b/src/SPC/builder/extension/spx.php
@@ -45,11 +45,4 @@ class spx extends Extension
        FileSystem::copy($this->source_dir . '/src/php_spx.h', $this->source_dir . '/php_spx.h');
        return true;
    }
-
-    public function getSharedExtensionEnv(): array
-    {
-        $env = parent::getSharedExtensionEnv();
-        $env['SPX_SHARED_LIBADD'] = $env['LIBS'];
-        return $env;
-    }
 }
--- 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
@@ -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';
@@ -50,16 +49,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 +73,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/BSDBuilder.php
+++ b/src/SPC/builder/freebsd/BSDBuilder.php
@@ -65,8 +65,6 @@ class BSDBuilder extends UnixBuilderBase
            ('--with-config-file-path=' . $this->getOption('with-config-file-path') . ' ') : '';
        $config_file_scan_dir = $this->getOption('with-config-file-scan-dir', false) ?
            ('--with-config-file-scan-dir=' . $this->getOption('with-config-file-scan-dir') . ' ') : '';
-        $sysconfdir = $this->getOption('with-sysconfdir', false) ?
-            ('--sysconfdir=' . $this->getOption('with-sysconfdir') . ' ') : '';

        $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI;
        $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM;
@@ -91,7 +89,6 @@ class BSDBuilder extends UnixBuilderBase
                ($enableMicro ? '--enable-micro ' : '--disable-micro ') .
                $config_file_path .
                $config_file_scan_dir .
-                $sysconfdir .
                $json_74 .
                $zts .
                $this->makeStaticExtensionArgs()
--- 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,10 +11,7 @@ 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\PgoManager;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;

@@ -23,8 +20,6 @@ class LinuxBuilder extends UnixBuilderBase
    /** @var bool Micro patch phar flag */
    private bool $phar_patched = false;

-    private ?PgoManager $pgo = null;
-
    public function __construct(array $options = [])
    {
        $this->options = $options;
@@ -51,8 +46,6 @@ class LinuxBuilder extends UnixBuilderBase
     */
    public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
    {
-        $this->pgo = PgoManager::fromBuilder($this, $build_target);
-
        $cflags = $this->arch_c_flags;
        f_putenv('CFLAGS=' . $cflags);

@@ -72,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)) {
@@ -88,8 +80,6 @@ class LinuxBuilder extends UnixBuilderBase
            ('--with-config-file-path=' . $this->getOption('with-config-file-path') . ' ') : '';
        $config_file_scan_dir = $this->getOption('with-config-file-scan-dir', false) ?
            ('--with-config-file-scan-dir=' . $this->getOption('with-config-file-scan-dir') . ' ') : '';
-        $sysconfdir = $this->getOption('with-sysconfdir', false) ?
-            ('--sysconfdir=' . $this->getOption('with-sysconfdir') . ' ') : '';

        $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI;
        $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM;
@@ -127,7 +117,6 @@ class LinuxBuilder extends UnixBuilderBase
            ($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
            $config_file_path .
            $config_file_scan_dir .
-            $sysconfdir .
            $json_74 .
            $zts .
            $maxExecutionTimers .
@@ -137,40 +126,35 @@ class LinuxBuilder extends UnixBuilderBase

        $this->emitPatchPoint('before-php-make');
        SourcePatcher::patchBeforeMake($this);
-        PgoManager::patchBeforeMake($this);

        $this->cleanMake();

-        $pgo = $this->pgo;
-        $needsClean = false;
-        $sapiBuilds = [
-            ['cli', $enableCli, true, fn () => $this->buildCli()],
-            ['fpm', $enableFpm, true, fn () => $this->buildFpm()],
-            ['cgi', $enableCgi, true, fn () => $this->buildCgi()],
-            ['micro', $enableMicro, true, fn () => $this->buildMicro()],
-            ['embed', $enableEmbed, true, function () use ($enableMicro): void {
-                if ($enableMicro) {
-                    FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
-                }
-                $this->buildEmbed();
-            }],
-            // frankenphp doesn't rebuild php-src; xcaddy links against the deployed libphp.so
-            ['frankenphp', $enableFrankenphp, false, fn () => $this->buildFrankenphp()],
-        ];
-
-        foreach ($sapiBuilds as [$sapi, $enabled, $rebuildsPhpSrc, $build]) {
-            if (!$enabled) {
-                continue;
+        if ($enableCli) {
+            logger()->info('building cli');
+            $this->buildCli();
+        }
+        if ($enableFpm) {
+            logger()->info('building fpm');
+            $this->buildFpm();
+        }
+        if ($enableCgi) {
+            logger()->info('building cgi');
+            $this->buildCgi();
+        }
+        if ($enableMicro) {
+            logger()->info('building micro');
+            $this->buildMicro();
+        }
+        if ($enableEmbed) {
+            logger()->info('building embed');
+            if ($enableMicro) {
+                FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
            }
-            if ($pgo) {
-                if ($needsClean && $rebuildsPhpSrc) {
-                    $this->cleanMake();
-                }
-                $pgo->applyForSapi($sapi);
-                $needsClean = $needsClean || $rebuildsPhpSrc;
-            }
-            logger()->info('building ' . $sapi);
-            $build();
+            $this->buildEmbed();
+        }
+        if ($enableFrankenphp) {
+            logger()->info('building frankenphp');
+            $this->buildFrankenphp();
        }
        $shared_extensions = array_map('trim', array_filter(explode(',', $this->getOption('build-shared'))));
        if (!empty($shared_extensions)) {
@@ -178,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...');
@@ -282,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;
@@ -304,14 +283,11 @@ class LinuxBuilder extends UnixBuilderBase

        // process libphp.so for shared embed
        $libphpSo = BUILD_LIB_PATH . '/libphp.so';
-        $libphpSoDest = 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
-            preg_match('/-release\s+(\S*)/', getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $matches);
-            if (!empty($matches[1])) {
-                $libphpSoDest = str_replace('.so', '-' . $matches[1] . '.so', $libphpSo);
-            }
-            $this->deployBinary($libphpSo, $libphpSoDest, false);
+            $this->deployBinary($libphpSo, $libphpSo, false);
        }

        // process shared extensions build-with-php
@@ -337,24 +313,85 @@ class LinuxBuilder extends UnixBuilderBase
     */
    private function getMakeExtraVars(): array
    {
-        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true, 'absolute_libs' => true]))->config(array_keys($this->getExts(false)), [], $this->getOption('with-suggested-exts'), $this->lib_list);
+        $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;
-        $extra_ldflags = (string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS');
-        if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared'
-            && !str_contains($extra_ldflags, '-avoid-version')
-            && !preg_match('/-release\s+\S+/', $extra_ldflags)) {
-            $extra_ldflags = trim($extra_ldflags . ' -avoid-version -module');
-        }
-        $extra_ldflags_program = trim("-L{$lib} {$static} -pie " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM'));
        return array_filter([
            'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
            'EXTRA_LIBS' => $config['libs'],
-            'EXTRA_LDFLAGS' => $extra_ldflags,
-            'EXTRA_LDFLAGS_PROGRAM' => $extra_ldflags_program,
+            '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;
+        $realLibName = 'libphp.so';
+        $cwd = getcwd();
+
+        if (preg_match('/-release\s+(\S+)/', $ldflags, $matches)) {
+            $release = $matches[1];
+            $realLibName = "libphp-{$release}.so";
+            $libphpRelease = "{$libDir}/{$realLibName}";
+            if (!file_exists($libphpRelease) && file_exists($libphpSo)) {
+                rename($libphpSo, $libphpRelease);
+            }
+            if (file_exists($libphpRelease)) {
+                chdir($libDir);
+                if (file_exists($libphpSo)) {
+                    unlink($libphpSo);
+                }
+                symlink($realLibName, 'libphp.so');
+                shell()->exec(sprintf(
+                    'patchelf --set-soname %s %s',
+                    escapeshellarg($realLibName),
+                    escapeshellarg($libphpRelease)
+                ));
+            }
+            if (is_dir($modulesDir)) {
+                chdir($modulesDir);
+                foreach ($this->getExts() as $ext) {
+                    if (!$ext->isBuildShared()) {
+                        continue;
+                    }
+                    $name = $ext->getName();
+                    $versioned = "{$name}-{$release}.so";
+                    $unversioned = "{$name}.so";
+                    $src = "{$modulesDir}/{$versioned}";
+                    $dst = "{$modulesDir}/{$unversioned}";
+                    if (is_file($src)) {
+                        rename($src, $dst);
+                        shell()->exec(sprintf(
+                            'patchelf --set-soname %s %s',
+                            escapeshellarg($unversioned),
+                            escapeshellarg($dst)
+                        ));
+                    }
+                }
+            }
+            chdir($cwd);
+        }
+
+        $target = "{$libDir}/{$realLibName}";
+        if (file_exists($target)) {
+            [, $output] = shell()->execWithResult('readelf -d ' . escapeshellarg($target));
+            $output = implode("\n", $output);
+            if (preg_match('/SONAME.*\[(.+)]/', $output, $sonameMatch)) {
+                $currentSoname = $sonameMatch[1];
+                if ($currentSoname !== basename($target)) {
+                    shell()->exec(sprintf(
+                        'patchelf --set-soname %s %s',
+                        escapeshellarg(basename($target)),
+                        escapeshellarg($target)
+                    ));
+                }
+            }
+        }
+    }
+
    /**
     * Patch micro.sfx after UPX compression.
     * micro needs special section handling in LinuxBuilder.
--- a/src/SPC/builder/linux/library/icu.php
+++ b/src/SPC/builder/linux/library/icu.php
@@ -15,11 +15,9 @@ class icu extends LinuxLibraryBase

    protected function build(): void
    {
-        $userCxxFlags = trim((string) getenv('SPC_DEFAULT_CXX_FLAGS'));
-        $userLdFlags = trim((string) getenv('SPC_DEFAULT_LD_FLAGS'));
        $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1 -DPIC -fPIC"';
-        $cxxflags = "CXXFLAGS=\"-std=c++17 -DPIC -fPIC -fno-ident {$userCxxFlags}\"";
-        $ldflags = SPCTarget::isStatic() ? "LDFLAGS=\"-static {$userLdFlags}\"" : "LDFLAGS=\"{$userLdFlags}\"";
+        $cxxflags = 'CXXFLAGS="-std=c++17 -DPIC -fPIC -fno-ident"';
+        $ldflags = SPCTarget::isStatic() ? 'LDFLAGS="-static"' : '';
        shell()->cd($this->source_dir . '/source')->initializeEnv($this)
            ->exec(
                "{$cppflags} {$cxxflags} {$ldflags} " .
--- 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/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
@@ -21,7 +21,6 @@ declare(strict_types=1);

 namespace SPC\builder\linux\library;

-use SPC\builder\linux\SystemUtil;
 use SPC\store\FileSystem;

 class openssl extends LinuxLibraryBase
@@ -52,28 +51,18 @@ class openssl extends LinuxLibraryBase
            $zlib_extra = '';
        }

-        $openssl_dir = getenv('OPENSSLDIR') ?: null;
-        // TODO: in v3 use the following: $openssl_dir ??= SystemUtil::getOSRelease()['dist'] === 'redhat' ? '/etc/pki/tls' : '/etc/ssl';
-        $openssl_dir ??= '/etc/ssl';
        $ex_lib = trim($ex_lib);

-        // OpenSSL's Configure ignores env CFLAGS for its target template; pass our flags as extra args after the target.
-        $userCFlags = trim((string) getenv('SPC_DEFAULT_C_FLAGS'));
-        $userLdFlags = trim((string) getenv('SPC_DEFAULT_LD_FLAGS'));
-        $userExtraFlags = trim($userCFlags . ' ' . $userLdFlags);
-
        shell()->cd($this->source_dir)->initializeEnv($this)
            ->exec(
                "{$env} ./Configure no-shared {$extra} " .
                '--prefix=' . BUILD_ROOT_PATH . ' ' .
                '--libdir=' . BUILD_LIB_PATH . ' ' .
-                "--openssldir={$openssl_dir} " .
+                '--openssldir=/etc/ssl ' .
                "{$zlib_extra}" .
                'enable-pie ' .
                'no-legacy ' .
-                'no-tests ' .
-                "linux-{$arch} " .
-                $userExtraFlags
+                "linux-{$arch}"
            )
            ->exec('make clean')
            ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
--- a/src/SPC/builder/macos/MacOSBuilder.php
+++ b/src/SPC/builder/macos/MacOSBuilder.php
@@ -96,8 +96,6 @@ class MacOSBuilder extends UnixBuilderBase
            ('--with-config-file-path=' . $this->getOption('with-config-file-path') . ' ') : '';
        $config_file_scan_dir = $this->getOption('with-config-file-scan-dir', false) ?
            ('--with-config-file-scan-dir=' . $this->getOption('with-config-file-scan-dir') . ' ') : '';
-        $sysconfdir = $this->getOption('with-sysconfdir', false) ?
-            ('--sysconfdir=' . $this->getOption('with-sysconfdir') . ' ') : '';

        $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI;
        $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM;
@@ -131,7 +129,6 @@ class MacOSBuilder extends UnixBuilderBase
                ($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
                $config_file_path .
                $config_file_scan_dir .
-                $sysconfdir .
                $json_74 .
                $zts .
                $this->makeStaticExtensionArgs() . ' ' .
@@ -296,7 +293,7 @@ class MacOSBuilder extends UnixBuilderBase

    private function getMakeExtraVars(): array
    {
-        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true]))->config(array_keys($this->getExts(false)), [], $this->getOption('with-suggested-exts'), $this->lib_list);
+        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true]))->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
        return array_filter([
            'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
            'EXTRA_LDFLAGS_PROGRAM' => '-L' . BUILD_LIB_PATH,
--- 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/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/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");
@@ -72,8 +72,12 @@ trait UnixSystemUtilTrait
        if (!is_file($symbol_file)) {
            throw new SPCInternalException("The symbol file {$symbol_file} does not exist, please check if nm command is available.");
        }
-        // macOS/zig
-        if (SPCTarget::getTargetOS() !== 'Linux' || ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+        // https://github.com/ziglang/zig/issues/24662
+        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            return '-Wl,--export-dynamic';
+        }
+        // macOS
+        if (SPCTarget::getTargetOS() !== 'Linux') {
            return "-Wl,-exported_symbols_list,{$symbol_file}";
        }
        return "-Wl,--dynamic-list={$symbol_file}";
--- a/src/SPC/builder/unix/UnixBuilderBase.php
+++ b/src/SPC/builder/unix/UnixBuilderBase.php
@@ -145,10 +145,11 @@ abstract class UnixBuilderBase extends BuilderBase
            throw new SPCInternalException("Deploy failed. Cannot find file after copy: {$dst}");
        }

-        if (!$this->getOption('no-strip') && !$this->getOption('pgi') && !$this->getOption('cs-pgi')) {
-            // extract debug info
-            $this->extractDebugInfo($dst);
-            // extra strip
+        // extract debug info
+        $this->extractDebugInfo($dst);
+
+        // strip
+        if (!$this->getOption('no-strip')) {
            $this->stripBinary($dst);
        }

@@ -229,16 +230,14 @@ abstract class UnixBuilderBase extends BuilderBase
            copy(ROOT_DIR . '/src/globals/common-tests/embed.c', $sample_file_path . '/embed.c');
            copy(ROOT_DIR . '/src/globals/common-tests/embed.php', $sample_file_path . '/embed.php');
            $util = new SPCConfigUtil($this);
-            $config = $util->config(array_keys($this->getExts(false)), [], $this->getOption('with-suggested-exts'), $this->lib_list);
+            $config = $util->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
            $lens = "{$config['cflags']} {$config['ldflags']} {$config['libs']}";
            if (SPCTarget::isStatic()) {
                $lens .= ' -static';
            }
            $dynamic_exports = '';
-            $embedType = 'static';
            // if someone changed to EMBED_TYPE=shared, we need to add LD_LIBRARY_PATH
            if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
-                $embedType = 'shared';
                if (PHP_OS_FAMILY === 'Darwin') {
                    $ext_path = 'DYLD_LIBRARY_PATH=' . BUILD_LIB_PATH . ':$DYLD_LIBRARY_PATH ';
                } else {
@@ -257,19 +256,18 @@ abstract class UnixBuilderBase extends BuilderBase
                }
            }
            $cc = getenv('CC');
-
            [$ret, $out] = shell()->cd($sample_file_path)->execWithResult("{$cc} -o embed embed.c {$lens} {$dynamic_exports}");
            if ($ret !== 0) {
                throw new ValidationException(
-                    'embed failed to build. Error message: ' . implode("\n", $out),
-                    validation_module: $embedType . ' libphp embed build sanity check'
+                    'embed failed sanity check: build failed. Error message: ' . implode("\n", $out),
+                    validation_module: 'static libphp.a sanity check'
                );
            }
            [$ret, $output] = shell()->cd($sample_file_path)->execWithResult($ext_path . './embed');
            if ($ret !== 0 || trim(implode('', $output)) !== 'hello') {
                throw new ValidationException(
-                    'embed failed to run. Error message: ' . implode("\n", $output),
-                    validation_module: $embedType . ' libphp embed run sanity check'
+                    'embed failed sanity check: run failed. Error message: ' . implode("\n", $output),
+                    validation_module: 'static libphp.a sanity check'
                );
            }
        }
@@ -365,7 +363,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}");
            }
@@ -440,7 +437,7 @@ abstract class UnixBuilderBase extends BuilderBase
            $staticFlags = '-static-pie';
        }

-        $config = (new SPCConfigUtil($this))->config(array_keys($this->getExts(false)), [], false, $this->lib_list);
+        $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;
        $libs = $config['libs'];
        // Go's gcc driver doesn't automatically link against -lgcov or -lrt. Ugly, but necessary fix.
@@ -450,24 +447,20 @@ abstract class UnixBuilderBase extends BuilderBase
            $cflags .= ' -Wno-error=missing-profile';
            $libs .= ' -lgcov';
        }
-        $extraLdProgram = (string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM');
        $env = [...[
            'CGO_ENABLED' => '1',
            'CGO_CFLAGS' => clean_spaces($cflags),
-            'CGO_LDFLAGS' => trim("{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs} {$extraLdProgram}"),
+            '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/bzip2.php
+++ b/src/SPC/builder/unix/library/bzip2.php
@@ -10,8 +10,7 @@ trait bzip2
 {
    public function patchBeforeBuild(): bool
    {
-        $extra = trim((string) getenv('SPC_DEFAULT_C_FLAGS'));
-        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'CFLAGS=-Wall', "CFLAGS={$extra} -Wall");
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'CFLAGS=-Wall', 'CFLAGS=-fPIC -Wall');
        return true;
    }

--- 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
@@ -30,20 +29,11 @@ trait curl
            ->addConfigureArgs(
                '-DBUILD_CURL_EXE=OFF',
                '-DBUILD_LIBCURL_DOCS=OFF',
-                '-DOPENSSL_ROOT_DIR=' . BUILD_ROOT_PATH,
            )
            ->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/fastlz.php
+++ b/src/SPC/builder/unix/library/fastlz.php
@@ -10,9 +10,8 @@ trait fastlz
 {
    protected function build(): void
    {
-        $extra = trim((string) getenv('SPC_DEFAULT_C_FLAGS'));
        shell()->cd($this->source_dir)->initializeEnv($this)
-            ->exec((getenv('CC') ?: 'cc') . " -c {$extra} fastlz.c -o fastlz.o")
+            ->exec((getenv('CC') ?: 'cc') . ' -c -O3 -fPIC fastlz.c -o fastlz.o')
            ->exec((getenv('AR') ?: 'ar') . ' rcs libfastlz.a fastlz.o');

        if (!copy($this->source_dir . '/fastlz.h', BUILD_INCLUDE_PATH . '/fastlz.h')) {
--- 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/gettext.php
+++ b/src/SPC/builder/unix/library/gettext.php
@@ -16,11 +16,7 @@ trait gettext
            ->addConfigureArgs(
                '--disable-java',
                '--disable-c++',
-                '--disable-d',
-                '--disable-rpath',
-                '--disable-modula2',
-                '--disable-libasprintf',
-                '--with-included-libintl',
+                '--with-included-gettext',
                "--with-iconv-prefix={$this->getBuildRootPath()}",
            );

--- 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/imagemagick.php
+++ b/src/SPC/builder/unix/library/imagemagick.php
@@ -34,9 +34,6 @@ trait imagemagick
            ->addConfigureArgs(
                '--disable-openmp',
                '--without-x',
-                // implicit --with-gcc-arch
-                // bleeds host cpu features into built binaries
-                '--without-gcc-arch',
            );

        // special: linux-static target needs `-static`
--- a/src/SPC/builder/unix/library/jbig.php
+++ b/src/SPC/builder/unix/library/jbig.php
@@ -10,8 +10,7 @@ trait jbig
 {
    public function patchBeforeBuild(): bool
    {
-        $extra = trim((string) getenv('SPC_DEFAULT_C_FLAGS'));
-        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'CFLAGS = -O2 -W -Wno-unused-result', "CFLAGS = {$extra} -W -Wno-unused-result");
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'CFLAGS = -O2 -W -Wno-unused-result', 'CFLAGS = -O2 -W -Wno-unused-result -fPIC');
        return true;
    }

--- 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/libaom.php
+++ b/src/SPC/builder/unix/library/libaom.php
@@ -4,11 +4,9 @@ declare(strict_types=1);

 namespace SPC\builder\unix\library;

-use SPC\builder\linux\SystemUtil;
 use SPC\toolchain\ToolchainManager;
 use SPC\toolchain\ZigToolchain;
 use SPC\util\executor\UnixCMakeExecutor;
-use SPC\util\SPCTarget;

 trait libaom
 {
@@ -19,23 +17,9 @@ trait libaom
            $new = trim($extra . ' -D_GNU_SOURCE');
            f_putenv("SPC_COMPILER_EXTRA={$new}");
        }
-        $targetCpu = SPCTarget::getTargetArch();
-        if (str_starts_with($targetCpu, 'aarch')) {
-            $targetCpu = str_replace('aarch', 'arm', $targetCpu);
-        }
-        if (!SystemUtil::findCommand('nasm') && !SystemUtil::findCommand('yasm')) {
-            $targetCpu = 'generic';
-        }
        UnixCMakeExecutor::create($this)
            ->setBuildDir("{$this->source_dir}/builddir")
-            ->addConfigureArgs(
-                "-DAOM_TARGET_CPU={$targetCpu}",
-                '-DCONFIG_RUNTIME_CPU_DETECT=1',
-                '-DENABLE_EXAMPLES=0',
-                '-DENABLE_TOOLS=0',
-                '-DENABLE_TESTS=0',
-                '-DENABLE_DOCS=0'
-            )
+            ->addConfigureArgs('-DAOM_TARGET_CPU=generic')
            ->build();
        f_putenv("SPC_COMPILER_EXTRA={$extra}");
        $this->patchPkgconfPrefix(['aom.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/libheif.php
+++ b/src/SPC/builder/unix/library/libheif.php
@@ -11,28 +11,15 @@ trait libheif
 {
    public function patchBeforeBuild(): bool
    {
-        $patched = false;
        if (!str_contains(file_get_contents($this->source_dir . '/CMakeLists.txt'), 'libbrotlienc')) {
            FileSystem::replaceFileStr(
                $this->source_dir . '/CMakeLists.txt',
                'list(APPEND REQUIRES_PRIVATE "libbrotlidec")',
                'list(APPEND REQUIRES_PRIVATE "libbrotlidec")' . "\n" . '        list(APPEND REQUIRES_PRIVATE "libbrotlienc")'
            );
-            $patched = true;
+            return true;
        }
-        // libheif 1.22+ ships a C-incompatible header: `struct heif_bad_pixel`
-        $heif_properties = $this->source_dir . '/libheif/api/libheif/heif_properties.h';
-        if (file_exists($heif_properties)
-            && str_contains(file_get_contents($heif_properties), 'struct heif_bad_pixel { uint32_t row; uint32_t column; };')
-        ) {
-            FileSystem::replaceFileStr(
-                $heif_properties,
-                'struct heif_bad_pixel { uint32_t row; uint32_t column; };',
-                'typedef struct heif_bad_pixel { uint32_t row; uint32_t column; } heif_bad_pixel;'
-            );
-            $patched = true;
-        }
-        return $patched;
+        return false;
    }

    protected function build(): void
--- 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/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/liblz4.php
+++ b/src/SPC/builder/unix/library/liblz4.php
@@ -12,13 +12,6 @@ trait liblz4
    {
        // disable executables
        FileSystem::replaceFileStr($this->source_dir . '/programs/Makefile', 'install: lz4', "install: lz4\n\ninstallewfwef: lz4");
-        // zig-cc / clang -flto -c with multiple input files only produces an .o for the first source,
-        // leaving liblz4.a with just lz4.o. Compile sources individually so all .o files exist.
-        FileSystem::replaceFileStr(
-            $this->source_dir . '/lib/Makefile',
-            "liblz4.a: \$(SRCFILES)\nifeq (\$(BUILD_STATIC),yes)  # can be disabled on command line\n\t@echo compiling static library\n\t\$(COMPILE.c) \$^\n\t\$(AR) rcs \$@ *.o\nendif",
-            "liblz4.a: \$(SRCFILES:.c=.o)\nifeq (\$(BUILD_STATIC),yes)  # can be disabled on command line\n\t@echo compiling static library\n\t\$(AR) rcs \$@ \$^\nendif"
-        );
        return true;
    }

@@ -35,7 +28,7 @@ trait liblz4

        $this->patchPkgconfPrefix(['liblz4.pc']);

-        foreach (FileSystem::scanDirFiles(BUILD_LIB_PATH . '/', false, true) as $filename) {
+        foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
            if (str_starts_with($filename, 'liblz4') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) {
                unlink(BUILD_ROOT_PATH . '/lib/' . $filename);
            }
--- 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/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
@@ -10,29 +10,12 @@ use SPC\util\SPCTarget;

 trait ncurses
 {
-    public function patchBeforeBuild(): bool
-    {
-        // MKlib_gen.sh feeds preprocessor stdout through a sed/awk pipeline into lib_gen.c.
-        // zig-cc/clang leaks the "N warning(s) generated." summary onto stdout (not stderr),
-        // and that line ends up as invalid C in the generated source. Filter it out of the pipe.
-        $mklibGen = $this->source_dir . '/ncurses/base/MKlib_gen.sh';
-        if (!str_contains((string) file_get_contents($mklibGen), "| grep -v ' generated")) {
-            FileSystem::replaceFileStr(
-                $mklibGen,
-                '$preprocessor $TMP 2>/dev/null \\',
-                "\$preprocessor \$TMP 2>/dev/null \\\n| grep -v ' generated\\.\$' \\",
-            );
-        }
-        return true;
-    }
-
    protected function build(): void
    {
        $filelist = FileSystem::scanDirFiles(BUILD_BIN_PATH, relative: true);

        UnixAutoconfExecutor::create($this)
            ->appendEnv([
-                'CFLAGS' => '-std=c17 -w',
                'LDFLAGS' => SPCTarget::isStatic() ? '-static' : '',
            ])
            ->configure(
@@ -46,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
@@ -4,14 +4,29 @@ declare(strict_types=1);

 namespace SPC\builder\unix\library;

+use SPC\exception\FileSystemException;
 use SPC\store\FileSystem;
 use SPC\util\PkgConfigUtil;
 use SPC\util\SPCConfigUtil;
+use SPC\util\SPCTarget;

 trait postgresql
 {
    public function patchBeforeBuild(): bool
    {
+        // fix aarch64 build on glibc 2.17 (e.g. CentOS 7)
+        if (SPCTarget::getLibcVersion() === '2.17' && GNU_ARCH === 'aarch64') {
+            try {
+                FileSystem::replaceFileStr("{$this->source_dir}/src/port/pg_popcount_aarch64.c", 'HWCAP_SVE', '0');
+                FileSystem::replaceFileStr(
+                    "{$this->source_dir}/src/port/pg_crc32c_armv8_choose.c",
+                    '#if defined(__linux__) && !defined(__aarch64__) && !defined(HWCAP2_CRC32)',
+                    '#if defined(__linux__) && !defined(HWCAP_CRC32)'
+                );
+            } catch (FileSystemException) {
+                // allow file not-existence to make it compatible with old and new version
+            }
+        }
        // skip the test on platforms where libpq infrastructure may be provided by statically-linked libraries
        FileSystem::replaceFileStr("{$this->source_dir}/src/interfaces/libpq/Makefile", 'invokes exit\'; exit 1;', 'invokes exit\';');
        // disable shared libs build
@@ -35,7 +50,7 @@ trait postgresql
        $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));

        $env_vars = [
-            'CFLAGS' => $config['cflags'] . ' -std=c17',
+            'CFLAGS' => $config['cflags'],
            'CPPFLAGS' => '-DPIC',
            'LDFLAGS' => $config['ldflags'],
            'LIBS' => $config['libs'],
@@ -93,7 +108,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/qdbm.php
+++ b/src/SPC/builder/unix/library/qdbm.php
@@ -14,8 +14,6 @@ trait qdbm
    {
        $ac = UnixAutoconfExecutor::create($this)->configure();
        FileSystem::replaceFileRegex($this->source_dir . '/Makefile', '/MYLIBS = libqdbm.a.*/m', 'MYLIBS = libqdbm.a');
-        $extra = trim((string) getenv('SPC_DEFAULT_C_FLAGS'));
-        FileSystem::replaceFileRegex($this->source_dir . '/Makefile', '/^CFLAGS = .*$/m', "CFLAGS = -Wall {$extra}");
        $ac->make($this instanceof MacOSLibraryBase ? 'mac' : '');
        $this->patchPkgconfPrefix(['qdbm.pc']);
    }
--- 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
@@ -21,15 +20,7 @@ trait unixodbc
            'Linux' => '/etc',
            default => throw new WrongUsageException('Unsupported OS: ' . PHP_OS_FAMILY),
        };
-        // libltdl is incompatible with -flto (https://bugs.gentoo.org/532672)
-        $stripLto = static fn ($s) => preg_replace('/(^|\s)-flto(=\S+)?(?=\s|$)/', ' ', (string) $s);
-        $origC = $this->builder->arch_c_flags;
-        $origCxx = $this->builder->arch_cxx_flags;
-        $origLd = $this->builder->arch_ld_flags;
-        $this->builder->arch_c_flags = clean_spaces($stripLto($origC));
-        $this->builder->arch_cxx_flags = clean_spaces($stripLto($origCxx));
-        $this->builder->arch_ld_flags = clean_spaces($stripLto($origLd));
-        $make = UnixAutoconfExecutor::create($this)
+        UnixAutoconfExecutor::create($this)
            ->configure(
                '--disable-debug',
                '--disable-dependency-tracking',
@@ -37,27 +28,9 @@ trait unixodbc
                '--with-included-ltdl',
                "--sysconfdir={$sysconf_selector}",
                '--enable-gui=no',
-            );
-
-        file_put_contents(
-            "{$this->source_dir}/exe/Makefile",
-            ".PHONY: all install clean check distclean install-strip\nall install clean check distclean install-strip:\n\t@true\n",
-        );
-
-        $make->make();
-        $this->builder->arch_c_flags = $origC;
-        $this->builder->arch_cxx_flags = $origCxx;
-        $this->builder->arch_ld_flags = $origLd;
-
-        $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',
-                ''
-            );
-        }
+            )
+            ->make();
+        $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/curl.php
+++ b/src/SPC/builder/windows/library/curl.php
@@ -30,6 +30,7 @@ class curl extends WindowsLibraryBase
                '-DCMAKE_BUILD_TYPE=Release ' .
                '-DBUILD_SHARED_LIBS=OFF ' .
                '-DBUILD_STATIC_LIBS=ON ' .
+                '-DCURL_STATICLIB=ON ' .
                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
                '-DBUILD_CURL_EXE=OFF ' . // disable curl.exe
                '-DBUILD_TESTING=OFF ' . // disable tests
@@ -41,9 +42,9 @@ class curl extends WindowsLibraryBase
                '-DCURL_USE_OPENSSL=OFF ' . // disable openssl due to certificate issue
                '-DCURL_ENABLE_SSL=ON ' .
                '-DUSE_NGHTTP2=ON ' . // enable nghttp2
-                '-DSHARE_LIB_OBJECT=OFF ' . // disable shared lib object
                '-DCURL_USE_LIBSSH2=ON ' . // enable libssh2
                '-DENABLE_IPV6=ON ' . // enable ipv6
+                '-DNGHTTP2_CFLAGS="/DNGHTTP2_STATICLIB" ' .
                $alt
            )
            ->execWithWrapper(
@@ -52,7 +53,5 @@ class curl extends WindowsLibraryBase
            );
        // move libcurl.lib to libcurl_a.lib
        rename(BUILD_LIB_PATH . '\libcurl.lib', BUILD_LIB_PATH . '\libcurl_a.lib');
-
-        FileSystem::replaceFileStr(BUILD_INCLUDE_PATH . '\curl\curl.h', '#ifdef CURL_STATICLIB', '#if 1');
    }
 }
--- 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/nghttp2.php
+++ b/src/SPC/builder/windows/library/nghttp2.php
@@ -29,16 +29,11 @@ class nghttp2 extends WindowsLibraryBase
                '-DBUILD_SHARED_LIBS=OFF ' .
                '-DENABLE_STATIC_CRT=ON ' .
                '-DENABLE_LIB_ONLY=ON ' .
-                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
-                '-DENABLE_STATIC_CRT=ON ' .
-                '-DENABLE_DOC=OFF ' .
-                '-DBUILD_TESTING=OFF '
+                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
            )
            ->execWithWrapper(
                $this->builder->makeSimpleWrapper('cmake'),
                "--build build --config Release --target install -j{$this->builder->concurrency}"
            );
-
-        FileSystem::replaceFileStr(BUILD_INCLUDE_PATH . '\nghttp2\nghttp2.h', '#ifdef NGHTTP2_STATICLIB', '#if 1');
    }
 }
--- 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/BuildLibsCommand.php
+++ b/src/SPC/command/BuildLibsCommand.php
@@ -19,7 +19,7 @@ class BuildLibsCommand extends BuildCommand
    {
        $this->addArgument('libraries', InputArgument::REQUIRED, 'The libraries will be compiled, comma separated');
        $this->addOption('clean', null, null, 'Clean old download cache and source before fetch');
-        $this->addOption('all', 'A', null, 'Build all libs that static-php-cli has');
+        $this->addOption('all', 'A', null, 'Build all libs that static-php-cli needed');
    }

    public function initialize(InputInterface $input, OutputInterface $output): void
--- a/src/SPC/command/BuildPHPCommand.php
+++ b/src/SPC/command/BuildPHPCommand.php
@@ -39,7 +39,6 @@ class BuildPHPCommand extends BuildCommand
        $this->addOption('disable-opcache-jit', null, null, 'disable opcache jit');
        $this->addOption('with-config-file-path', null, InputOption::VALUE_REQUIRED, 'Set the path in which to look for php.ini', $isWindows ? null : '/usr/local/etc/php');
        $this->addOption('with-config-file-scan-dir', null, InputOption::VALUE_REQUIRED, 'Set the directory to scan for .ini files after reading php.ini', $isWindows ? null : '/usr/local/etc/php/conf.d');
-        $this->addOption('with-sysconfdir', null, InputOption::VALUE_REQUIRED, 'Set the sysconfdir (e.g. /etc/php-zts) used by configure (not available on Windows)');
        $this->addOption('with-hardcoded-ini', 'I', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Patch PHP source code, inject hardcoded INI');
        $this->addOption('with-micro-fake-cli', null, null, 'Let phpmicro\'s PHP_SAPI use "cli" instead of "micro"');
        $this->addOption('with-suggested-libs', 'L', null, 'Build with suggested libs for selected exts and libs');
@@ -50,9 +49,6 @@ class BuildPHPCommand extends BuildCommand
        $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('pgi', null, null, 'Build instrumented binaries (-fprofile-generate). Run them to collect .profraw files, then re-run with --pgo.');
-        $this->addOption('cs-pgi', null, null, 'Build cs-instrumented binaries (-fprofile-use=<existing.profdata> -fcs-profile-generate). Requires a prior --pgi+--pgo cycle.');
-        $this->addOption('pgo', null, null, 'Build optimised binaries (-fprofile-use) from .profraw collected by a previous --pgi run.');
    }

    public function handle(): int
@@ -181,7 +177,7 @@ class BuildPHPCommand extends BuildCommand
        // compile libraries
        $builder->proveLibs($libraries);
        // check extensions
-        $builder->proveExts($static_extensions, $shared_extensions, build_target: $rule);
+        $builder->proveExts($static_extensions, $shared_extensions);
        // validate libs and extensions
        $builder->validateLibsAndExts();

@@ -214,8 +210,9 @@ class BuildPHPCommand extends BuildCommand

        // clean old modules that may conflict with the new php build
        FileSystem::removeDir(BUILD_MODULES_PATH);
-
+        // start to build
        $builder->buildPHP($rule);
+
        $builder->testPHP($rule);

        // compile stopwatch :P
--- a/src/SPC/command/CraftCommand.php
+++ b/src/SPC/command/CraftCommand.php
@@ -10,7 +10,6 @@ use SPC\store\pkg\Zig;
 use SPC\toolchain\ToolchainManager;
 use SPC\toolchain\ZigToolchain;
 use SPC\util\ConfigValidator;
-use SPC\util\DependencyUtil;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Process\Process;

@@ -20,10 +19,6 @@ class CraftCommand extends BuildCommand
    public function configure(): void
    {
        $this->addArgument('craft', null, 'Path to craft.yml file', WORKING_DIR . '/craft.yml');
-        $this->addOption('pgi', null, null, 'Forward --pgi to the inner build (instrumented binaries).');
-        $this->addOption('cs-pgi', null, null, 'Forward --cs-pgi to the inner build (cs-instrumented binaries).');
-        $this->addOption('pgo', null, null, 'Forward --pgo to the inner build (use collected profile data).');
-        $this->addOption('libs-only', null, null, 'Build only the libraries needed by the configured exts (skip PHP and extension build).');
    }

    public function handle(): int
@@ -108,38 +103,12 @@ class CraftCommand extends BuildCommand

        // craft build
        if ($craft['craft-options']['build']) {
-            if ($this->getOption('libs-only')) {
-                $exts = array_merge($craft['extensions'], $craft['shared-extensions'] ?? []);
-                $include_suggested_exts = (bool) ($craft['build-options']['with-suggested-exts'] ?? false);
-                $include_suggested_libs = (bool) ($craft['build-options']['with-suggested-libs'] ?? false);
-                [, $needed_libs] = DependencyUtil::getExtsAndLibs(
-                    $exts,
-                    $craft['libs'],
-                    $include_suggested_exts,
-                    $include_suggested_libs,
-                );
-                if ($needed_libs === []) {
-                    $this->output->writeln('<comment>No libs needed for the configured extensions; skipping build:libs.</comment>');
-                } else {
-                    $retcode = $this->runCommand('build:libs', implode(',', $needed_libs));
-                    if ($retcode !== 0) {
-                        $this->output->writeln('<error>craft build:libs failed</error>');
-                        return static::FAILURE;
-                    }
-                }
-            } else {
-                $args = [$static_extensions, "--with-libs={$libs}", "--build-shared={$shared_extensions}", ...array_map(fn ($x) => "--build-{$x}", $craft['sapi'])];
-                $this->optionsToArguments($craft['build-options'], $args);
-                foreach (['pgi', 'cs-pgi', 'pgo'] as $pgoFlag) {
-                    if ($this->getOption($pgoFlag)) {
-                        $args[] = "--{$pgoFlag}";
-                    }
-                }
-                $retcode = $this->runCommand('build', ...$args);
-                if ($retcode !== 0) {
-                    $this->output->writeln('<error>craft build failed</error>');
-                    return static::FAILURE;
-                }
+            $args = [$static_extensions, "--with-libs={$libs}", "--build-shared={$shared_extensions}", ...array_map(fn ($x) => "--build-{$x}", $craft['sapi'])];
+            $this->optionsToArguments($craft['build-options'], $args);
+            $retcode = $this->runCommand('build', ...$args);
+            if ($retcode !== 0) {
+                $this->output->writeln('<error>craft build failed</error>');
+                return static::FAILURE;
            }
        }

--- 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/command/SwitchPhpVersionCommand.php
+++ b/src/SPC/command/SwitchPhpVersionCommand.php
@@ -20,9 +20,9 @@ class SwitchPhpVersionCommand extends BaseCommand
        $this->addArgument(
            'php-major-version',
            InputArgument::REQUIRED,
-            'PHP major version (supported: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5)',
+            'PHP major version (supported: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4)',
            null,
-            fn () => ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
+            fn () => ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
        );
        $this->no_motd = true;

@@ -32,7 +32,7 @@ class SwitchPhpVersionCommand extends BaseCommand
    public function handle(): int
    {
        $php_ver = $this->input->getArgument('php-major-version');
-        if (!in_array($php_ver, ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'])) {
+        if (!in_array($php_ver, ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'])) {
            // match x.y.z
            preg_match('/^\d+\.\d+\.\d+$/', $php_ver, $matches);
            if (!$matches) {
--- a/src/SPC/doctor/item/LinuxMuslCheck.php
+++ b/src/SPC/doctor/item/LinuxMuslCheck.php
@@ -74,10 +74,9 @@ class LinuxMuslCheck
        SourcePatcher::patchFile('musl-1.2.5_CVE-2025-26519_0002.patch', SOURCE_PATH . "/{$musl_version_name}");
        logger()->info('Installing musl wrapper');
        shell()->cd(SOURCE_PATH . "/{$musl_version_name}")
-            ->setEnv(['CC' => 'gcc', 'CXX' => 'g++', 'AR' => 'ar', 'LD' => 'ld', 'RANLIB' => 'ranlib'])
-            ->exec('./configure --disable-gcc-wrapper')
-            ->exec('make -j')
-            ->exec("{$prefix}make install");
+            ->exec('CC=gcc CXX=g++ AR=ar LD=ld ./configure --disable-gcc-wrapper')
+            ->exec('CC=gcc CXX=g++ AR=ar LD=ld make -j')
+            ->exec("CC=gcc CXX=g++ AR=ar LD=ld {$prefix}make install");
        // TODO: add path using putenv instead of editing /etc/profile
        return true;
    }
--- a/src/SPC/doctor/item/LinuxToolCheckList.php
+++ b/src/SPC/doctor/item/LinuxToolCheckList.php
@@ -22,6 +22,7 @@ class LinuxToolCheckList
        'bzip2', 'cmake', 'gcc',
        'g++', 'patch', 'binutils-gold',
        'libtoolize', 'which',
+        'patchelf',
    ];

    public const TOOLS_DEBIAN = [
@@ -30,6 +31,7 @@ class LinuxToolCheckList
        'tar', 'unzip', 'gzip', 'gcc', 'g++',
        'bzip2', 'cmake', 'patch',
        'xz', 'libtoolize', 'which',
+        'patchelf',
    ];

    public const TOOLS_RHEL = [
@@ -37,7 +39,8 @@ class LinuxToolCheckList
        'git', 'autoconf', 'automake',
        'tar', 'unzip', 'gzip', 'gcc', 'g++',
        'bzip2', 'cmake', 'patch', 'which',
-        'xz', 'libtool', 'gettext-devel', 'file',
+        'xz', 'libtool', 'gettext-devel',
+        'patchelf', 'file',
    ];

    public const TOOLS_ARCH = [
@@ -109,7 +112,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
@@ -97,52 +97,29 @@ 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}",
+            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 (!($source['match'] ?? null)) {
+                $url = $rel['tarball_url'] ?? null;
+                break;
            }
-            if (!$url) {
-                throw new DownloaderException("failed to find {$name} source");
+            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,
            method: 'HEAD',
@@ -153,7 +130,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];
@@ -175,16 +152,6 @@ class Downloader
            hooks: [[CurlHook::class, 'setupGithubToken']],
            retries: self::getRetryAttempts()
        ), true);
-        if (($source['prefer-stable'] ?? false) === true) {
-            $latest = json_decode(self::curlExec(
-                url: "https://api.github.com/repos/{$source['repo']}/releases/latest",
-                hooks: [[CurlHook::class, 'setupGithubToken']],
-                retries: self::getRetryAttempts()
-            ), true);
-            if (is_array($latest) && isset($latest['assets'])) {
-                array_unshift($data, $latest);
-            }
-        }
        $url = null;
        $filename = null;
        foreach ($data as $release) {
--- 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':
@@ -408,15 +408,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 +572,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 +648,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/SourcePatcher.php
+++ b/src/SPC/store/SourcePatcher.php
@@ -22,10 +22,9 @@ class SourcePatcher
        FileSystem::addSourceExtractHook('swoole', [__CLASS__, 'patchSwoole']);
        FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchPhpLibxml212']);
        FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchGDWin32']);
-        // FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchFfiCentos7FixO3strncmp']);
+        FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchFfiCentos7FixO3strncmp']);
        FileSystem::addSourceExtractHook('sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
        FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
-        FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVPhp85']);
        FileSystem::addSourceExtractHook('yaml', [__CLASS__, 'patchYamlWin32']);
        FileSystem::addSourceExtractHook('libyaml', [__CLASS__, 'patchLibYaml']);
        FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchImapLicense']);
@@ -95,10 +94,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,31 +124,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",
-            );
-        }
-
-        // strip our build-time env vars from phpinfo's "Configure Command" ('|' delimiter: PHP_BUILD_PROVIDER may contain '#')
-        if (is_unix()) {
-            FileSystem::replaceFileStr(
-                SOURCE_PATH . '/php-src/configure',
-                'for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS EXTRA_LDFLAGS_PROGRAM LIBS CC CXX; do',
-                'for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS EXTRA_LDFLAGS_PROGRAM LIBS CC CXX '
-                . 'PKG_CONFIG PKG_CONFIG_PATH EXTENSION_DIR OPENSSL_LIBS '
-                . 'PHP_BUILD_SYSTEM PHP_BUILD_PROVIDER PHP_BUILD_COMPILER PHP_BUILD_ARCH; do',
-            );
-            FileSystem::replaceFileStr(
-                SOURCE_PATH . '/php-src/configure',
-                'clean_configure_args=$(echo $clean_configure_args | $SED -e "s#\'$var=$val\'##")',
-                'clean_configure_args=$(echo $clean_configure_args | $SED -e "s|\'$var=$val\'||")',
-            );
-        }
-
        if (file_exists(SOURCE_PATH . '/php-src/configure.ac.bak')) {
            // restore configure.ac
            FileSystem::restoreBackupFile(SOURCE_PATH . '/php-src/configure.ac');
@@ -346,6 +316,20 @@ class SourcePatcher
                logger()->info("Library [{$lib->getName()}] patched before make");
            }
        }
+
+        if (str_contains((string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), '-release')) {
+            FileSystem::replaceFileLineContainsString(
+                SOURCE_PATH . '/php-src/ext/standard/info.c',
+                '#ifdef CONFIGURE_COMMAND',
+                '#ifdef NO_CONFIGURE_COMMAND',
+            );
+        } else {
+            FileSystem::replaceFileLineContainsString(
+                SOURCE_PATH . '/php-src/ext/standard/info.c',
+                '#ifdef NO_CONFIGURE_COMMAND',
+                '#ifdef CONFIGURE_COMMAND',
+            );
+        }
    }

    public static function patchHardcodedINI(array $ini = []): bool
@@ -448,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'");
@@ -649,13 +616,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}");
        }
@@ -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);
    }
@@ -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/pkg/Zig.php
+++ b/src/SPC/store/pkg/Zig.php
@@ -10,7 +10,6 @@ use SPC\store\CurlHook;
 use SPC\store\Downloader;
 use SPC\store\FileSystem;
 use SPC\store\LockFile;
-use SPC\util\SPCTarget;

 class Zig extends CustomPackage
 {
@@ -73,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) {
@@ -117,17 +113,18 @@ class Zig extends CustomPackage
                break;
            }
        }
-        if (!$all_exist) {
-            $lock = json_decode(FileSystem::readFile(LockFile::LOCK_FILE), true);
-            $source_type = $lock[$name]['source_type'];
-            $filename = DOWNLOAD_PATH . '/' . ($lock[$name]['filename'] ?? $lock[$name]['dirname']);
-            $extract = "{$pkgroot}/zig";
-
-            FileSystem::extractPackage($name, $source_type, $filename, $extract);
-
-            $this->createZigCcScript($zig_bin_dir);
+        if ($all_exist) {
+            return;
        }
-        $this->buildClangRuntimeBits($zig_bin_dir);
+
+        $lock = json_decode(FileSystem::readFile(LockFile::LOCK_FILE), true);
+        $source_type = $lock[$name]['source_type'];
+        $filename = DOWNLOAD_PATH . '/' . ($lock[$name]['filename'] ?? $lock[$name]['dirname']);
+        $extract = "{$pkgroot}/zig";
+
+        FileSystem::extractPackage($name, $source_type, $filename, $extract);
+
+        $this->createZigCcScript($zig_bin_dir);
    }

    public static function getEnvironment(): array
@@ -140,209 +137,6 @@ class Zig extends CustomPackage
        return PKG_ROOT_PATH . '/zig';
    }

-    /**
-     * Build the bits of clang's runtime that zig 0.16 doesn't ship: the
-     * profile runtime (so -fprofile-generate actually emits .profraw) and
-     * crtbegin.o/crtend.o (so shared libraries get __dso_handle and the
-     * __cxa_finalize atexit hook).
-     *
-     * Build from 2mb compiler-rt-<llvm>.src tar
-     * to avoid downloading 2gb full prebuilt tarball.
-     */
-    private function buildClangRuntimeBits(string $zig_bin_dir): void
-    {
-        if (PHP_OS_FAMILY !== 'Linux') {
-            return;
-        }
-        $libDir = "{$zig_bin_dir}/lib";
-        $profileLib = "{$libDir}/libclang_rt.profile.a";
-        $crtBegin = "{$libDir}/clang_rt.crtbegin.o";
-        $crtEnd = "{$libDir}/clang_rt.crtend.o";
-        $cpuModelLib = "{$libDir}/libclang_rt.cpu_model.a";
-        if (file_exists($profileLib) && file_exists($crtBegin) && file_exists($crtEnd) && file_exists($cpuModelLib)) {
-            return;
-        }
-
-        $zig = "{$zig_bin_dir}/zig";
-        $verLine = trim((string) shell_exec(escapeshellarg($zig) . ' cc --version 2>/dev/null'));
-        if (!preg_match('/clang version (\d+\.\d+\.\d+)/', $verLine, $m)) {
-            throw new \RuntimeException('[zig] could not detect bundled clang version; cannot build clang runtime bits (--pgo, __dso_handle, __cpu_model)');
-        }
-        $llvmVersion = $m[1];
-        logger()->info("Building clang runtime bits for LLVM {$llvmVersion} (zig's bundled clang)");
-
-        $srcRoot = $this->fetchCompilerRtSource($llvmVersion);
-        if ($srcRoot === null) {
-            throw new \RuntimeException("[zig] failed to fetch compiler-rt {$llvmVersion} sources; cannot build clang runtime bits (--pgo, __dso_handle, __cpu_model)");
-        }
-
-        $targetFlag = $this->baselineZigTarget();
-
-        f_mkdir($libDir, recursive: true);
-        if (!file_exists($profileLib)) {
-            $this->buildProfileRuntime($zig, $srcRoot, $profileLib, $targetFlag);
-        }
-        if (!file_exists($crtBegin) || !file_exists($crtEnd)) {
-            $this->buildCrtObjects($zig, $srcRoot, $crtBegin, $crtEnd, $targetFlag);
-        }
-        if (!file_exists($cpuModelLib)) {
-            $this->buildCpuModelBuiltins($zig, $srcRoot, $cpuModelLib, $targetFlag);
-        }
-        FileSystem::removeDir($srcRoot);
-
-        // A zig install missing any of these degrades silently at build time
-        // (no .profraw with --pgo, no __dso_handle in shared libs, unresolved
-        // __cpu_model for __builtin_cpu_supports — the last one even changes
-        // which code paths PHP's configure picks, making builds
-        // machine-dependent). Fail the install instead.
-        $missing = array_filter(
-            [$profileLib, $crtBegin, $crtEnd, $cpuModelLib],
-            fn ($f) => !file_exists($f)
-        );
-        if ($missing !== []) {
-            throw new \RuntimeException('[zig] failed to build clang runtime bits: missing ' . implode(', ', array_map('basename', $missing)) . ' (see warnings above)');
-        }
-    }
-
-    /**
-     * A concrete `-target {arch}-linux-{abi}` for the clang runtime bits.
-     */
-    private function baselineZigTarget(): string
-    {
-        $arch = SPCTarget::getTargetArch();
-        $abi = SPCTarget::getLibc() === 'musl' ? 'musl' : 'gnu';
-        return "-target {$arch}-linux-{$abi}";
-    }
-
-    private function buildCpuModelBuiltins(string $zig, string $srcRoot, string $libPath, string $targetFlag): void
-    {
-        $builtins = "{$srcRoot}/lib/builtins";
-        $arch = php_uname('m');
-        $cpuModelDir = "{$builtins}/cpu_model";
-        if (is_dir($cpuModelDir)) {
-            $src = match (true) {
-                in_array($arch, ['x86_64', 'amd64', 'i386', 'i686', 'x86'], true) => "{$cpuModelDir}/x86.c",
-                in_array($arch, ['aarch64', 'arm64'], true) => "{$cpuModelDir}/aarch64.c",
-                str_starts_with($arch, 'riscv') => "{$cpuModelDir}/riscv.c",
-                default => null,
-            };
-            $includes = '-I' . escapeshellarg($builtins) . ' -I' . escapeshellarg($cpuModelDir);
-        } else {
-            $src = "{$builtins}/cpu_model.c";
-            $includes = '-I' . escapeshellarg($builtins);
-        }
-        if ($src === null || !is_file($src)) {
-            logger()->warning("[zig] cpu_model source not found for arch {$arch} under {$builtins} — __builtin_cpu_supports/__cpu_model will be unresolved");
-            return;
-        }
-
-        $objDir = "{$srcRoot}/obj-cpu-model";
-        f_mkdir($objDir, recursive: true);
-        $obj = "{$objDir}/cpu_model.o";
-        $cflags = $targetFlag . ' -c -O2 -fPIC ' . $includes;
-        $cmd = escapeshellarg($zig) . ' cc ' . $cflags . ' -o ' . escapeshellarg($obj) . ' ' . escapeshellarg($src) . ' 2>&1';
-        if (!$this->runZigCmd($cmd, $obj, "failed to compile {$src}")) {
-            return;
-        }
-        $arCmd = escapeshellarg($zig) . ' ar rcs ' . escapeshellarg($libPath) . ' ' . escapeshellarg($obj) . ' 2>&1';
-        if (!$this->runZigCmd($arCmd, $libPath, 'zig ar failed for cpu_model')) {
-            return;
-        }
-        logger()->info('[zig] libclang_rt.cpu_model.a installed (' . filesize($libPath) . ' bytes)');
-    }
-
-    private function fetchCompilerRtSource(string $llvmVersion): ?string
-    {
-        $pkgName = "compiler-rt-{$llvmVersion}";
-        $tarball = "compiler-rt-{$llvmVersion}.src.tar.xz";
-        $url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-{$llvmVersion}/{$tarball}";
-        try {
-            Downloader::downloadPackage($pkgName, [
-                'type' => 'url',
-                'url' => $url,
-                'filename' => $tarball,
-            ]);
-        } catch (\Throwable $e) {
-            logger()->warning("[zig] failed to download {$tarball}: {$e->getMessage()}");
-            return null;
-        }
-        $srcRoot = PKG_ROOT_PATH . "/compiler-rt-src-{$llvmVersion}";
-        FileSystem::removeDir($srcRoot);
-        FileSystem::extractPackage($pkgName, SPC_SOURCE_ARCHIVE, DOWNLOAD_PATH . '/' . $tarball, $srcRoot);
-        return $srcRoot;
-    }
-
-    private function buildProfileRuntime(string $zig, string $srcRoot, string $libPath, string $targetFlag): void
-    {
-        $profileSrc = "{$srcRoot}/lib/profile";
-        $profileInc = "{$srcRoot}/include";
-        if (!is_dir($profileSrc)) {
-            logger()->warning("[zig] profile src dir missing at {$profileSrc} — --pgo will not work");
-            return;
-        }
-        $sources = array_merge(
-            glob("{$profileSrc}/*.c") ?: [],
-            glob("{$profileSrc}/*.cpp") ?: []
-        );
-        $skip = ['/PlatformAIX', '/PlatformDarwin', '/PlatformFuchsia', '/PlatformOther', '/PlatformWindows', '/WindowsMMap'];
-        $sources = array_filter($sources, function ($f) use ($skip) {
-            foreach ($skip as $s) {
-                if (str_contains($f, $s)) {
-                    return false;
-                }
-            }
-            return true;
-        });
-
-        $objDir = "{$srcRoot}/obj-profile";
-        f_mkdir($objDir, recursive: true);
-        $cflags = $targetFlag . ' -c -O2 -fPIC -fvisibility=hidden ' .
-            '-I' . escapeshellarg($profileInc) . ' ' .
-            '-DCOMPILER_RT_HAS_ATOMICS=1 -DCOMPILER_RT_HAS_FCNTL_LCK=1 -DCOMPILER_RT_HAS_UNAME=1';
-        $objs = [];
-        foreach ($sources as $src) {
-            $obj = $objDir . '/' . pathinfo($src, PATHINFO_FILENAME) . '.o';
-            $cmd = escapeshellarg($zig) . ' cc ' . $cflags . ' -o ' . escapeshellarg($obj) . ' ' . escapeshellarg($src) . ' 2>&1';
-            if (!$this->runZigCmd($cmd, $obj, "failed to compile {$src}")) {
-                return;
-            }
-            $objs[] = $obj;
-        }
-        $arCmd = escapeshellarg($zig) . ' ar rcs ' . escapeshellarg($libPath) . ' ' . implode(' ', array_map('escapeshellarg', $objs)) . ' 2>&1';
-        if (!$this->runZigCmd($arCmd, $libPath, 'zig ar failed')) {
-            return;
-        }
-        logger()->info('[zig] libclang_rt.profile.a installed (' . filesize($libPath) . ' bytes)');
-    }
-
-    private function buildCrtObjects(string $zig, string $srcRoot, string $crtBegin, string $crtEnd, string $targetFlag): void
-    {
-        $beginSrc = "{$srcRoot}/lib/builtins/crtbegin.c";
-        $endSrc = "{$srcRoot}/lib/builtins/crtend.c";
-        if (!is_file($beginSrc) || !is_file($endSrc)) {
-            logger()->error("[zig] crtbegin/crtend source missing under {$srcRoot}/lib/builtins — shared libs will lack __dso_handle");
-            return;
-        }
-        $cflags = $targetFlag . ' -c -O2 -fPIC -fvisibility=hidden -DCRT_HAS_INITFINI_ARRAY';
-        foreach ([[$beginSrc, $crtBegin], [$endSrc, $crtEnd]] as [$src, $dst]) {
-            $cmd = escapeshellarg($zig) . ' cc ' . $cflags . ' -o ' . escapeshellarg($dst) . ' ' . escapeshellarg($src) . ' 2>&1';
-            if (!$this->runZigCmd($cmd, $dst, "failed to compile {$src}")) {
-                return;
-            }
-        }
-        logger()->info('[zig] clang_rt.crtbegin.o + clang_rt.crtend.o installed (' . filesize($crtBegin) . ' + ' . filesize($crtEnd) . ' bytes)');
-    }
-
-    private function runZigCmd(string $cmd, string $dst, string $errPrefix): bool
-    {
-        exec($cmd, $out, $rc);
-        if ($rc !== 0 || !is_file($dst)) {
-            logger()->warning("[zig] {$errPrefix}: " . implode("\n", $out));
-            return false;
-        }
-        return true;
-    }
-
    private function createZigCcScript(string $bin_dir): void
    {
        $script_path = __DIR__ . '/../scripts/zig-cc.sh';
--- a/src/SPC/store/scripts/zig-cc.sh
+++ b/src/SPC/store/scripts/zig-cc.sh
@@ -1,14 +1,9 @@
 #!/usr/bin/env bash

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

-is_buildroot_inc() {
-    [[ -n "$BUILDROOT_ABS" && "$1" == "$BUILDROOT_ABS" ]]
-}
-
 while [[ $# -gt 0 ]]; do
    case "$1" in
        -isystem)
@@ -16,33 +11,27 @@ while [[ $# -gt 0 ]]; do
            ARG="$1"
            shift
            ARG_ABS="$(realpath "$ARG" 2>/dev/null || true)"
-            is_buildroot_inc "$ARG_ABS" && PARSED_ARGS+=("-I$ARG") || PARSED_ARGS+=("-isystem" "$ARG")
+            [[ "$ARG_ABS" == "$BUILDROOT_ABS" ]] && PARSED_ARGS+=("-I$ARG") || PARSED_ARGS+=("-isystem" "$ARG")
            ;;
        -isystem*)
            ARG="${1#-isystem}"
            shift
            ARG_ABS="$(realpath "$ARG" 2>/dev/null || true)"
-            is_buildroot_inc "$ARG_ABS" && PARSED_ARGS+=("-I$ARG") || PARSED_ARGS+=("-isystem$ARG")
+            [[ "$ARG_ABS" == "$BUILDROOT_ABS" ]] && PARSED_ARGS+=("-I$ARG") || PARSED_ARGS+=("-isystem$ARG")
            ;;
        -march=*|-mcpu=*)
            OPT_NAME="${1%%=*}"
            OPT_VALUE="${1#*=}"
-            # zig rejects -march=armv8-a but accepts -mcpu=generic+v8a; rewrite
-            # armv<X>[.<Y>]-a[+feat] -> generic+v<X>[_<Y>]a[+feat] so it goes through.
-            if [[ "$OPT_VALUE" =~ ^armv([89])(\.([0-9]+))?-a(\+.*)?$ ]]; then
-                arch_feat="v${BASH_REMATCH[1]}"
-                [[ -n "${BASH_REMATCH[3]}" ]] && arch_feat="${arch_feat}_${BASH_REMATCH[3]}"
-                OPT_VALUE="generic+${arch_feat}a${BASH_REMATCH[4]}"
+            # Skip armv8- flags entirely as Zig doesn't support them
+            if [[ "$OPT_VALUE" == armv8-* ]]; then
+                shift
+                continue
            fi
-            # zig uses snake_case in CPU/feature names (x86-64 -> x86_64).
+            # replace -march=x86-64 with -march=x86_64
            OPT_VALUE="${OPT_VALUE//-/_}"
            PARSED_ARGS+=("${OPT_NAME}=${OPT_VALUE}")
            shift
            ;;
-        -Wlogical-op|-Wduplicated-cond|-Wduplicated-branches|-Wno-clobbered|-Wjump-misses-init|-Wformat-truncation|-Warray-bounds=*|-Wimplicit-fallthrough=*)
-            # GCC-only warning flags that clang/zig doesn't recognize; drop to silence -Wunknown-warning-option noise
-            shift
-            ;;
        *)
            PARSED_ARGS+=("$1")
            shift
@@ -50,27 +39,6 @@ while [[ $# -gt 0 ]]; do
    esac
 done

-IS_LINK=1
-NEED_PROFILE_RT=0 # https://codeberg.org/ziglang/zig/issues/32066
-NEED_CRT=0 # https://codeberg.org/ziglang/zig/issues/32064
-for _a in "${PARSED_ARGS[@]}"; do
-    case "$_a" in
-        -c|-S|-E|-M|-MM) IS_LINK=0 ;;
-        -fprofile-generate*|-fprofile-instr-generate*|-fcs-profile-generate*) NEED_PROFILE_RT=1 ;;
-        -shared) NEED_CRT=1 ;;
-    esac
-done
-[[ "$SPC_COMPILER_EXTRA" == *-fprofile-generate* || "$SPC_COMPILER_EXTRA" == *-fcs-profile-generate* ]] && NEED_PROFILE_RT=1
-if [[ $IS_LINK -eq 1 && $NEED_PROFILE_RT -eq 1 && -f "$SCRIPT_DIR/lib/libclang_rt.profile.a" ]]; then
-    PARSED_ARGS+=("-x" "none" "$SCRIPT_DIR/lib/libclang_rt.profile.a" "-Wl,-u,__llvm_profile_runtime")
-fi
-if [[ $IS_LINK -eq 1 && $NEED_CRT -eq 1 && -f "$SCRIPT_DIR/lib/clang_rt.crtbegin.o" && -f "$SCRIPT_DIR/lib/clang_rt.crtend.o" ]]; then
-    PARSED_ARGS+=("-x" "none" "$SCRIPT_DIR/lib/clang_rt.crtbegin.o" "$SCRIPT_DIR/lib/clang_rt.crtend.o")
-fi
-if [[ $IS_LINK -eq 1 && -f "$SCRIPT_DIR/lib/libclang_rt.cpu_model.a" ]]; then
-    PARSED_ARGS+=("-x" "none" "$SCRIPT_DIR/lib/libclang_rt.cpu_model.a")
-fi
-
 [[ -n "$SPC_TARGET" ]] && TARGET="-target $SPC_TARGET" || TARGET=""

 if [[ "$SPC_TARGET" =~ \.[0-9]+\.[0-9]+ ]]; then
--- 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/toolchain/ClangNativeToolchain.php
+++ b/src/SPC/toolchain/ClangNativeToolchain.php
@@ -21,7 +21,6 @@ class ClangNativeToolchain implements ToolchainInterface
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CC=clang');
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CXX=clang++');
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=ar');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_RANLIB=ranlib');
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=ld');
    }

--- a/src/SPC/toolchain/GccNativeToolchain.php
+++ b/src/SPC/toolchain/GccNativeToolchain.php
@@ -18,7 +18,6 @@ class GccNativeToolchain implements ToolchainInterface
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CC=gcc');
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CXX=g++');
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=ar');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_RANLIB=ranlib');
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=ld');
    }

--- a/src/SPC/toolchain/MuslToolchain.php
+++ b/src/SPC/toolchain/MuslToolchain.php
@@ -16,7 +16,6 @@ class MuslToolchain implements ToolchainInterface
        GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_CC={$arch}-linux-musl-gcc");
        GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_CXX={$arch}-linux-musl-g++");
        GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_AR={$arch}-linux-musl-ar");
-        GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_RANLIB={$arch}-linux-musl-ranlib");
        GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_LD={$arch}-linux-musl-ld");
        GlobalEnvManager::addPathIfNotExists('/usr/local/musl/bin');
        GlobalEnvManager::addPathIfNotExists("/usr/local/musl/{$arch}-linux-musl/bin");
--- a/src/SPC/toolchain/ZigToolchain.php
+++ b/src/SPC/toolchain/ZigToolchain.php
@@ -16,8 +16,28 @@ class ZigToolchain implements ToolchainInterface
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CC=zig-cc');
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_CXX=zig-c++');
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_AR=zig-ar');
-        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_RANLIB=zig-ranlib');
        GlobalEnvManager::putenv('SPC_LINUX_DEFAULT_LD=zig-ld.lld');
+
+        // Generate additional objects needed for zig toolchain
+        $paths = ['/usr/lib/gcc', '/usr/local/lib/gcc'];
+        $objects = ['crtbeginS.o', 'crtendS.o'];
+        $found = [];
+
+        foreach ($objects as $obj) {
+            $located = null;
+            foreach ($paths as $base) {
+                $output = shell_exec("find {$base} -name {$obj} 2>/dev/null | grep -v '/32/' | head -n 1");
+                $line = trim((string) $output);
+                if ($line !== '') {
+                    $located = $line;
+                    break;
+                }
+            }
+            if ($located) {
+                $found[] = $located;
+            }
+        }
+        GlobalEnvManager::putenv('SPC_EXTRA_RUNTIME_OBJECTS=' . implode(' ', $found));
    }

    public function afterInit(): void
@@ -47,17 +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}");
-        }
-        // An __attribute__((ifunc)) in LTO bitcode crashes zig 0.16's lld (LLVM 21)
-        // during thin-link symbol resolution
-        $all_flags = $cflags . ' ' . (getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') ?: '') . ' ' . (getenv('SPC_DEFAULT_LD_FLAGS') ?: '');
-        if (str_contains($all_flags, '-flto')) {
-            $extra_vars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
-            if (!str_contains($extra_vars, 'ax_cv_have_func_attribute_ifunc')) {
-                GlobalEnvManager::putenv("SPC_EXTRA_PHP_VARS={$extra_vars} ax_cv_have_func_attribute_ifunc=no");
-            }
+            GlobalEnvManager::putenv('SPC_EXTRA_PHP_VARS=php_cv_have_avx512=no php_cv_have_avx512vbmi=no');
        }
    }

--- a/Show More
+++ b/Show More