zstd stable too

Removed unused import of FileSystem.

.github/workflows/build-unix.yml

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

.github/workflows/tests.yml

@@ -32,10 +32,13 @@ jobs:
           php-version: '8.4'
           extensions: curl, openssl, mbstring
           ini-values: memory_limit=-1
-          tools: pecl, composer, php-cs-fixer
+          tools: pecl, composer
+
+      - name: "Install dependencies"
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Run PHP-CS-Fixer fix
-        run: php-cs-fixer fix --dry-run --diff --ansi
+        run: vendor/bin/php-cs-fixer fix --dry-run --diff --ansi
 
   phpstan:
     runs-on: ubuntu-latest

bin/spc-alpine-docker

@@ -108,8 +108,7 @@ RUN apk update; \
         wget \
         xz \
         gettext-dev \
-        binutils-gold \
-        patchelf
+        binutils-gold
 
 RUN curl -#fSL https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-linux-\$(uname -m).tar.gz | tar -xz -C /usr/local/bin && \
     chmod +x /usr/local/bin/php

bin/spc-gnu-docker

@@ -92,11 +92,6 @@ RUN echo "source scl_source enable devtoolset-10" >> /etc/bashrc
 RUN source /etc/bashrc
 RUN yum install -y which
 
-RUN curl -fsSL -o patchelf.tgz https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-$SPC_USE_ARCH.tar.gz && \
-    mkdir -p /patchelf && \
-    tar -xzf patchelf.tgz -C /patchelf --strip-components=1 && \
-    cp /patchelf/bin/patchelf /usr/bin/
-
 RUN curl -o cmake.tgz -#fSL https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$SPC_USE_ARCH.tar.gz && \
     mkdir /cmake && \
     tar -xzf cmake.tgz -C /cmake --strip-components 1

composer.lock

@@ -2602,6 +2602,75 @@
             },
             "time": "2025-04-07T20:06:18+00:00"
         },
+        {
+            "name": "ergebnis/agent-detector",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ergebnis/agent-detector.git",
+                "reference": "5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ergebnis/agent-detector/zipball/5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64",
+                "reference": "5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0 || ~8.6.0"
+            },
+            "require-dev": {
+                "ergebnis/composer-normalize": "^2.50.0",
+                "ergebnis/license": "^2.7.0",
+                "ergebnis/php-cs-fixer-config": "^6.60.2",
+                "ergebnis/phpstan-rules": "^2.13.1",
+                "ergebnis/phpunit-slow-test-detector": "^2.24.0",
+                "ergebnis/rector-rules": "^1.16.0",
+                "fakerphp/faker": "^1.24.1",
+                "infection/infection": "^0.26.6",
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^2.1.46",
+                "phpstan/phpstan-deprecation-rules": "^2.0.4",
+                "phpstan/phpstan-phpunit": "^2.0.16",
+                "phpstan/phpstan-strict-rules": "^2.0.10",
+                "phpunit/phpunit": "^9.6.34",
+                "rector/rector": "^2.4.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.0-dev"
+                },
+                "composer-normalize": {
+                    "indent-size": 2,
+                    "indent-style": "space"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Ergebnis\\AgentDetector\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andreas Möller",
+                    "email": "am@localheinz.com",
+                    "homepage": "https://localheinz.com"
+                }
+            ],
+            "description": "Provides a detector for detecting the presence of an agent.",
+            "homepage": "https://github.com/ergebnis/agent-detector",
+            "support": {
+                "issues": "https://github.com/ergebnis/agent-detector/issues",
+                "security": "https://github.com/ergebnis/agent-detector/blob/main/.github/SECURITY.md",
+                "source": "https://github.com/ergebnis/agent-detector"
+            },
+            "time": "2026-04-10T13:45:13+00:00"
+        },
         {
             "name": "evenement/evenement",
             "version": "v3.0.2",
@@ -2864,22 +2933,23 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.92.3",
+            "version": "v3.95.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8"
+                "reference": "a9727678fbd12997f1d9de8f4a37824ed9df1065"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8",
-                "reference": "2ba8f5a60f6f42fb65758cfb3768434fa2d1c7e8",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a9727678fbd12997f1d9de8f4a37824ed9df1065",
+                "reference": "a9727678fbd12997f1d9de8f4a37824ed9df1065",
                 "shasum": ""
             },
             "require": {
                 "clue/ndjson-react": "^1.3",
                 "composer/semver": "^3.4",
                 "composer/xdebug-handler": "^3.0.5",
+                "ergebnis/agent-detector": "^1.1.1",
                 "ext-filter": "*",
                 "ext-hash": "*",
                 "ext-json": "*",
@@ -2890,7 +2960,7 @@
                 "react/event-loop": "^1.5",
                 "react/socket": "^1.16",
                 "react/stream": "^1.4",
-                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
+                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0 || ^8.0",
                 "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0 || ^8.0",
                 "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
                 "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
@@ -2904,18 +2974,18 @@
                 "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "facile-it/paraunit": "^1.3.1 || ^2.7",
-                "infection/infection": "^0.31.0",
-                "justinrainbow/json-schema": "^6.5",
-                "keradus/cli-executor": "^2.2",
+                "facile-it/paraunit": "^1.3.1 || ^2.8.0",
+                "infection/infection": "^0.32.6",
+                "justinrainbow/json-schema": "^6.8.0",
+                "keradus/cli-executor": "^2.3",
                 "mikey179/vfsstream": "^1.6.12",
-                "php-coveralls/php-coveralls": "^2.9",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
-                "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
+                "php-coveralls/php-coveralls": "^2.9.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.8",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.8",
+                "phpunit/phpunit": "^9.6.34 || ^10.5.63 || ^11.5.55",
                 "symfony/polyfill-php85": "^1.33",
-                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2 || ^8.0",
-                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2 || ^8.0"
+                "symfony/var-dumper": "^5.4.48 || ^6.4.32 || ^7.4.4 || ^8.0.8",
+                "symfony/yaml": "^5.4.45 || ^6.4.30 || ^7.4.1 || ^8.0.8"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -2956,7 +3026,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.92.3"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.95.1"
             },
             "funding": [
                 {
@@ -2964,7 +3034,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-12-18T10:45:02+00:00"
+            "time": "2026-04-12T17:00:09+00:00"
         },
         {
             "name": "humbug/box",
@@ -7573,5 +7643,5 @@
         "ext-zlib": "*"
     },
     "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }

config/env.ini

@@ -75,8 +75,10 @@ SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime
 ; - musl-native: used for alpine linux, can build `musl` and `musl -dynamic` target.
 ; - gnu-native: used for general linux distros, can build gnu target for the installed glibc version only.
 
-; LEGACY option to specify the target
+; option to specify the target, superceded by SPC_TARGET if set
 SPC_LIBC=musl
+; uncomment to link libc dynamically on musl
+; SPC_MUSL_DYNAMIC=true
 
 ; Recommended: specify your target here. Zig toolchain will be used.
 ; examples:
@@ -91,6 +93,7 @@ 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"
@@ -115,6 +118,10 @@ 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.
@@ -142,6 +149,10 @@ 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

config/ext.json

@@ -43,6 +43,27 @@
     "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"
     },
@@ -55,7 +76,8 @@
         ],
         "ext-depends-windows": [
             "zlib",
-            "openssl"
+            "openssl",
+            "brotli"
         ]
     },
     "dba": {
@@ -65,6 +87,19 @@
             "qdbm"
         ]
     },
+    "decimal": {
+        "type": "external",
+        "source": "ext-decimal",
+        "arg-type": "custom",
+        "lib-depends": [
+            "libmpdec"
+        ]
+    },
+    "deepclone": {
+        "type": "external",
+        "source": "deepclone",
+        "arg-type": "enable"
+    },
     "dio": {
         "support": {
             "BSD": "wip"
@@ -127,9 +162,41 @@
             "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",
@@ -220,6 +287,7 @@
         "support": {
             "BSD": "wip"
         },
+        "arg-type": "with-path",
         "type": "external",
         "source": "ext-gmssl",
         "lib-depends": [
@@ -236,6 +304,7 @@
         "arg-type-unix": "enable-path",
         "cpp-extension": true,
         "lib-depends": [
+            "grpc",
             "zlib",
             "openssl",
             "libcares"
@@ -410,8 +479,7 @@
         "ext-depends": [
             "zlib",
             "session"
-        ],
-        "build-with-php": true
+        ]
     },
     "memcached": {
         "support": {
@@ -500,7 +568,9 @@
             "mysqlnd"
         ],
         "lib-depends": [
-            "libsodium",
+            "libsodium"
+        ],
+        "lib-suggests": [
             "openssl"
         ]
     },
@@ -515,7 +585,9 @@
             "mysqlnd"
         ],
         "lib-depends": [
-            "libsodium",
+            "libsodium"
+        ],
+        "lib-suggests": [
             "openssl"
         ]
     },

config/lib.json

@@ -109,8 +109,7 @@
             "krb5"
         ],
         "lib-suggests-windows": [
-            "brotli",
-            "zstd"
+            "brotli"
         ],
         "frameworks": [
             "CoreFoundation",
@@ -124,7 +123,7 @@
             "libfastlz.a"
         ],
         "headers": [
-            "fastlz/fastlz.h"
+            "fastlz.h"
         ]
     },
     "freetype": {
@@ -143,9 +142,7 @@
             "zlib"
         ],
         "lib-suggests": [
-            "libpng",
-            "bzip2",
-            "brotli"
+            "libpng"
         ]
     },
     "gettext": {
@@ -355,12 +352,18 @@
         "static-libs-unix": [
             "libaom.a"
         ],
+        "static-libs-windows": [
+            "aom.lib"
+        ],
         "cpp-library": true
     },
     "libargon2": {
         "source": "libargon2",
         "static-libs-unix": [
             "libargon2.a"
+        ],
+        "lib-suggests": [
+            "libsodium"
         ]
     },
     "libavif": {
@@ -370,6 +373,15 @@
         ],
         "static-libs-windows": [
             "avif.lib"
+        ],
+        "lib-depends": [
+            "libaom"
+        ],
+        "lib-suggests": [
+            "libwebp",
+            "libjpeg",
+            "libxml2",
+            "libpng"
         ]
     },
     "libcares": {
@@ -442,6 +454,7 @@
     },
     "libheif": {
         "source": "libheif",
+        "cpp-library": true,
         "static-libs-unix": [
             "libheif.a"
         ],
@@ -481,7 +494,7 @@
         "static-libs-windows": [
             "libjpeg_a.lib"
         ],
-        "lib-suggests-windows": [
+        "lib-depends": [
             "zlib"
         ]
     },
@@ -516,6 +529,18 @@
             "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,
@@ -750,7 +775,6 @@
             "xz"
         ],
         "lib-suggests-windows": [
-            "zstd",
             "openssl"
         ]
     },
@@ -850,6 +874,9 @@
     },
     "openssl": {
         "source": "openssl",
+        "pkg-configs": [
+            "openssl"
+        ],
         "static-libs-unix": [
             "libssl.a",
             "libcrypto.a"
@@ -962,6 +989,11 @@
     },
     "unixodbc": {
         "source": "unixodbc",
+        "pkg-configs": [
+            "odbc",
+            "odbccr",
+            "odbcinst"
+        ],
         "static-libs-unix": [
             "libodbc.a",
             "libodbccr.a",
@@ -979,6 +1011,9 @@
         ],
         "headers": [
             "wtr/watcher-c.h"
+        ],
+        "frameworks": [
+            "CoreServices"
         ]
     },
     "xz": {
@@ -1003,6 +1038,9 @@
     },
     "zlib": {
         "source": "zlib",
+        "pkg-configs": [
+            "zlib"
+        ],
         "static-libs-unix": [
             "libz.a"
         ],
@@ -1016,6 +1054,9 @@
     },
     "zstd": {
         "source": "zstd",
+        "pkg-configs": [
+            "libzstd"
+        ],
         "static-libs-unix": [
             "libzstd.a"
         ],

config/source.json

@@ -11,6 +11,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/amqp",
         "path": "php-src/ext/amqp",
+        "filename": "amqp.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -20,6 +21,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/APCu",
         "path": "php-src/ext/apcu",
+        "filename": "apcu.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -29,6 +31,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/ast",
         "path": "php-src/ext/ast",
+        "filename": "ast.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -81,10 +84,30 @@
             "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",
         "path": "php-src/ext/dio",
+        "filename": "dio.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -94,16 +117,26 @@
         "type": "url",
         "url": "https://pecl.php.net/get/ev",
         "path": "php-src/ext/ev",
+        "filename": "ev.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
         }
     },
     "ext-brotli": {
-        "type": "git",
+        "type": "ghtagtar",
+        "repo": "kjdev/php-ext-brotli",
         "path": "php-src/ext/brotli",
-        "rev": "master",
-        "url": "https://github.com/kjdev/php-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",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -113,6 +146,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/ds",
         "path": "php-src/ext/ds",
+        "filename": "ds.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -120,13 +154,41 @@
     },
     "ext-event": {
         "type": "url",
-        "url": "https://bitbucket.org/osmanov/pecl-event/get/3.0.8.tar.gz",
+        "url": "https://bitbucket.org/osmanov/pecl-event/get/3.1.4.tar.gz",
         "path": "php-src/ext/event",
         "license": {
             "type": "file",
             "path": "LICENSE"
         }
     },
+    "ext-excimer": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/excimer",
+        "path": "php-src/ext/excimer",
+        "filename": "excimer.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
+    "ext-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",
@@ -149,6 +211,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/grpc",
         "path": "php-src/ext/grpc",
+        "filename": "grpc.tgz",
         "license": {
             "type": "file",
             "path": [
@@ -160,6 +223,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/imagick",
         "path": "php-src/ext/imagick",
+        "filename": "imagick.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -169,6 +233,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/imap",
         "path": "php-src/ext/imap",
+        "filename": "imap.tgz",
         "license": {
             "type": "file",
             "path": [
@@ -190,6 +255,7 @@
     "ext-maxminddb": {
         "type": "url",
         "url": "https://pecl.php.net/get/maxminddb",
+        "filename": "ext-maxminddb.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -199,6 +265,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/memcache",
         "path": "php-src/ext/memcache",
+        "filename": "memcache.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -206,7 +273,7 @@
     },
     "ext-rdkafka": {
         "type": "ghtar",
-        "repo": "arnaud-lb/php-rdkafka",
+        "repo": "php-rdkafka/php-rdkafka",
         "path": "php-src/ext/rdkafka",
         "license": {
             "type": "file",
@@ -217,6 +284,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/simdjson",
         "path": "php-src/ext/simdjson",
+        "filename": "simdjson.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -236,6 +304,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/ssh2",
         "path": "php-src/ext/ssh2",
+        "filename": "ssh2.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -245,6 +314,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/trader",
         "path": "php-src/ext/trader",
+        "filename": "trader.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -254,6 +324,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/uuid",
         "path": "php-src/ext/uuid",
+        "filename": "uuid.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -263,6 +334,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/uv",
         "path": "php-src/ext/uv",
+        "filename": "uv.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -281,16 +353,16 @@
     "ext-zip": {
         "type": "url",
         "url": "https://pecl.php.net/get/zip",
+        "filename": "ext-zip.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
         }
     },
     "ext-zstd": {
-        "type": "git",
+        "type": "ghtar",
+        "repo": "kjdev/php-ext-zstd",
         "path": "php-src/ext/zstd",
-        "rev": "master",
-        "url": "https://github.com/kjdev/php-ext-zstd",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -334,7 +406,7 @@
     },
     "gmp": {
         "type": "filelist",
-        "url": "https://gmplib.org/download/gmp/",
+        "url": "https://ftp.gnu.org/gnu/gmp/",
         "regex": "/href=\"(?<file>gmp-(?<version>[^\"]+)\\.tar\\.xz)\"/",
         "provide-pre-built": true,
         "alt": {
@@ -347,9 +419,9 @@
         }
     },
     "gmssl": {
-        "type": "ghtar",
-        "repo": "guanzhi/GmSSL",
-        "provide-pre-built": true,
+        "type": "git",
+        "url": "https://github.com/guanzhi/GmSSL.git",
+        "rev": "master",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -388,6 +460,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/igbinary",
         "path": "php-src/ext/igbinary",
+        "filename": "igbinary.tgz",
         "license": {
             "type": "file",
             "path": "COPYING"
@@ -414,6 +487,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/inotify",
         "path": "php-src/ext/inotify",
+        "filename": "inotify.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -433,10 +507,8 @@
         }
     },
     "krb5": {
-        "type": "ghtagtar",
-        "repo": "krb5/krb5",
-        "match": "krb5.+-final",
-        "prefer-stable": true,
+        "type": "url",
+        "url": "https://web.mit.edu/kerberos/dist/krb5/1.22/krb5-1.22.2.tar.gz",
         "license": {
             "type": "file",
             "path": "NOTICE"
@@ -497,7 +569,7 @@
     "libavif": {
         "type": "ghtar",
         "repo": "AOMediaCodec/libavif",
-        "provide-pre-built": true,
+        "provide-pre-built": false,
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -612,6 +684,7 @@
     "libjpeg": {
         "type": "ghtar",
         "repo": "libjpeg-turbo/libjpeg-turbo",
+        "prefer-stable": true,
         "license": {
             "type": "file",
             "path": "LICENSE.md"
@@ -653,6 +726,14 @@
             "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",
@@ -693,7 +774,7 @@
     "libsodium": {
         "type": "ghrel",
         "repo": "jedisct1/libsodium",
-        "match": "libsodium-\\d+(\\.\\d+)*\\.tar\\.gz",
+        "match": "libsodium-(?!1\\.0\\.21)\\d+(\\.\\d+)*\\.tar\\.gz",
         "prefer-stable": true,
         "provide-pre-built": true,
         "license": {
@@ -818,6 +899,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/memcached",
         "path": "php-src/ext/memcached",
+        "filename": "memcached.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -858,6 +940,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/msgpack",
         "path": "php-src/ext/msgpack",
+        "filename": "msgpack.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -943,7 +1026,7 @@
     "openssl": {
         "type": "ghrel",
         "repo": "openssl/openssl",
-        "match": "openssl.+\\.tar\\.gz",
+        "match": "openssl-3.+\\.tar\\.gz",
         "prefer-stable": true,
         "alt": {
             "type": "filelist",
@@ -960,6 +1043,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/opentelemetry",
         "path": "php-src/ext/opentelemetry",
+        "filename": "opentelemetry.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -969,6 +1053,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/parallel",
         "path": "php-src/ext/parallel",
+        "filename": "parallel.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -977,6 +1062,7 @@
     "pcov": {
         "type": "url",
         "url": "https://pecl.php.net/get/pcov",
+        "filename": "pcov.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -986,6 +1072,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/pdo_sqlsrv",
         "path": "php-src/ext/pdo_sqlsrv",
+        "filename": "pdo_sqlsrv.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1021,6 +1108,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/protobuf",
         "path": "php-src/ext/protobuf",
+        "filename": "protobuf.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1082,6 +1170,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/redis",
         "path": "php-src/ext/redis",
+        "filename": "redis.tgz",
         "license": {
             "type": "file",
             "path": [
@@ -1121,6 +1210,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/sqlsrv",
         "path": "php-src/ext/sqlsrv",
+        "filename": "sqlsrv.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1130,7 +1220,6 @@
         "path": "php-src/ext/swoole",
         "type": "ghtar",
         "repo": "swoole/swoole-src",
-        "match": "v6\\.+",
         "prefer-stable": true,
         "license": {
             "type": "file",
@@ -1186,6 +1275,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/xhprof",
         "path": "php-src/ext/xhprof-src",
+        "filename": "xhprof.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1195,6 +1285,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/xlswriter",
         "path": "php-src/ext/xlswriter",
+        "filename": "xlswriter.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1215,6 +1306,7 @@
         "type": "url",
         "url": "https://pecl.php.net/get/yac",
         "path": "php-src/ext/yac",
+        "filename": "yac.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"

docs/en/guide/action-build.md

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

docs/en/guide/manual-build.md

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

docs/zh/guide/action-build.md

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

docs/zh/guide/manual-build.md

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

phpstan.neon

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

src/SPC/ConsoleApplication.php

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

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> library names */
+    /** @var array<int, string> all libraries being built (resolved dep list) */
     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): void
+    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
     {
         // judge ext
         foreach ($static_extensions as $ext) {
@@ -160,7 +160,7 @@ abstract class BuilderBase
         }
         if (!$skip_extract) {
             $this->emitPatchPoint('before-php-extract');
-            SourceManager::initSource(sources: [$this->getPhpSrcName()], source_only: true);
+            SourceManager::initSource(sources: ['php-src'], source_only: true);
             $this->emitPatchPoint('after-php-extract');
             if ($this->getPHPVersionID() >= 80000) {
                 $this->emitPatchPoint('before-micro-extract');
@@ -171,7 +171,9 @@ abstract class BuilderBase
             SourceManager::initSource(exts: [...$static_extensions, ...$shared_extensions]);
             $this->emitPatchPoint('after-exts-extract');
             // patch micro
-            SourcePatcher::patchMicro();
+            if (($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO) {
+                SourcePatcher::patchMicro();
+            }
         }
 
         foreach ([...$static_extensions, ...$shared_extensions] as $extension) {
@@ -319,7 +321,7 @@ abstract class BuilderBase
     public function getPHPVersionFromArchive(?string $file = null): false|string
     {
         if ($file === null) {
-            $lock = LockFile::get($this->getPhpSrcName());
+            $lock = LockFile::get('php-src');
             if ($lock === null) {
                 return false;
             }
@@ -498,14 +500,6 @@ abstract class BuilderBase
         }
     }
 
-    /**
-     * Get the php-src name to use for lock file lookups (supports version-specific names like php-src-8.2)
-     */
-    protected function getPhpSrcName(): string
-    {
-        return getenv('SPC_PHP_SRC_NAME') ?: 'php-src';
-    }
-
     /**
      * Generate micro extension test php code.
      */

src/SPC/builder/Extension.php

@@ -11,8 +11,10 @@ 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
 {
@@ -96,7 +98,8 @@ class Extension
             fn ($x) => $x->getStaticLibFiles(),
             $this->getLibraryDependencies(recursive: true)
         );
-        return implode(' ', $ret);
+        $libs = implode(' ', $ret);
+        return deduplicate_flags($libs);
     }
 
     /**
@@ -183,14 +186,6 @@ 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;
     }
 
@@ -230,7 +225,7 @@ class Extension
         if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
             $prefix = $matches[1];
             $currentLibs = trim($matches[2]);
-            $newLibs = trim("{$currentLibs} {$staticLibs} {$lstdcpp}");
+            $newLibs = clean_spaces("{$currentLibs} {$staticLibs} {$lstdcpp}");
             $deduplicatedLibs = deduplicate_flags($newLibs);
 
             FileSystem::replaceFileRegex(
@@ -240,13 +235,6 @@ 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;
     }
 
@@ -398,13 +386,12 @@ class Extension
                     $dependency->buildShared([...$visited, $this->getName()]);
                 }
             }
-            if (Config::getExt($this->getName(), 'type') === 'addon') {
-                return;
-            }
+            $this->builder->emitPatchPoint('before-shared-ext[' . $this->getName() . ']-build');
             match (PHP_OS_FAMILY) {
                 'Darwin', 'Linux' => $this->buildUnixShared(),
                 default => throw new WrongUsageException(PHP_OS_FAMILY . ' build shared extensions is not supported yet'),
             };
+            $this->builder->emitPatchPoint('after-shared-ext[' . $this->getName() . ']-build');
         } catch (SPCException $e) {
             $e->bindExtensionInfo(['extension_name' => $this->getName()]);
             throw $e;
@@ -455,12 +442,17 @@ 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, $soFile, false);
+        $builder->deployBinary($soFile, $soDest, false);
     }
 
     /**
@@ -538,14 +530,24 @@ class Extension
      */
     protected function getSharedExtensionEnv(): array
     {
-        $config = (new SPCConfigUtil($this->builder))->getExtensionConfig($this);
+        $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+        if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            $compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
+            GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
+        }
+        $config = (new SPCConfigUtil($this->builder, ['no_php' => true]))->getExtensionConfig($this);
         [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
         $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
         $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
+        $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,
         ];

src/SPC/builder/LibraryBase.php

@@ -365,6 +365,27 @@ abstract class LibraryBase
 
     protected function isLibraryInstalled(): bool
     {
+        if ($pkg_configs = Config::getLib(static::NAME, 'pkg-configs', [])) {
+            $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
+            $search_paths = array_unique(array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path)));
+
+            foreach ($pkg_configs as $name) {
+                $found = false;
+                foreach ($search_paths as $path) {
+                    if (file_exists($path . "/{$name}.pc")) {
+                        $found = true;
+                        break;
+                    }
+                }
+                if (!$found) {
+                    return false;
+                }
+            }
+            // allow using system dependencies if pkg_config_path is explicitly defined
+            if (count($search_paths) > 1) {
+                return true;
+            }
+        }
         foreach (Config::getLib(static::NAME, 'static-libs', []) as $name) {
             if (!file_exists(BUILD_LIB_PATH . "/{$name}")) {
                 return false;

src/SPC/builder/extension/clickhouse.php

@@ -0,0 +1,21 @@
+<?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;
+    }
+}

src/SPC/builder/extension/com_dotnet.php

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

src/SPC/builder/extension/decimal.php

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

src/SPC/builder/extension/ffi.php

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

src/SPC/builder/extension/grpc.php

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

src/SPC/builder/extension/memcache.php

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

src/SPC/builder/extension/mongodb.php

@@ -5,11 +5,22 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('mongodb')]
 class mongodb extends Extension
 {
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileRegex(
+            SOURCE_PATH . '/php-src/ext/mongodb/config.m4',
+            '/^(\s+)(src\/libmongoc\/)/m',
+            '$1${ac_config_dir}/$2'
+        );
+        return true;
+    }
+
     public function getUnixConfigureArg(bool $shared = false): string
     {
         $arg = ' --enable-mongodb' . ($shared ? '=shared' : '') . ' ';

src/SPC/builder/extension/opcache.php

@@ -58,7 +58,10 @@ class opcache extends Extension
         ) {
             $opcache_jit = ' --disable-opcache-jit';
         }
-        return '--enable-opcache' . ($shared ? '=shared' : '') . $opcache_jit;
+        if ($phpVersionID < 80500) {
+            return '--enable-opcache' . ($shared ? '=shared' : '') . $opcache_jit;
+        }
+        return trim($opcache_jit);
     }
 
     public function getDistName(): string

src/SPC/builder/extension/password_argon2.php

@@ -24,25 +24,6 @@ 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) {

src/SPC/builder/extension/spx.php

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

src/SPC/builder/extension/sqlsrv.php

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

src/SPC/builder/extension/swoole.php

@@ -50,19 +50,16 @@ class swoole extends Extension
 
         // commonly used feature: coroutine-time
         $arg .= ' --enable-swoole-coro-time --with-pic';
+        $arg .= ' --enable-swoole-ssh --enable-swoole-curl';
 
         $arg .= $this->builder->getOption('enable-zts') ? ' --enable-swoole-thread --disable-thread-context' : ' --disable-swoole-thread --enable-thread-context';
 
-        // required features: curl, openssl (but curl hook is buggy for php 8.0)
-        $arg .= $this->builder->getPHPVersionID() >= 80100 ? ' --enable-swoole-curl' : ' --disable-swoole-curl';
-        $arg .= ' --enable-openssl';
-
         // additional features that only require libraries
         $arg .= $this->builder->getLib('libcares') ? ' --enable-cares' : '';
         $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : '';
         $arg .= $this->builder->getLib('nghttp2') ? (' --with-nghttp2-dir=' . BUILD_ROOT_PATH) : '';
         $arg .= $this->builder->getLib('zstd') ? ' --enable-zstd' : '';
-        $arg .= $this->builder->getLib('liburing') ? ' --enable-iouring' : '';
+        $arg .= $this->builder->getLib('liburing') && getenv('SPC_LIBC') !== 'glibc' ? ' --enable-iouring --enable-uring-socket' : '--disable-iouring';
         $arg .= $this->builder->getExt('sockets') ? ' --enable-sockets' : '';
 
         // enable additional features that require the pdo extension, but conflict with pdo_* extensions
@@ -74,6 +71,7 @@ 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';

src/SPC/builder/extension/xlswriter.php

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

src/SPC/builder/freebsd/BSDBuilder.php

@@ -65,6 +65,8 @@ 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;
@@ -89,6 +91,7 @@ class BSDBuilder extends UnixBuilderBase
                 ($enableMicro ? '--enable-micro ' : '--disable-micro ') .
                 $config_file_path .
                 $config_file_scan_dir .
+                $sysconfdir .
                 $json_74 .
                 $zts .
                 $this->makeStaticExtensionArgs()

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

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

src/SPC/builder/linux/LinuxBuilder.php

@@ -11,7 +11,10 @@ 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;
 
@@ -20,6 +23,8 @@ 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;
@@ -46,6 +51,8 @@ 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);
 
@@ -65,7 +72,8 @@ class LinuxBuilder extends UnixBuilderBase
             // php 8.5 contains opcache extension by default,
             // if opcache_jit is enabled for 8.5 or opcache enabled,
             // we need to disable undefined behavior sanitizer.
-            f_putenv('SPC_COMPILER_EXTRA=-fno-sanitize=undefined');
+            $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+            f_putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
         }
 
         if ($this->getOption('enable-zts', false)) {
@@ -80,6 +88,8 @@ 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;
@@ -117,6 +127,7 @@ class LinuxBuilder extends UnixBuilderBase
             ($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
             $config_file_path .
             $config_file_scan_dir .
+            $sysconfdir .
             $json_74 .
             $zts .
             $maxExecutionTimers .
@@ -126,35 +137,40 @@ class LinuxBuilder extends UnixBuilderBase
 
         $this->emitPatchPoint('before-php-make');
         SourcePatcher::patchBeforeMake($this);
+        PgoManager::patchBeforeMake($this);
 
         $this->cleanMake();
 
-        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');
+        $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;
             }
-            $this->buildEmbed();
-        }
-        if ($enableFrankenphp) {
-            logger()->info('building frankenphp');
-            $this->buildFrankenphp();
+            if ($pgo) {
+                if ($needsClean && $rebuildsPhpSrc) {
+                    $this->cleanMake();
+                }
+                $pgo->applyForSapi($sapi);
+                $needsClean = $needsClean || $rebuildsPhpSrc;
+            }
+            logger()->info('building ' . $sapi);
+            $build();
         }
         $shared_extensions = array_map('trim', array_filter(explode(',', $this->getOption('build-shared'))));
         if (!empty($shared_extensions)) {
@@ -162,7 +178,7 @@ class LinuxBuilder extends UnixBuilderBase
                 throw new WrongUsageException(
                     "You're building against musl libc statically (the default on Linux), but you're trying to build shared extensions.\n" .
                     'Static musl libc does not implement `dlopen`, so your php binary is not able to load shared extensions.' . "\n" .
-                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, or use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc`.'
+                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc` or use SPC_MUSL_DYNAMIC=true on alpine.'
                 );
             }
             logger()->info('Building shared extensions...');
@@ -266,6 +282,11 @@ 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;
@@ -283,11 +304,14 @@ 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
-            $this->deployBinary($libphpSo, $libphpSo, false);
+            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);
         }
 
         // process shared extensions build-with-php
@@ -313,85 +337,24 @@ class LinuxBuilder extends UnixBuilderBase
      */
     private function getMakeExtraVars(): array
     {
-        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true, 'absolute_libs' => true]))->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
+        $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);
         $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' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
-            'EXTRA_LDFLAGS_PROGRAM' => "-L{$lib} {$static} -pie",
+            'EXTRA_LDFLAGS' => $extra_ldflags,
+            'EXTRA_LDFLAGS_PROGRAM' => $extra_ldflags_program,
         ]);
     }
 
-    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.

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

@@ -15,9 +15,11 @@ 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"';
-        $ldflags = SPCTarget::isStatic() ? 'LDFLAGS="-static"' : '';
+        $cxxflags = "CXXFLAGS=\"-std=c++17 -DPIC -fPIC -fno-ident {$userCxxFlags}\"";
+        $ldflags = SPCTarget::isStatic() ? "LDFLAGS=\"-static {$userLdFlags}\"" : "LDFLAGS=\"{$userLdFlags}\"";
         shell()->cd($this->source_dir . '/source')->initializeEnv($this)
             ->exec(
                 "{$cppflags} {$cxxflags} {$ldflags} " .

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

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

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

@@ -21,6 +21,7 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
+use SPC\builder\linux\SystemUtil;
 use SPC\store\FileSystem;
 
 class openssl extends LinuxLibraryBase
@@ -51,19 +52,28 @@ 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=/etc/ssl ' .
+                "--openssldir={$openssl_dir} " .
                 "{$zlib_extra}" .
                 'enable-pie ' .
                 'no-legacy ' .
                 'no-tests ' .
-                "linux-{$arch}"
+                "linux-{$arch} " .
+                $userExtraFlags
             )
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")

src/SPC/builder/macos/MacOSBuilder.php

@@ -96,6 +96,8 @@ 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;
@@ -129,6 +131,7 @@ class MacOSBuilder extends UnixBuilderBase
                 ($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
                 $config_file_path .
                 $config_file_scan_dir .
+                $sysconfdir .
                 $json_74 .
                 $zts .
                 $this->makeStaticExtensionArgs() . ' ' .
@@ -293,7 +296,7 @@ class MacOSBuilder extends UnixBuilderBase
 
     private function getMakeExtraVars(): array
     {
-        $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'));
+        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true]))->config(array_keys($this->getExts(false)), [], $this->getOption('with-suggested-exts'), $this->lib_list);
         return array_filter([
             'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             'EXTRA_LDFLAGS_PROGRAM' => '-L' . BUILD_LIB_PATH,

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

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

src/SPC/builder/traits/UnixSystemUtilTrait.php

@@ -50,7 +50,7 @@ trait UnixSystemUtilTrait
         $defined = array_unique($defined);
         sort($defined);
         // export
-        if (SPCTarget::getTargetOS() === 'Linux') {
+        if (SPCTarget::getTargetOS() === 'Linux' && ToolchainManager::getToolchainClass() !== ZigToolchain::class) {
             file_put_contents("{$lib_file}.dynsym", "{\n" . implode("\n", array_map(fn ($x) => "  {$x};", $defined)) . "};\n");
         } else {
             file_put_contents("{$lib_file}.dynsym", implode("\n", $defined) . "\n");
@@ -72,12 +72,8 @@ trait UnixSystemUtilTrait
         if (!is_file($symbol_file)) {
             throw new SPCInternalException("The symbol file {$symbol_file} does not exist, please check if nm command is available.");
         }
-        // https://github.com/ziglang/zig/issues/24662
-        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            return '-Wl,--export-dynamic';
-        }
-        // macOS
-        if (SPCTarget::getTargetOS() !== 'Linux') {
+        // macOS/zig
+        if (SPCTarget::getTargetOS() !== 'Linux' || ToolchainManager::getToolchainClass() === ZigToolchain::class) {
             return "-Wl,-exported_symbols_list,{$symbol_file}";
         }
         return "-Wl,--dynamic-list={$symbol_file}";

src/SPC/builder/unix/UnixBuilderBase.php

@@ -145,7 +145,7 @@ abstract class UnixBuilderBase extends BuilderBase
             throw new SPCInternalException("Deploy failed. Cannot find file after copy: {$dst}");
         }
 
-        if (!$this->getOption('no-strip')) {
+        if (!$this->getOption('no-strip') && !$this->getOption('pgi') && !$this->getOption('cs-pgi')) {
             // extract debug info
             $this->extractDebugInfo($dst);
             // extra strip
@@ -229,14 +229,16 @@ 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($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
+            $config = $util->config(array_keys($this->getExts(false)), [], $this->getOption('with-suggested-exts'), $this->lib_list);
             $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 {
@@ -255,18 +257,19 @@ abstract class UnixBuilderBase extends BuilderBase
                 }
             }
             $cc = getenv('CC');
+
             [$ret, $out] = shell()->cd($sample_file_path)->execWithResult("{$cc} -o embed embed.c {$lens} {$dynamic_exports}");
             if ($ret !== 0) {
                 throw new ValidationException(
-                    'embed failed sanity check: build failed. Error message: ' . implode("\n", $out),
-                    validation_module: 'static libphp.a sanity check'
+                    'embed failed to build. Error message: ' . implode("\n", $out),
+                    validation_module: $embedType . ' libphp embed build sanity check'
                 );
             }
             [$ret, $output] = shell()->cd($sample_file_path)->execWithResult($ext_path . './embed');
             if ($ret !== 0 || trim(implode('', $output)) !== 'hello') {
                 throw new ValidationException(
-                    'embed failed sanity check: run failed. Error message: ' . implode("\n", $output),
-                    validation_module: 'static libphp.a sanity check'
+                    'embed failed to run. Error message: ' . implode("\n", $output),
+                    validation_module: $embedType . ' libphp embed run sanity check'
                 );
             }
         }
@@ -362,6 +365,7 @@ 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}");
             }
@@ -436,7 +440,7 @@ abstract class UnixBuilderBase extends BuilderBase
             $staticFlags = '-static-pie';
         }
 
-        $config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list);
+        $config = (new SPCConfigUtil($this))->config(array_keys($this->getExts(false)), [], false, $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.
@@ -446,20 +450,24 @@ 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' => "{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs}",
+            'CGO_LDFLAGS' => trim("{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs} {$extraLdProgram}"),
             '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 {$xcaddyModules}");
+            ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddyModules}");
 
         $this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP);
     }

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

@@ -10,7 +10,8 @@ trait bzip2
 {
     public function patchBeforeBuild(): bool
     {
-        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'CFLAGS=-Wall', 'CFLAGS=-fPIC -Wall');
+        $extra = trim((string) getenv('SPC_DEFAULT_C_FLAGS'));
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'CFLAGS=-Wall', "CFLAGS={$extra} -Wall");
         return true;
     }
 

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\store\FileSystem;
 use SPC\util\executor\UnixCMakeExecutor;
 
 trait curl
@@ -29,11 +30,20 @@ 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");
     }

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

@@ -10,8 +10,9 @@ 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 -O3 -fPIC fastlz.c -o fastlz.o')
+            ->exec((getenv('CC') ?: 'cc') . " -c {$extra} 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')) {

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

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

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

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

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

@@ -34,6 +34,9 @@ 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`

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

@@ -10,7 +10,8 @@ trait jbig
 {
     public function patchBeforeBuild(): bool
     {
-        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'CFLAGS = -O2 -W -Wno-unused-result', 'CFLAGS = -O2 -W -Wno-unused-result -fPIC');
+        $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");
         return true;
     }
 

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

@@ -4,6 +4,8 @@ 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;
 
@@ -13,7 +15,10 @@ trait krb5
     {
         $origin_source_dir = $this->source_dir;
         $this->source_dir .= '/src';
-        shell()->cd($this->source_dir)->exec('autoreconf -if');
+        shell()->cd($this->source_dir)->exec('ls -lah');
+        if (!file_exists($this->source_dir . '/configure')) {
+            shell()->cd($this->source_dir)->exec('autoreconf -if');
+        }
         $libs = array_map(fn ($x) => $x->getName(), $this->getDependencies(true));
         $spc = new SPCConfigUtil($this->builder, ['no_php' => true, 'libs_only_deps' => true]);
         $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));
@@ -36,12 +41,16 @@ trait krb5
             $extraEnv['LDFLAGS'] = '-framework Kerberos';
             $args[] = 'ac_cv_func_secure_getenv=no';
         }
-        UnixAutoconfExecutor::create($this)
+        $make = UnixAutoconfExecutor::create($this)
             ->appendEnv($extraEnv)
             ->optionalLib('ldap', '--with-ldap', '--without-ldap')
             ->optionalLib('libedit', '--with-libedit', '--without-libedit')
-            ->configure(...$args)
-            ->make();
+            ->configure(...$args);
+
+        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            $make->exec('find . -name Makefile -exec sed -i "s/-Werror=incompatible-pointer-types//g" {} +');
+        }
+        $make->make();
         $this->patchPkgconfPrefix([
             'krb5-gssapi.pc',
             'krb5.pc',

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

@@ -4,9 +4,11 @@ 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
 {
@@ -17,9 +19,23 @@ 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=generic')
+            ->addConfigureArgs(
+                "-DAOM_TARGET_CPU={$targetCpu}",
+                '-DCONFIG_RUNTIME_CPU_DETECT=1',
+                '-DENABLE_EXAMPLES=0',
+                '-DENABLE_TOOLS=0',
+                '-DENABLE_TESTS=0',
+                '-DENABLE_DOCS=0'
+            )
             ->build();
         f_putenv("SPC_COMPILER_EXTRA={$extra}");
         $this->patchPkgconfPrefix(['aom.pc']);

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

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

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

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

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

@@ -11,15 +11,28 @@ 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")'
             );
-            return true;
+            $patched = true;
         }
-        return false;
+        // 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;
     }
 
     protected function build(): void

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

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

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

@@ -12,6 +12,13 @@ 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;
     }
 
@@ -28,7 +35,7 @@ trait liblz4
 
         $this->patchPkgconfPrefix(['liblz4.pc']);
 
-        foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
+        foreach (FileSystem::scanDirFiles(BUILD_LIB_PATH . '/', 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);
             }

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

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

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

@@ -10,13 +10,29 @@ 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',
+                'CFLAGS' => '-std=c17 -w',
                 'LDFLAGS' => SPCTarget::isStatic() ? '-static' : '',
             ])
             ->configure(

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

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

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

@@ -14,6 +14,8 @@ 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']);
     }

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\unix\library;
 
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 use SPC\util\executor\UnixAutoconfExecutor;
 
 trait unixodbc
@@ -20,7 +21,15 @@ trait unixodbc
             'Linux' => '/etc',
             default => throw new WrongUsageException('Unsupported OS: ' . PHP_OS_FAMILY),
         };
-        UnixAutoconfExecutor::create($this)
+        // 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)
             ->configure(
                 '--disable-debug',
                 '--disable-dependency-tracking',
@@ -28,9 +37,27 @@ trait unixodbc
                 '--with-included-ltdl',
                 "--sysconfdir={$sysconf_selector}",
                 '--enable-gui=no',
-            )
-            ->make();
-        $this->patchPkgconfPrefix(['odbc.pc', 'odbccr.pc', 'odbcinst.pc']);
+            );
+
+        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',
+                ''
+            );
+        }
         $this->patchLaDependencyPrefix();
     }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/SPC/command/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 needed');
+        $this->addOption('all', 'A', null, 'Build all libs that static-php-cli has');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output): void

src/SPC/command/BuildPHPCommand.php

@@ -39,6 +39,7 @@ 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');
@@ -49,7 +50,9 @@ 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('with-php', null, InputOption::VALUE_REQUIRED, 'PHP version to build (e.g., 8.2, 8.3, 8.4). Uses php-src-X.Y if available, otherwise php-src');
+        $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
@@ -121,31 +124,6 @@ class BuildPHPCommand extends BuildCommand
                 logger()->warning('Some cases micro.sfx cannot be packed via UPX due to dynamic size bug, be aware!');
             }
         }
-
-        // Determine which php-src to use based on --with-php option
-        $php_version = $this->getOption('with-php');
-        if ($php_version !== null) {
-            // Check if version-specific php-src exists in lock file
-            $version_specific_name = "php-src-{$php_version}";
-            $lock_file_path = DOWNLOAD_PATH . '/.lock.json';
-            if (file_exists($lock_file_path)) {
-                $lock_content = json_decode(file_get_contents($lock_file_path), true);
-                if (isset($lock_content[$version_specific_name])) {
-                    // Use version-specific php-src
-                    f_putenv("SPC_PHP_SRC_NAME={$version_specific_name}");
-                    logger()->info("Building with PHP {$php_version} (using {$version_specific_name})");
-                } else {
-                    logger()->error('No php-src found in downloads. Please run download command first.');
-                    return static::FAILURE;
-                }
-            } else {
-                logger()->error('Lock file not found. Please download sources first.');
-                return static::FAILURE;
-            }
-        } else {
-            f_putenv('SPC_PHP_SRC_NAME=php-src');
-        }
-
         // create builder
         $builder = BuilderProvider::makeBuilderByInput($this->input);
         $include_suggest_ext = $this->getOption('with-suggested-exts');
@@ -203,7 +181,7 @@ class BuildPHPCommand extends BuildCommand
         // compile libraries
         $builder->proveLibs($libraries);
         // check extensions
-        $builder->proveExts($static_extensions, $shared_extensions);
+        $builder->proveExts($static_extensions, $shared_extensions, build_target: $rule);
         // validate libs and extensions
         $builder->validateLibsAndExts();
 
@@ -236,9 +214,8 @@ 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->buildPHP($rule);
         $builder->testPHP($rule);
 
         // compile stopwatch :P

src/SPC/command/CraftCommand.php

@@ -10,6 +10,7 @@ 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;
 
@@ -19,6 +20,10 @@ 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
@@ -103,12 +108,38 @@ class CraftCommand extends BuildCommand
 
         // craft build
         if ($craft['craft-options']['build']) {
-            $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;
+            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;
+                }
             }
         }
 

src/SPC/command/DownloadCommand.php

@@ -9,9 +9,7 @@ use SPC\exception\DownloaderException;
 use SPC\exception\SPCException;
 use SPC\store\Config;
 use SPC\store\Downloader;
-use SPC\store\FileSystem;
 use SPC\store\LockFile;
-use SPC\store\source\CustomSourceBase;
 use SPC\util\DependencyUtil;
 use SPC\util\SPCTarget;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -29,10 +27,10 @@ class DownloadCommand extends BaseCommand
 
     public function configure(): void
     {
-        $this->addArgument('sources', InputArgument::OPTIONAL, 'The sources will be compiled, comma separated');
+        $this->addArgument('sources', InputArgument::REQUIRED, 'The sources will be compiled, comma separated');
         $this->addOption('shallow-clone', null, null, 'Clone shallow');
         $this->addOption('with-openssl11', null, null, 'Use openssl 1.1');
-        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format, comma-separated for multiple versions (default 8.4)', '8.4');
+        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format (default 8.5)', '8.5');
         $this->addOption('clean', null, null, 'Clean old download cache and source before fetch');
         $this->addOption('all', 'A', null, 'Fetch all sources that static-php-cli needed');
         $this->addOption('custom-url', 'U', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Specify custom source download url, e.g "php-src:https://downloads.php.net/~eric/php-8.3.0beta1.tar.gz"');
@@ -45,31 +43,10 @@ class DownloadCommand extends BaseCommand
         $this->addOption('retry', 'R', InputOption::VALUE_REQUIRED, 'Set retry time when downloading failed (default: 0)', '0');
         $this->addOption('prefer-pre-built', 'P', null, 'Download pre-built libraries when available');
         $this->addOption('no-alt', null, null, 'Do not download alternative sources');
-        $this->addOption('update', null, null, 'Check and update downloaded sources');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output): void
     {
-        // mode: --update
-        if ($input->getOption('update') && empty($input->getArgument('sources')) && empty($input->getOption('for-extensions')) && empty($input->getOption('for-libs'))) {
-            if (!file_exists(LockFile::LOCK_FILE)) {
-                parent::initialize($input, $output);
-                return;
-            }
-            $lock_content = json_decode(file_get_contents(LockFile::LOCK_FILE), true);
-            if (is_array($lock_content)) {
-                // Filter out pre-built sources
-                $sources_to_check = array_filter($lock_content, function ($name) {
-                    return
-                        !str_contains($name, '-Linux-') &&
-                        !str_contains($name, '-Windows-') &&
-                        !str_contains($name, '-Darwin-');
-                }, ARRAY_FILTER_USE_KEY);
-                $input->setArgument('sources', implode(',', array_keys($sources_to_check)));
-            }
-            parent::initialize($input, $output);
-            return;
-        }
         // mode: --all
         if ($input->getOption('all')) {
             $input->setArgument('sources', implode(',', array_keys(Config::getSources())));
@@ -117,29 +94,17 @@ class DownloadCommand extends BaseCommand
             return $this->downloadFromZip($path);
         }
 
-        if ($this->getOption('update')) {
-            return $this->handleUpdate();
-        }
-
-        // Define PHP major version(s)
-        $php_versions_str = $this->getOption('with-php');
-        $php_versions = array_map('trim', explode(',', $php_versions_str));
-
-        // Validate all versions
-        foreach ($php_versions as $ver) {
-            if ($ver !== 'git' && !preg_match('/^\d+\.\d+$/', $ver)) {
-                // If not git, we need to check the version format
-                if (!preg_match('/^\d+\.\d+(\.\d+)?$/', $ver)) {
-                    logger()->error("bad version arg: {$ver}, x.y or x.y.z required!");
-                    return static::FAILURE;
-                }
+        // Define PHP major version
+        $ver = $this->php_major_ver = $this->getOption('with-php');
+        define('SPC_BUILD_PHP_VERSION', $ver);
+        if ($ver !== 'git' && !preg_match('/^\d+\.\d+$/', $ver)) {
+            // If not git, we need to check the version format
+            if (!preg_match('/^\d+\.\d+(\.\d+)?$/', $ver)) {
+                logger()->error("bad version arg: {$ver}, x.y or x.y.z required!");
+                return static::FAILURE;
             }
         }
 
-        // Set the first version as the default for backward compatibility
-        $this->php_major_ver = $php_versions[0];
-        define('SPC_BUILD_PHP_VERSION', $this->php_major_ver);
-
         // retry
         $retry = (int) $this->getOption('retry');
         f_putenv('SPC_DOWNLOAD_RETRIES=' . $retry);
@@ -160,20 +125,6 @@ class DownloadCommand extends BaseCommand
 
         $chosen_sources = array_map('trim', array_filter(explode(',', $this->getArgument('sources'))));
 
-        // Handle multiple PHP versions
-        // If php-src is in the sources, replace it with version-specific sources
-        if (in_array('php-src', $chosen_sources)) {
-            // Remove php-src from the list
-            $chosen_sources = array_diff($chosen_sources, ['php-src']);
-            // Add version-specific php-src for each version
-            foreach ($php_versions as $ver) {
-                $version_specific_name = "php-src-{$ver}";
-                $chosen_sources[] = $version_specific_name;
-                // Store the version for this specific php-src
-                f_putenv("SPC_PHP_VERSION_{$version_specific_name}={$ver}");
-            }
-        }
-
         $sss = $this->getOption('ignore-cache-sources');
         if ($sss === false) {
             // false is no-any-ignores, that is, default.
@@ -250,16 +201,7 @@ class DownloadCommand extends BaseCommand
                 logger()->info("[{$ni}/{$cnt}] Downloading source {$source} from custom git: {$new_config['url']}");
                 Downloader::downloadSource($source, $new_config, true);
             } else {
-                // Handle version-specific php-src (php-src-8.2, php-src-8.3, etc.)
-                if (preg_match('/^php-src-[\d.]+$/', $source)) {
-                    $config = Config::getSource('php-src');
-                    if ($config === null) {
-                        logger()->error('php-src configuration not found in source.json');
-                        return static::FAILURE;
-                    }
-                } else {
-                    $config = Config::getSource($source);
-                }
+                $config = Config::getSource($source);
                 // Prefer pre-built, we need to search pre-built library
                 if ($this->getOption('prefer-pre-built') && ($config['provide-pre-built'] ?? false) === true) {
                     // We need to replace pattern
@@ -280,9 +222,8 @@ class DownloadCommand extends BaseCommand
                     logger()->warning("Pre-built content not found for {$source}, fallback to source download");
                 }
                 logger()->info("[{$ni}/{$cnt}] Downloading source {$source}");
-                $force_download = $force_all || in_array($source, $force_list) || str_starts_with($source, 'php-src-') && in_array('php-src', $force_list);
                 try {
-                    Downloader::downloadSource($source, $config, $force_download);
+                    Downloader::downloadSource($source, $config, $force_all || in_array($source, $force_list));
                 } catch (SPCException $e) {
                     // if `--no-alt` option is set, we will not download alternative sources
                     if ($this->getOption('no-alt')) {
@@ -300,7 +241,7 @@ class DownloadCommand extends BaseCommand
                         logger()->notice("Trying to download alternative sources for {$source}");
                         $alt_config = array_merge($config, $alt_sources);
                     }
-                    Downloader::downloadSource($source, $alt_config, $force_download);
+                    Downloader::downloadSource($source, $alt_config, $force_all || in_array($source, $force_list));
                 }
             }
         }
@@ -421,284 +362,4 @@ class DownloadCommand extends BaseCommand
         }
         return static::FAILURE;
     }
-
-    private function handleUpdate(): int
-    {
-        logger()->info('Checking sources for updates...');
-
-        // Get lock file content
-        $lock_file_path = LockFile::LOCK_FILE;
-        if (!file_exists($lock_file_path)) {
-            logger()->warning('No lock file found. Please download sources first using "bin/spc download"');
-            return static::FAILURE;
-        }
-
-        $lock_content = json_decode(file_get_contents($lock_file_path), true);
-        if ($lock_content === null || !is_array($lock_content)) {
-            logger()->error('Failed to parse lock file');
-            return static::FAILURE;
-        }
-
-        // Filter sources to check
-        $sources_arg = $this->getArgument('sources');
-        if (!empty($sources_arg)) {
-            $requested_sources = array_map('trim', array_filter(explode(',', $sources_arg)));
-            $sources_to_check = [];
-            foreach ($requested_sources as $source) {
-                if (isset($lock_content[$source])) {
-                    $sources_to_check[$source] = $lock_content[$source];
-                } else {
-                    logger()->warning("Source '{$source}' not found in lock file, skipping");
-                }
-            }
-        } else {
-            $sources_to_check = $lock_content;
-        }
-
-        // Filter out pre-built sources (they are derivatives)
-        $sources_to_check = array_filter($sources_to_check, function ($lock_item, $name) {
-            // Skip pre-built sources (they contain OS/arch in the name)
-            if (str_contains($name, '-Linux-') || str_contains($name, '-Windows-') || str_contains($name, '-Darwin-')) {
-                logger()->debug("Skipping pre-built source: {$name}");
-                return false;
-            }
-            return true;
-        }, ARRAY_FILTER_USE_BOTH);
-
-        if (empty($sources_to_check)) {
-            logger()->warning('No sources to check');
-            return static::FAILURE;
-        }
-
-        $total = count($sources_to_check);
-        $current = 0;
-        $updated_sources = [];
-
-        foreach ($sources_to_check as $name => $lock_item) {
-            ++$current;
-            try {
-                // Handle version-specific php-src (php-src-8.2, php-src-8.3, etc.)
-                if (preg_match('/^php-src-[\d.]+$/', $name)) {
-                    $config = Config::getSource('php-src');
-                } else {
-                    $config = Config::getSource($name);
-                }
-
-                if ($config === null) {
-                    logger()->warning("[{$current}/{$total}] Source '{$name}' not found in source config, skipping");
-                    continue;
-                }
-
-                // Check and update based on source type
-                $source_type = $lock_item['source_type'] ?? 'unknown';
-
-                if ($source_type === SPC_SOURCE_ARCHIVE) {
-                    if ($this->checkArchiveSourceUpdate($name, $lock_item, $config, $current, $total)) {
-                        $updated_sources[] = $name;
-                    }
-                } elseif ($source_type === SPC_SOURCE_GIT) {
-                    if ($this->checkGitSourceUpdate($name, $lock_item, $config, $current, $total)) {
-                        $updated_sources[] = $name;
-                    }
-                } elseif ($source_type === SPC_SOURCE_LOCAL) {
-                    logger()->debug("[{$current}/{$total}] Source '{$name}' is local, skipping");
-                } else {
-                    logger()->warning("[{$current}/{$total}] Unknown source type '{$source_type}' for '{$name}', skipping");
-                }
-            } catch (\Throwable $e) {
-                logger()->error("[{$current}/{$total}] Error checking '{$name}': {$e->getMessage()}");
-                continue;
-            }
-        }
-
-        // Output summary
-        if (empty($updated_sources)) {
-            logger()->info('All sources are up to date.');
-        } else {
-            logger()->info('Updated sources: ' . implode(', ', $updated_sources));
-
-            // Write updated sources to file
-            $date = date('Y-m-d');
-            $update_file = DOWNLOAD_PATH . '/.update-' . $date . '.txt';
-            if (file_exists($update_file)) {
-                $existing_content = file_get_contents($update_file);
-                $existing_sources = array_map('trim', explode(',', $existing_content));
-                $updated_sources = array_unique(array_merge($existing_sources, $updated_sources));
-            }
-            $content = implode(',', $updated_sources);
-            file_put_contents($update_file, $content);
-            logger()->debug("Updated sources written to: {$update_file}");
-        }
-
-        return static::SUCCESS;
-    }
-
-    private function checkCustomSourceUpdate(string $name, array $lock, array $config, int $current, int $total): ?array
-    {
-        $classes = FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/store/source', 'SPC\store\source');
-        foreach ($classes as $class) {
-            // Support php-src and php-src-X.Y patterns
-            $matches = ($class::NAME === $name) ||
-                ($class::NAME === 'php-src' && preg_match('/^php-src(-[\d.]+)?$/', $name));
-            if (is_a($class, CustomSourceBase::class, true) && $matches) {
-                try {
-                    $config['source_name'] = $name;
-                    return (new $class())->update($lock, $config);
-                } catch (\Throwable $e) {
-                    logger()->warning("[{$current}/{$total}] Failed to check '{$name}': {$e->getMessage()}");
-                    return null;
-                }
-            }
-        }
-        logger()->debug("[{$current}/{$total}] Custom source handler for '{$name}' not found");
-        return null;
-    }
-
-    /**
-     * Check and update an archive source
-     *
-     * @param  string $name    Source name
-     * @param  array  $lock    Lock file entry
-     * @param  array  $config  Source configuration
-     * @param  int    $current Current progress number
-     * @param  int    $total   Total sources to check
-     * @return bool   True if updated, false otherwise
-     */
-    private function checkArchiveSourceUpdate(string $name, array $lock, array $config, int $current, int $total): bool
-    {
-        $type = $config['type'] ?? 'unknown';
-        $locked_filename = $lock['filename'] ?? '';
-
-        // Skip local types that don't support version detection
-        if (in_array($type, ['local', 'unknown'])) {
-            logger()->debug("[{$current}/{$total}] Source '{$name}' (type: {$type}) doesn't support version detection, skipping");
-            return false;
-        }
-
-        try {
-            $latest_info = match ($type) {
-                'ghtar' => Downloader::getLatestGithubTarball($name, $config),
-                'ghtagtar' => Downloader::getLatestGithubTarball($name, $config, 'tags'),
-                'ghrel' => Downloader::getLatestGithubRelease($name, $config),
-                'pie' => Downloader::getPIEInfo($name, $config),
-                'bitbuckettag' => Downloader::getLatestBitbucketTag($name, $config),
-                'filelist' => Downloader::getFromFileList($name, $config),
-                'url' => Downloader::getLatestUrlInfo($name, $config),
-                'custom' => $this->checkCustomSourceUpdate($name, $lock, $config, $current, $total),
-                default => null,
-            };
-
-            if ($latest_info === null) {
-                logger()->warning("[{$current}/{$total}] Could not get version info for '{$name}' (type: {$type})");
-                return false;
-            }
-
-            $latest_filename = $latest_info[1] ?? '';
-
-            // Compare filenames
-            if ($locked_filename !== $latest_filename) {
-                logger()->info("[{$current}/{$total}] Update available for '{$name}': {$locked_filename} → {$latest_filename}");
-                $this->downloadSourceForUpdate($name, $config, $current, $total);
-                return true;
-            }
-
-            logger()->info("[{$current}/{$total}] Source '{$name}' is up to date");
-            return false;
-        } catch (DownloaderException $e) {
-            logger()->warning("[{$current}/{$total}] Failed to check '{$name}': {$e->getMessage()}");
-            return false;
-        }
-    }
-
-    /**
-     * Check and update a git source
-     *
-     * @param  string $name    Source name
-     * @param  array  $lock    Lock file entry
-     * @param  array  $config  Source configuration
-     * @param  int    $current Current progress number
-     * @param  int    $total   Total sources to check
-     * @return bool   True if updated, false otherwise
-     */
-    private function checkGitSourceUpdate(string $name, array $lock, array $config, int $current, int $total): bool
-    {
-        $locked_hash = $lock['hash'] ?? '';
-        $url = $config['url'] ?? '';
-        $branch = $config['rev'] ?? 'main';
-
-        if (empty($url)) {
-            logger()->warning("[{$current}/{$total}] No URL found for git source '{$name}'");
-            return false;
-        }
-
-        try {
-            $remote_hash = $this->getRemoteGitCommit($url, $branch);
-
-            if ($remote_hash === null) {
-                logger()->warning("[{$current}/{$total}] Could not fetch remote commit for '{$name}'");
-                return false;
-            }
-
-            // Compare hashes (use first 7 chars for display)
-            $locked_short = substr($locked_hash, 0, 7);
-            $remote_short = substr($remote_hash, 0, 7);
-
-            if ($locked_hash !== $remote_hash) {
-                logger()->info("[{$current}/{$total}] Update available for '{$name}': {$locked_short} → {$remote_short}");
-                $this->downloadSourceForUpdate($name, $config, $current, $total);
-                return true;
-            }
-
-            logger()->info("[{$current}/{$total}] Source '{$name}' is up to date");
-            return false;
-        } catch (\Throwable $e) {
-            logger()->warning("[{$current}/{$total}] Failed to check '{$name}': {$e->getMessage()}");
-            return false;
-        }
-    }
-
-    /**
-     * Download a source after removing old lock entry
-     *
-     * @param string $name    Source name
-     * @param array  $config  Source configuration
-     * @param int    $current Current progress number
-     * @param int    $total   Total sources to check
-     */
-    private function downloadSourceForUpdate(string $name, array $config, int $current, int $total): void
-    {
-        logger()->info("[{$current}/{$total}] Downloading '{$name}'...");
-
-        // Remove old lock entry
-        LockFile::put($name, null);
-
-        // Download new version
-        Downloader::downloadSource($name, $config, true);
-    }
-
-    /**
-     * Get remote git commit hash without cloning
-     *
-     * @param  string      $url    Git repository URL
-     * @param  string      $branch Branch or tag to check
-     * @return null|string Remote commit hash or null on failure
-     */
-    private function getRemoteGitCommit(string $url, string $branch): ?string
-    {
-        try {
-            $cmd = SPC_GIT_EXEC . ' ls-remote ' . escapeshellarg($url) . ' ' . escapeshellarg($branch);
-            f_exec($cmd, $output, $ret);
-
-            if ($ret !== 0 || empty($output)) {
-                return null;
-            }
-
-            // Output format: "commit_hash\trefs/heads/branch" or "commit_hash\tHEAD"
-            $parts = preg_split('/\s+/', $output[0]);
-            return $parts[0] ?? null;
-        } catch (\Throwable $e) {
-            logger()->debug("Failed to fetch remote git commit: {$e->getMessage()}");
-            return null;
-        }
-    }
 }

src/SPC/command/SwitchPhpVersionCommand.php

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

src/SPC/doctor/item/LinuxMuslCheck.php

@@ -74,9 +74,10 @@ 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}")
-            ->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");
+            ->setEnv(['CC' => 'gcc', 'CXX' => 'g++', 'AR' => 'ar', 'LD' => 'ld', 'RANLIB' => 'ranlib'])
+            ->exec('./configure --disable-gcc-wrapper')
+            ->exec('make -j')
+            ->exec("{$prefix}make install");
         // TODO: add path using putenv instead of editing /etc/profile
         return true;
     }

src/SPC/doctor/item/LinuxToolCheckList.php

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

src/SPC/store/Downloader.php

@@ -98,31 +98,50 @@ class Downloader
     {
         logger()->debug("finding {$name} source from github {$type} tarball");
         $source['query'] ??= '';
-        $data = json_decode(self::curlExec(
-            url: "https://api.github.com/repos/{$source['repo']}/{$type}{$source['query']}",
-            hooks: [[CurlHook::class, 'setupGithubToken']],
-            retries: self::getRetryAttempts()
-        ), true, 512, JSON_THROW_ON_ERROR);
 
-        $url = null;
-        foreach ($data as $rel) {
-            if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
-                continue;
+        // Use /releases/latest when possible: it returns the semantically latest stable
+        // release regardless of publish order, avoiding issues with concurrent release branches.
+        if ($type === 'releases' && empty($source['query']) && !($source['match'] ?? null)) {
+            $data = json_decode(self::curlExec(
+                url: "https://api.github.com/repos/{$source['repo']}/releases/latest",
+                hooks: [[CurlHook::class, 'setupGithubToken']],
+                retries: self::getRetryAttempts()
+            ), true, 512, JSON_THROW_ON_ERROR);
+            if (!is_array($data) || empty($data['tarball_url'])) {
+                throw new DownloaderException("failed to find {$name} source");
             }
-            if (($rel['draft'] ?? false) === true && (($source['prefer-stable'] ?? false) || !$rel['tarball_url'])) {
-                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,
@@ -134,7 +153,7 @@ class Downloader
         if ($matches) {
             $filename = $matches['filename'];
         } else {
-            $filename = "{$name}-" . ($type === 'releases' ? $data['tag_name'] : $data['name']) . '.tar.gz';
+            $filename = "{$name}-" . ($version ?? 'latest') . '.tar.gz';
         }
 
         return [$url, $filename];
@@ -220,39 +239,6 @@ class Downloader
         return [$source['url'] . end($versions), end($versions), key($versions)];
     }
 
-    /**
-     * Get latest version from direct URL (detect redirect and filename)
-     *
-     * @param  string             $name   Source name
-     * @param  array              $source Source meta info: [url]
-     * @return array<int, string> [url, filename]
-     */
-    public static function getLatestUrlInfo(string $name, array $source): array
-    {
-        logger()->debug("finding {$name} source from direct url");
-        $url = $source['url'];
-        $headers = self::curlExec(
-            url: $url,
-            method: 'HEAD',
-            retries: self::getRetryAttempts()
-        );
-
-        // Find redirect location if any
-        if (preg_match('/^location:\s+(?<url>.+)$/im', $headers, $matches)) {
-            $url = trim($matches['url']);
-            // If it's a relative URL, we need to handle it, but usually it's absolute for downloads
-        }
-
-        // Find filename from content-disposition
-        if (preg_match('/^content-disposition:\s+attachment;\s*filename=("?)(?<filename>.+)\1/im', $headers, $matches)) {
-            $filename = trim($matches['filename']);
-        } else {
-            $filename = $source['filename'] ?? basename($url);
-        }
-
-        return [$url, $filename];
-    }
-
     /**
      * Download file from URL
      *
@@ -280,7 +266,7 @@ class Downloader
         if ($download_as === SPC_DOWNLOAD_PRE_BUILT) {
             $name = self::getPreBuiltLockName($name);
         }
-        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_ARCHIVE, 'url' => $url, 'filename' => $filename, 'move_path' => $move_path, 'lock_as' => $download_as]);
+        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_ARCHIVE, 'filename' => $filename, 'move_path' => $move_path, 'lock_as' => $download_as]);
     }
 
     /**
@@ -339,7 +325,7 @@ class Downloader
         }
         // Lock
         logger()->debug("Locking git source {$name}");
-        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_GIT, 'url' => $url, 'rev' => $branch, 'dirname' => $name, 'move_path' => $move_path, 'lock_as' => $lock_as]);
+        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_GIT, 'dirname' => $name, 'move_path' => $move_path, 'lock_as' => $lock_as]);
 
         /*
         // 复制目录过去
@@ -689,7 +675,8 @@ class Downloader
                     self::downloadFile($name, $url, $filename, $conf['path'] ?? $conf['extract'] ?? null, $download_as);
                     break;
                 case 'url': // Direct download URL
-                    [$url, $filename] = self::getLatestUrlInfo($name, $conf);
+                    $url = $conf['url'];
+                    $filename = $conf['filename'] ?? basename($conf['url']);
                     self::downloadFile($name, $url, $filename, $conf['path'] ?? $conf['extract'] ?? null, $download_as);
                     break;
                 case 'git': // Git repo
@@ -699,8 +686,6 @@ class Downloader
                     LockFile::lockSource($name, [
                         'source_type' => SPC_SOURCE_LOCAL,
                         'dirname' => $conf['dirname'],
-                        'url' => null,
-                        'path' => $conf['path'] ?? null,
                         'move_path' => $conf['path'] ?? $conf['extract'] ?? null,
                         'lock_as' => $download_as,
                     ]);
@@ -716,11 +701,7 @@ class Downloader
                         ...FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/store/pkg', 'SPC\store\pkg'),
                     ];
                     foreach ($classes as $class) {
-                        // Support php-src and php-src-X.Y patterns
-                        $matches = ($class::NAME === $name) ||
-                                   ($class::NAME === 'php-src' && preg_match('/^php-src(-[\d.]+)?$/', $name));
-                        if (is_a($class, CustomSourceBase::class, true) && $matches) {
-                            $conf['source_name'] = $name; // Pass the actual source name
+                        if (is_a($class, CustomSourceBase::class, true) && $class::NAME === $name) {
                             (new $class())->fetch($force, $conf, $download_as);
                             break;
                         }

src/SPC/store/FileSystem.php

@@ -152,7 +152,7 @@ class FileSystem
         $src_path = FileSystem::convertPath($from);
         switch (PHP_OS_FAMILY) {
             case 'Windows':
-                f_passthru('xcopy "' . $src_path . '" "' . $dst_path . '" /s/e/v/y/i');
+                f_passthru('xcopy "' . $src_path . '" "' . $dst_path . '" /s/e/y/i');
                 break;
             case 'Linux':
             case 'Darwin':

src/SPC/store/LockFile.php

@@ -155,7 +155,6 @@ class LockFile
      * @param string $name Source name
      * @param array{
      *     source_type: string,
-     *     url: ?string,
      *     dirname?: ?string,
      *     filename?: ?string,
      *     move_path: ?string,

src/SPC/store/SourceManager.php

@@ -39,14 +39,7 @@ class SourceManager
 
         // start check
         foreach ($sources_extracted as $source => $item) {
-            $extract_dir_name = $source;
-            // Handle version-specific php-src (php-src-8.2, php-src-8.3, etc.)
-            $source_config = Config::getSource($source);
-            if ($source_config === null && preg_match('/^php-src-[\d.]+$/', $source)) {
-                $source_config = Config::getSource('php-src');
-                $extract_dir_name = 'php-src';
-            }
-            if ($source_config === null) {
+            if (Config::getSource($source) === null) {
                 throw new WrongUsageException("Source [{$source}] does not exist, please check the name and correct it !");
             }
             // check source downloaded
@@ -63,12 +56,12 @@ class SourceManager
             $lock_content = LockFile::get($lock_name);
 
             // check source dir exist
-            $check = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $extract_dir_name);
+            $check = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $source);
             // $check = $lock[$lock_name]['move_path'] === null ? (SOURCE_PATH . '/' . $source) : (SOURCE_PATH . '/' . $lock[$lock_name]['move_path']);
             if (!is_dir($check)) {
                 logger()->debug("Extracting source [{$source}] to {$check} ...");
                 $filename = LockFile::getLockFullPath($lock_content);
-                FileSystem::extractSource($extract_dir_name, $lock_content['source_type'], $filename, $check);
+                FileSystem::extractSource($source, $lock_content['source_type'], $filename, $check);
                 LockFile::putLockSourceHash($lock_content, $check);
                 continue;
             }
@@ -96,7 +89,7 @@ class SourceManager
             logger()->notice("Source [{$source}] hash mismatch, removing old source dir and extracting again ...");
             FileSystem::removeDir($check);
             $filename = LockFile::getLockFullPath($lock_content);
-            $move_path = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $extract_dir_name);
+            $move_path = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $source);
             FileSystem::extractSource($source, $lock_content['source_type'], $filename, $move_path);
             LockFile::putLockSourceHash($lock_content, $check);
         }

src/SPC/store/SourcePatcher.php

@@ -22,7 +22,7 @@ class SourcePatcher
         FileSystem::addSourceExtractHook('swoole', [__CLASS__, 'patchSwoole']);
         FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchPhpLibxml212']);
         FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchGDWin32']);
-        FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchFfiCentos7FixO3strncmp']);
+        // FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchFfiCentos7FixO3strncmp']);
         FileSystem::addSourceExtractHook('sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
         FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
         FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVPhp85']);
@@ -95,6 +95,10 @@ class SourcePatcher
         // patch php-src/build/php.m4 PKG_CHECK_MODULES -> PKG_CHECK_MODULES_STATIC
         FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/build/php.m4', 'PKG_CHECK_MODULES(', 'PKG_CHECK_MODULES_STATIC(');
 
+        if ($builder->getPHPVersionID() >= 80300 && $builder->getPHPVersionID() < 80400) {
+            self::patchFile('spc_fix_avx512_cache_before_80400.patch', SOURCE_PATH . '/php-src');
+        }
+
         if ($builder->getOption('enable-micro-win32')) {
             self::patchMicroWin32();
         } else {
@@ -125,6 +129,31 @@ 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');
@@ -317,20 +346,6 @@ 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
@@ -634,7 +649,13 @@ class SourcePatcher
                 FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/gd/libgd/gdft.c', '#ifndef MSWIN32', '#ifndef _WIN32');
             }
             // custom config.w32, because official config.w32 is hard-coded many things
-            $origin = $ver_id >= 80100 ? file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32') : file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
+            if ($ver_id >= 80500) {
+                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_85.w32');
+            } elseif ($ver_id >= 80100) {
+                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32');
+            } else {
+                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
+            }
             file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32.bak', file_get_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32'));
             return file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32', $origin) !== false;
         }

src/SPC/store/pkg/GoXcaddy.php

@@ -30,8 +30,8 @@ class GoXcaddy extends CustomPackage
     public function fetch(string $name, bool $force = false, ?array $config = null): void
     {
         $pkgroot = PKG_ROOT_PATH;
-        $go_exec = "{$pkgroot}/{$name}/bin/go";
-        $xcaddy_exec = "{$pkgroot}/{$name}/bin/xcaddy";
+        $go_exec = "{$pkgroot}/go-xcaddy/bin/go";
+        $xcaddy_exec = "{$pkgroot}/go-xcaddy/bin/xcaddy";
         if ($force) {
             FileSystem::removeDir("{$pkgroot}/{$name}");
         }
@@ -85,7 +85,7 @@ class GoXcaddy extends CustomPackage
                 'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
                 'GOPATH' => "{$pkgroot}/go",
             ])
-            ->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
+            ->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master');
     }
 
     public static function getEnvironment(): array

src/SPC/store/pkg/Zig.php

@@ -116,18 +116,17 @@ class Zig extends CustomPackage
                 break;
             }
         }
-        if ($all_exist) {
-            return;
+        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);
         }
-
-        $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);
+        $this->buildClangRuntimeBits($zig_bin_dir);
     }
 
     public static function getEnvironment(): array
@@ -140,6 +139,185 @@ 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)) {
+            logger()->warning('[zig] could not detect bundled clang version; skipping runtime bit build (--pgo + shared libs without __dso_handle)');
+            return;
+        }
+        $llvmVersion = $m[1];
+        logger()->info("Building clang runtime bits for LLVM {$llvmVersion} (zig's bundled clang)");
+
+        $srcRoot = $this->fetchCompilerRtSource($llvmVersion);
+        if ($srcRoot === null) {
+            return;
+        }
+
+        f_mkdir($libDir, recursive: true);
+        if (!file_exists($profileLib)) {
+            $this->buildProfileRuntime($zig, $srcRoot, $profileLib);
+        }
+        if (!file_exists($crtBegin) || !file_exists($crtEnd)) {
+            $this->buildCrtObjects($zig, $srcRoot, $crtBegin, $crtEnd);
+        }
+        if (!file_exists($cpuModelLib)) {
+            $this->buildCpuModelBuiltins($zig, $srcRoot, $cpuModelLib);
+        }
+        FileSystem::removeDir($srcRoot);
+    }
+
+    private function buildCpuModelBuiltins(string $zig, string $srcRoot, string $libPath): 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 = '-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): 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 = '-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): 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 = '-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';

src/SPC/store/scripts/zig-cc.sh

@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
 
 SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
-BUILDROOT_ABS="$(realpath "$SCRIPT_DIR/../../../buildroot/include" 2>/dev/null || true)"
+BUILDROOT_INC="${BUILD_INCLUDE_PATH:-$SCRIPT_DIR/../../../buildroot/include}"
+BUILDROOT_ABS="$(realpath "$BUILDROOT_INC" 2>/dev/null || true)"
 PARSED_ARGS=()
 
+is_buildroot_inc() {
+    [[ -n "$BUILDROOT_ABS" && "$1" == "$BUILDROOT_ABS" ]]
+}
+
 while [[ $# -gt 0 ]]; do
     case "$1" in
         -isystem)
@@ -11,27 +16,33 @@ while [[ $# -gt 0 ]]; do
             ARG="$1"
             shift
             ARG_ABS="$(realpath "$ARG" 2>/dev/null || true)"
-            [[ "$ARG_ABS" == "$BUILDROOT_ABS" ]] && PARSED_ARGS+=("-I$ARG") || PARSED_ARGS+=("-isystem" "$ARG")
+            is_buildroot_inc "$ARG_ABS" && PARSED_ARGS+=("-I$ARG") || PARSED_ARGS+=("-isystem" "$ARG")
             ;;
         -isystem*)
             ARG="${1#-isystem}"
             shift
             ARG_ABS="$(realpath "$ARG" 2>/dev/null || true)"
-            [[ "$ARG_ABS" == "$BUILDROOT_ABS" ]] && PARSED_ARGS+=("-I$ARG") || PARSED_ARGS+=("-isystem$ARG")
+            is_buildroot_inc "$ARG_ABS" && PARSED_ARGS+=("-I$ARG") || PARSED_ARGS+=("-isystem$ARG")
             ;;
         -march=*|-mcpu=*)
             OPT_NAME="${1%%=*}"
             OPT_VALUE="${1#*=}"
-            # Skip armv8- flags entirely as Zig doesn't support them
-            if [[ "$OPT_VALUE" == armv8-* ]]; then
-                shift
-                continue
+            # 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]}"
             fi
-            # replace -march=x86-64 with -march=x86_64
+            # zig uses snake_case in CPU/feature names (x86-64 -> 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
@@ -39,6 +50,27 @@ 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

src/SPC/store/source/CustomSourceBase.php

@@ -25,13 +25,4 @@ abstract class CustomSourceBase
      * @param int        $lock_as Lock type constant
      */
     abstract public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_DOWNLOAD_SOURCE): void;
-
-    /**
-     * Update the source from its repository
-     *
-     * @param  array      $lock   Lock file entry
-     * @param  array      $config Optional configuration array
-     * @return null|array Latest version info [url, filename], or null if no update needed
-     */
-    abstract public function update(array $lock, ?array $config = null): ?array;
 }

src/SPC/store/source/PhpSource.php

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

src/SPC/store/source/PostgreSQLSource.php

@@ -15,13 +15,6 @@ class PostgreSQLSource extends CustomSourceBase
         Downloader::downloadSource('postgresql', self::getLatestInfo(), $force);
     }
 
-    public function update(array $lock, ?array $config = null): ?array
-    {
-        $latest = $this->getLatestInfo();
-        $filename = basename($latest['url']);
-        return [$latest['url'], $filename];
-    }
-
     public function getLatestInfo(): array
     {
         [, $filename, $version] = Downloader::getFromFileList('postgresql', [

src/SPC/toolchain/ClangNativeToolchain.php

@@ -21,6 +21,7 @@ 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');
     }
 

src/SPC/toolchain/GccNativeToolchain.php

@@ -18,6 +18,7 @@ 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');
     }
 

src/SPC/toolchain/MuslToolchain.php

@@ -16,6 +16,7 @@ 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");

src/SPC/toolchain/ZigToolchain.php

@@ -16,28 +16,8 @@ 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

src/SPC/util/ConfigValidator.php

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

src/SPC/util/DependencyUtil.php

@@ -101,11 +101,15 @@ class DependencyUtil
     /**
      * Get extension dependencies in correct order
      *
-     * @param  array $exts            Array of extension names
-     * @param  array $additional_libs Array of additional libraries
-     * @return array Ordered array of extension names
+     * @param  array      $exts                   Array of extension names
+     * @param  array      $additional_libs        Array of additional libraries
+     * @param  bool       $include_suggested_exts Whether to follow ext-suggests edges
+     * @param  array|bool $include_suggested_libs true = follow all lib-suggests edges;
+     *                                            false = follow none;
+     *                                            array = follow lib-suggests edges only when the suggested lib is in this list (i.e. it's already being built)
+     * @return array      Ordered array of extension names
      */
-    public static function getExtsAndLibs(array $exts, array $additional_libs = [], bool $include_suggested_exts = false, bool $include_suggested_libs = false): array
+    public static function getExtsAndLibs(array $exts, array $additional_libs = [], bool $include_suggested_exts = false, array|bool $include_suggested_libs = false): array
     {
         $dep_list = self::platExtToLibs();
 
@@ -127,16 +131,20 @@ class DependencyUtil
             }
         }
 
-        // include suggested libraries
-        if ($include_suggested_libs) {
-            // check every deps suggests
+        // include suggested libraries (all, or only those in the available set)
+        if ($include_suggested_libs !== false) {
+            $available = is_array($include_suggested_libs) ? $include_suggested_libs : null;
             foreach ($dep_list as $name => $obj) {
                 $del_list = [];
                 foreach ($obj['suggests'] as $id => $suggest) {
-                    if (!str_starts_with($suggest, 'ext@')) {
-                        $dep_list[$name]['depends'][] = $suggest;
-                        $del_list[] = $id;
+                    if (str_starts_with($suggest, 'ext@')) {
+                        continue;
                     }
+                    if ($available !== null && !in_array($suggest, $available, true)) {
+                        continue;
+                    }
+                    $dep_list[$name]['depends'][] = $suggest;
+                    $del_list[] = $id;
                 }
                 foreach ($del_list as $id) {
                     unset($dep_list[$name]['suggests'][$id]);

src/SPC/util/PgoManager.php

@@ -0,0 +1,313 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\util;
+
+use SPC\builder\BuilderBase;
+use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
+use SPC\store\SourcePatcher;
+
+/**
+ * Two-call PGO driver: --pgi instruments, --pgo uses the .profraw the user
+ * collected by running the instrumented binaries.
+ */
+class PgoManager
+{
+    public const MODE_INSTRUMENT = 'instrument';
+
+    public const MODE_CS_INSTRUMENT = 'cs-instrument';
+
+    public const MODE_USE = 'use';
+
+    private const TRAINABLE = [
+        'cli' => BUILD_TARGET_CLI,
+        'micro' => BUILD_TARGET_MICRO,
+        'cgi' => BUILD_TARGET_CGI,
+        'fpm' => BUILD_TARGET_FPM,
+        'embed' => BUILD_TARGET_EMBED,
+        'frankenphp' => BUILD_TARGET_FRANKENPHP,
+    ];
+
+    /**
+     * Applied during --pgi only: explicit __llvm_profile_write_file() at
+     * shutdown, since Go/frankenphp exits skip libc atexit.
+     */
+    private const SHUTDOWN_PATCHES = [
+        'php-src' => 'spc_pgo_flush_php_main.patch',
+        'frankenphp' => 'spc_pgo_flush_frankenphp.patch',
+    ];
+
+    private string $profileRoot;
+
+    private string $mode;
+
+    private function __construct()
+    {
+        $this->profileRoot = BUILD_ROOT_PATH . '/pgo-data';
+    }
+
+    /** Build a PgoManager for the active --pgi/--cs-pgi/--pgo option, or null if none set. */
+    public static function fromBuilder(BuilderBase $builder, int $rule): ?self
+    {
+        $modes = array_filter(['pgi', 'cs-pgi', 'pgo'], fn ($m) => (bool) $builder->getOption($m));
+        if (count($modes) > 1) {
+            throw new WrongUsageException('--pgi, --cs-pgi, and --pgo are mutually exclusive');
+        }
+        $mode = array_values($modes)[0] ?? null;
+        if ($mode === null) {
+            return null;
+        }
+        $instance = new self();
+        match ($mode) {
+            'pgi' => $instance->setupInstrument($rule),
+            'cs-pgi' => $instance->setupCsInstrument($rule),
+            'pgo' => $instance->setupUse($rule),
+        };
+        return $instance;
+    }
+
+    /** Patches php-src/libtool to passthrough -fcs-profile-* flags (otherwise dropped during shared lib link). */
+    public static function patchBeforeMake(BuilderBase $builder): void
+    {
+        if (!$builder->getOption('cs-pgi')) {
+            return;
+        }
+        $libtool = SOURCE_PATH . '/php-src/libtool';
+        if (!is_file($libtool)) {
+            return;
+        }
+        $contents = file_get_contents($libtool);
+        if (str_contains($contents, '-fcs-profile-*')) {
+            return;
+        }
+        $patched = str_replace('-fprofile-*|-F*', '-fprofile-*|-fcs-profile-*|-F*', $contents);
+        if ($patched === $contents) {
+            logger()->warning('pgo --cs-pgi: could not patch libtool for -fcs-profile-* passthrough');
+            return;
+        }
+        file_put_contents($libtool, $patched);
+        logger()->info('pgo --cs-pgi: patched libtool for -fcs-profile-* passthrough');
+    }
+
+    public function applyForSapi(string $sapi): void
+    {
+        $sapi = $this->resolveSapi($sapi);
+        if (!isset(self::TRAINABLE[$sapi])) {
+            return;
+        }
+        if ($this->mode === self::MODE_USE && !is_file($this->profDataFile($sapi))) {
+            logger()->warning("pgo --pgo: no profdata for {$sapi}, building without PGO for this sapi");
+            $this->setFlag('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS', '');
+            $this->setFlag('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM', '');
+            return;
+        }
+        $flags = match ($this->mode) {
+            self::MODE_INSTRUMENT => '-fprofile-generate=' . $this->rawDir($sapi)
+                . ' -fprofile-update=atomic',
+            self::MODE_CS_INSTRUMENT => '-fprofile-use=' . $this->profDataFile($sapi)
+                . ' -fcs-profile-generate=' . $this->csRawDir($sapi)
+                . ' -fprofile-update=atomic'
+                . ' -Wno-error=profile-instr-unprofiled'
+                . ' -Wno-error=profile-instr-out-of-date'
+                . ' -Wno-backend-plugin',
+            default => '-fprofile-use=' . $this->profDataFile($sapi)
+                . ' -Wno-error=profile-instr-unprofiled'
+                . ' -Wno-error=profile-instr-out-of-date'
+                . ' -Wno-backend-plugin',
+        };
+        $this->setFlag('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS', $flags);
+        $this->setFlag('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM', $this->ldOnly($flags, $sapi));
+        logger()->info("pgo {$this->mode} ({$sapi})");
+    }
+
+    /** Setup --pgi: build with -fprofile-generate=<sapi-dir>. */
+    private function setupInstrument(int $rule): void
+    {
+        $this->validateRule($rule);
+        FileSystem::removeDir($this->profileRoot);
+        f_mkdir($this->profileRoot, recursive: true);
+        foreach ($this->trainableIn($rule) as $sapi) {
+            f_mkdir($this->rawDir($sapi), recursive: true);
+        }
+        $this->mode = self::MODE_INSTRUMENT;
+        $this->applyShutdownPatches();
+        $this->applyForSapi($this->trainableIn($rule)[0]);
+        logger()->info('pgo --pgi: instrumented build, profraw will land under ' . $this->profileRoot . '/<sapi>/');
+    }
+
+    /** Setup --cs-pgi: build with -fprofile-use=<sapi.profdata> -fcs-profile-generate=<cs-dir>. Requires existing .profdata. */
+    private function setupCsInstrument(int $rule): void
+    {
+        $this->validateRule($rule);
+        foreach ($this->trainableIn($rule) as $sapi) {
+            if (!is_file($this->profDataFile($sapi))) {
+                throw new WrongUsageException("--cs-pgi: missing {$sapi}.profdata; run --pgi + --pgo first");
+            }
+            f_mkdir($this->csRawDir($sapi), recursive: true);
+        }
+        $this->mode = self::MODE_CS_INSTRUMENT;
+        $this->applyShutdownPatches();
+        $this->applyForSapi($this->trainableIn($rule)[0]);
+        logger()->info('pgo --cs-pgi: cs-instrumented build, cs-profraw under ' . $this->profileRoot . '/cs-<sapi>/');
+    }
+
+    /** Setup --pgo: merge collected .profraw, then build with -fprofile-use=<sapi.profdata>. */
+    private function setupUse(int $rule): void
+    {
+        $this->validateRule($rule);
+        if (trim((string) shell_exec('command -v llvm-profdata 2>/dev/null')) === '') {
+            throw new WrongUsageException('--pgo: llvm-profdata not on PATH');
+        }
+        foreach ($this->trainableIn($rule) as $sapi) {
+            $this->mergeSapi($sapi);
+        }
+        $this->mode = self::MODE_USE;
+        $this->applyForSapi($this->trainableIn($rule)[0]);
+    }
+
+    /**
+     * Static-embed mode links libphp.a into frankenphp; both end up in one
+     * binary so must share one profdata. Shared-embed mode keeps libphp.so
+     * standalone — embed and frankenphp keep separate profiles.
+     */
+    private function resolveSapi(string $sapi): string
+    {
+        if ($sapi === 'embed' && getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'static') {
+            return 'frankenphp';
+        }
+        return $sapi;
+    }
+
+    private function validateRule(int $rule): void
+    {
+        if (empty($this->trainableIn($rule))) {
+            throw new WrongUsageException('--pgi/--pgo: no trainable SAPI in build rule (need one of: ' . implode(', ', array_keys(self::TRAINABLE)) . ')');
+        }
+    }
+
+    private function mergeSapi(string $sapi): void
+    {
+        $raws = glob($this->rawDir($sapi) . '/*.profraw') ?: [];
+        $csRaws = glob($this->csRawDir($sapi) . '/*.profraw') ?: [];
+        if (empty($raws) && empty($csRaws)) {
+            if ($sapi === 'frankenphp') {
+                logger()->warning('pgo --pgo: no .profraw for frankenphp (cgo glue PGO will be skipped); run --pgi, exercise frankenphp longer, then re-run --pgo to include it');
+                return;
+            }
+            throw new WrongUsageException("--pgo: no .profraw for {$sapi}; run --pgi, exercise the binary, then re-run --pgo");
+        }
+        $out = $this->profDataFile($sapi);
+        $inputs = array_merge($raws, $csRaws);
+        $argv = implode(' ', array_map('escapeshellarg', $inputs));
+        shell()->exec('llvm-profdata merge --failure-mode=warn -output=' . escapeshellarg($out) . ' ' . $argv);
+        if (!is_file($out) || filesize($out) === 0) {
+            throw new WrongUsageException("--pgo: empty merge output for {$sapi}");
+        }
+        logger()->info("pgo merged {$sapi}: " . filesize($out) . ' bytes');
+    }
+
+    private function rawDir(string $sapi): string
+    {
+        return $this->profileRoot . '/' . $sapi;
+    }
+
+    private function csRawDir(string $sapi): string
+    {
+        return $this->profileRoot . '/cs-' . $sapi;
+    }
+
+    private function profDataFile(string $sapi): string
+    {
+        return $this->profileRoot . '/' . $sapi . '.profdata';
+    }
+
+    /** @return list<string> */
+    private function trainableIn(int $rule): array
+    {
+        $out = [];
+        foreach (self::TRAINABLE as $sapi => $mask) {
+            if (($rule & $mask) !== $mask) {
+                continue;
+            }
+            $resolved = $this->resolveSapi($sapi);
+            if (!in_array($resolved, $out, true)) {
+                $out[] = $resolved;
+            }
+        }
+        return $out;
+    }
+
+    /** Strip the previous PGO flags from $var and append the new ones. */
+    private function setFlag(string $var, string $append): void
+    {
+        $cur = (string) getenv($var);
+        $cur = preg_replace('/\s*-f(cs-)?profile-(generate|use)=\S+/', '', $cur) ?? $cur;
+        $cur = preg_replace('/\s*-Wno-error=profile-instr-\S+/', '', $cur) ?? $cur;
+        $cur = preg_replace('/\s*-Wno-backend-plugin/', '', $cur) ?? $cur;
+        f_putenv($var . '=' . trim($cur . ' ' . $append));
+    }
+
+    /**
+     * Linker flags: cli wants -fprofile-use= at link too (LTO does its
+     * profile-driven inlining/reordering at link time). Strip -Wno-error
+     * flags (linker doesn't accept them).
+     */
+    private function ldOnly(string $flags, string $sapi = ''): string
+    {
+        $patterns = ['/\s*-Wno-error=\S+/', '/\s*-Wno-backend-plugin/'];
+        if ($sapi === 'frankenphp') {
+            $patterns[] = '/\s*-fprofile-use=\S+/';
+            $patterns[] = '/\s*-fcs-profile-generate=\S+/';
+        }
+        return trim(preg_replace($patterns, '', $flags) ?? $flags);
+    }
+
+    /** --pgi patch: inject __llvm_profile_write_file() flush handler to php and frankenphp sources. */
+    private function applyShutdownPatches(): void
+    {
+        $applied = [];
+        foreach (self::SHUTDOWN_PATCHES as $dir => $patch) {
+            $cwd = SOURCE_PATH . '/' . $dir;
+            if (!is_dir($cwd)) {
+                continue;
+            }
+            if (!SourcePatcher::patchFile($patch, $cwd)) {
+                throw new WrongUsageException("--pgi: patch {$patch} failed to apply in {$cwd}");
+            }
+            $applied[] = ['cwd' => $cwd, 'patch' => $patch];
+            logger()->info("pgo --pgi: applied {$patch}");
+        }
+        if ($applied === []) {
+            return;
+        }
+        register_shutdown_function(static function () use ($applied): void {
+            foreach ($applied as $entry) {
+                $cwd = $entry['cwd'];
+                $patch = $entry['patch'];
+                if (!is_dir($cwd)) {
+                    continue;
+                }
+                $patch_file = ROOT_DIR . "/src/globals/patch/{$patch}";
+                if (!is_file($patch_file)) {
+                    continue;
+                }
+                $args = ' -p1 -s -R -F0 ';
+                exec('cd ' . escapeshellarg($cwd) . ' && patch --dry-run' . $args
+                    . ' < ' . escapeshellarg($patch_file) . ' >/dev/null 2>&1', $_, $detect_status);
+                if ($detect_status !== 0) {
+                    logger()->info("pgo --pgi: {$patch} already clean, skipping revert");
+                    continue;
+                }
+                exec('cd ' . escapeshellarg($cwd) . ' && patch' . $args
+                    . ' < ' . escapeshellarg($patch_file), $out, $apply_status);
+                if ($apply_status === 0) {
+                    logger()->info("pgo --pgi: reverted {$patch}");
+                } else {
+                    logger()->warning("pgo --pgi: failed to revert {$patch} (status {$apply_status}): " . implode("\n", $out));
+                }
+            }
+        });
+    }
+}

src/SPC/util/SPCConfigUtil.php

@@ -42,17 +42,18 @@ class SPCConfigUtil
     /**
      * Generate configuration for building PHP extensions.
      *
-     * @param array $extensions          Extension name list
-     * @param array $libraries           Additional library name list
-     * @param bool  $include_suggest_ext Include suggested extensions
-     * @param bool  $include_suggest_lib Include suggested libraries
+     * @param array      $extensions          Extension name list
+     * @param array      $libraries           Additional library name list
+     * @param bool       $include_suggest_ext Include suggested extensions
+     * @param array|bool $include_suggest_lib true/false to include all/no suggested libs; array to include only suggests that point at libs in the array erse of libs being built)
      * @return array{
      *     cflags: string,
      *     ldflags: string,
      *     libs: string
      * }
+     * @throws WrongUsageException
      */
-    public function config(array $extensions = [], array $libraries = [], bool $include_suggest_ext = false, bool $include_suggest_lib = false): array
+    public function config(array $extensions = [], array $libraries = [], bool $include_suggest_ext = false, array|bool $include_suggest_lib = false): array
     {
         logger()->debug('config extensions: ' . implode(',', $extensions));
         logger()->debug('config libs: ' . implode(',', $libraries));
@@ -80,7 +81,6 @@ class SPCConfigUtil
         $libs = $this->getLibsString($libraries, !$this->absolute_libs);
 
         // additional OS-specific libraries (e.g. macOS -lresolv)
-        // embed
         if ($extra_libs = SPCTarget::getRuntimeLibs()) {
             $libs .= " {$extra_libs}";
         }

src/SPC/util/SPCTarget.php

@@ -27,10 +27,10 @@ class SPCTarget
             return true;
         }
         if (ToolchainManager::getToolchainClass() === GccNativeToolchain::class) {
-            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist();
+            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist() && !getenv('SPC_MUSL_DYNAMIC');
         }
         if (ToolchainManager::getToolchainClass() === ClangNativeToolchain::class) {
-            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist();
+            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist() && !getenv('SPC_MUSL_DYNAMIC');
         }
         // if SPC_LIBC is set, it means the target is static, remove it when 3.0 is released
         if ($target = getenv('SPC_TARGET')) {
@@ -127,4 +127,19 @@ class SPCTarget
             default => PHP_OS_FAMILY,
         };
     }
+
+    /**
+     * Returns the target OS arch, e.g. x86_64, aarch64, arm, x86.
+     */
+    public static function getTargetArch(): string
+    {
+        $target = (string) getenv('SPC_TARGET');
+        return match (true) {
+            str_starts_with($target, 'aarch64') => 'aarch64',
+            str_starts_with($target, 'arm-') => 'arm',
+            str_starts_with($target, 'x86_64-') => 'x86_64',
+            str_starts_with($target, 'x86-') => 'x86',
+            default => GNU_ARCH,
+        };
+    }
 }

src/SPC/util/executor/UnixAutoconfExecutor.php

@@ -16,12 +16,11 @@ class UnixAutoconfExecutor extends Executor
 
     protected array $configure_args = [];
 
-    protected array $ignore_args = [];
-
     public function __construct(protected BSDLibraryBase|LinuxLibraryBase|MacOSLibraryBase $library)
     {
         parent::__construct($library);
         $this->initShell();
+        $this->configure_args = $this->getDefaultConfigureArgs();
     }
 
     /**
@@ -29,19 +28,12 @@ class UnixAutoconfExecutor extends Executor
      */
     public function configure(...$args): static
     {
-        // remove all the ignored args
-        $args = array_merge($args, $this->getDefaultConfigureArgs(), $this->configure_args);
-        $args = array_diff($args, $this->ignore_args);
+        $args = array_merge($args, $this->configure_args);
         $configure_args = implode(' ', $args);
 
         return $this->seekLogFileOnException(fn () => $this->shell->exec("./configure {$configure_args}"));
     }
 
-    public function getConfigureArgsString(): string
-    {
-        return implode(' ', array_merge($this->getDefaultConfigureArgs(), $this->configure_args));
-    }
-
     /**
      * Run make
      *
@@ -111,7 +103,7 @@ class UnixAutoconfExecutor extends Executor
      */
     public function removeConfigureArgs(...$args): static
     {
-        $this->ignore_args = [...$this->ignore_args, ...$args];
+        $this->configure_args = array_diff($this->configure_args, $args);
         return $this;
     }
 
@@ -133,8 +125,8 @@ class UnixAutoconfExecutor extends Executor
     private function getDefaultConfigureArgs(): array
     {
         return [
-            '--disable-shared',
             '--enable-static',
+            '--disable-shared',
             "--prefix={$this->library->getBuildRootPath()}",
             '--with-pic',
             '--enable-pic',

src/SPC/util/executor/UnixCMakeExecutor.php

@@ -182,7 +182,8 @@ class UnixCMakeExecutor extends Executor
         $target_arch = arch2gnu(php_uname('m'));
         $cflags = getenv('SPC_DEFAULT_C_FLAGS');
         $cc = getenv('CC');
-        $cxx = getenv('CCX');
+        $cxx = getenv('CXX');
+        $include = BUILD_INCLUDE_PATH;
         logger()->debug("making cmake tool chain file for {$os} {$target_arch} with CFLAGS='{$cflags}'");
         $root = BUILD_ROOT_PATH;
         $pkgConfigExecutable = PkgConfigUtil::findPkgConfig();
@@ -210,11 +211,16 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-set(CMAKE_EXE_LINKER_FLAGS "-ldl -lpthread -lm -lutil")
+set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES "{$include}")
+set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES "{$include}")
+set(CMAKE_C_STANDARD_LIBRARIES "-ldl -lpthread -lm -lutil")
+set(CMAKE_CXX_STANDARD_LIBRARIES "-ldl -lpthread -lm -lutil")
 CMAKE;
-        // Whoops, linux may need CMAKE_AR sometimes
         if (PHP_OS_FAMILY === 'Linux') {
-            $toolchain .= "\nSET(CMAKE_AR \"ar\")";
+            $ar = getenv('SPC_LINUX_DEFAULT_AR') ?: getenv('AR') ?: 'ar';
+            $ranlib = getenv('SPC_LINUX_DEFAULT_RANLIB') ?: (getenv('RANLIB') ?: 'ranlib');
+            $toolchain .= "\nSET(CMAKE_AR \"{$ar}\")";
+            $toolchain .= "\nSET(CMAKE_RANLIB \"{$ranlib}\")";
         }
         FileSystem::writeFile(SOURCE_PATH . '/toolchain.cmake', $toolchain);
         return $created = realpath(SOURCE_PATH . '/toolchain.cmake');