add libclang.cpu.a

mongo-php-driver 2.3.3 added a config.m4 check that falls back to
php-config when PHP_VERSION_ID is unset in the shell env. In-tree
PHP source builds have no php-config, so configure fails with:

    checking PHP version... configure: error: php-config not found

Set PHP_VERSION_ID from main/php_version.h before configureForUnix
so the lookup short-circuits.

.gitattributes

@@ -1,24 +0,0 @@
-# Force LF line endings for all text files.
-# Prevents git from auto-converting LF -> CRLF on Windows checkouts.
-* text=auto eol=lf
-
-# Explicit binary files — git won't touch line endings for these
-*.phar binary
-*.png binary
-*.jpg binary
-*.jpeg binary
-*.gif binary
-*.ico binary
-*.zip binary
-*.gz binary
-*.tgz binary
-*.txz binary
-*.xz binary
-*.bz2 binary
-*.7z binary
-*.exe binary
-*.dll binary
-*.sfx binary
-*.so binary
-*.a binary
-*.o binary

.github/copilot-instructions.md

@@ -1,23 +0,0 @@
-# StaticPHP v3 Copilot Instructions
-
-> The canonical agent instructions live in [AGENTS.md](./AGENTS.md). This file provides the essential summary for GitHub Copilot; read `AGENTS.md` for the complete project map, working rules, and validation steps.
-
-StaticPHP is a PHP CLI application for building static PHP binaries, PHP SAPIs, extensions, libraries, and helper tools. Prefer the v3 architecture under `src/StaticPHP`, `src/Package`, `config/pkg`, and `config/artifact`.
-
-## Skills
-
-Use the repository skills when the task matches them:
-
-- `.github/skills/staticphp-package-maintenance`: add, modify, review, or validate package, artifact, extension, library, target, or tool definitions.
-- `.github/skills/staticphp-build-troubleshooting`: diagnose build, download, doctor, shell, terminal, CI, smoke-test, or log failures.
-
-## Quick Reference
-
-- **Entrypoint**: `php bin/spc`
-- **Config lint**: `php bin/spc dev:lint-config`
-- **CS fix**: `composer cs-fix`
-- **Tests**: `composer test`
-- **Static analysis**: `composer analyse`
-- **Extension packages**: `config/pkg/ext/ext-*.yml`, prefix with `ext-` in dependencies
-- **Platform suffixes**: `@unix`, `@linux`, `@macos`, `@windows` — prefer these over runtime conditionals
-- **Do NOT edit generated dirs**: `buildroot/`, `source/`, `downloads/`, `pkgroot/`

.github/skills/staticphp-build-troubleshooting/SKILL.md

@@ -1,56 +0,0 @@
----
-name: staticphp-build-troubleshooting
-description: Diagnose StaticPHP v3 failures. Use when investigating build, compile, linker, download, doctor, environment, CI, smoke-test, terminal output, spc.output.log, spc.shell.log, config.log, CMake logs, or user-provided error snippets from StaticPHP commands.
----
-
-# StaticPHP Build Troubleshooting
-
-## Overview
-
-Use this skill to triage StaticPHP failures from the outside in: command and environment first, SPC module/stage metadata next, shell/config logs last. The goal is to isolate the failing package, stage, command, and root cause before editing code.
-
-## First Pass
-
-1. Capture the exact command, OS, architecture, PHP version, extensions/libs/targets, and whether the run used `-v`, `-vv`, or `-vvv`.
-2. Read the final terminal error first. StaticPHP prints module error info, failed package, failed stage, failed command, log paths, and extra log files when available.
-3. If log files exist, inspect them in this order:
-   - `log/spc.output.log`: user-facing SPC messages and exception summary.
-   - `log/spc.shell.log`: executed commands, working directories, env, stdout/stderr.
-   - Extra logs named in the exception output: `php-src.config.log`, `lib.<pkg>.console.log`, `lib.<pkg>.cmake-error.log`, `lib.<pkg>.cmake-configure.log`, `lib.<pkg>.cmake-output.log`.
-4. Read `references/log-triage.md` for pattern matching, likely causes, and next checks.
-
-## Diagnosis Rules
-
-- Do not start by changing shared core code. Most failures are package metadata, environment, upstream source, dependency order, or platform flags.
-- Prefer evidence from the last failing command over earlier warnings.
-- When logs are long, search backward for `Command exited`, `error:`, `undefined reference`, `not found`, `No package`, `CMake Error`, `configure: error`, `fatal error`, `Failed module`, and `Failed stage`.
-- Use `config.log` and CMake logs for configure detection failures; use `spc.shell.log` for the actual command and env.
-- Be careful with rebuild suggestions. `spc reset --with-download --yes` is destructive to caches; ask before clearing caches unless the user explicitly asked.
-
-## Repro Commands
-
-Use focused commands when reproducing:
-
-```bash
-php bin/spc doctor -vvv
-php bin/spc download --for-extensions="curl,openssl" --with-php=8.5 --parallel=4 --retry=3 -vvv
-php bin/spc build:libs "openssl" -vvv
-php bin/spc build:php "bcmath,openssl,curl" --build-cli -vvv
-php bin/spc dev:lint-config
-```
-
-Choose the smallest command that still reaches the failing package.
-
-## Fix Direction
-
-After finding the failing package/stage:
-
-- Package YAML issue: use `$staticphp-package-maintenance`, then edit `config/pkg/*` or `config/artifact/*`.
-- Build command or patch issue: inspect the package class under `src/Package/*`.
-- Environment issue: check `doctor`, toolchain classes, and `config/pkg/tool/*`.
-- Upstream download issue: check artifact type, regex, GitHub rate limiting, mirror behavior, and `GITHUB_TOKEN`.
-- Core exception/logging issue: inspect `src/StaticPHP/Exception`, `src/StaticPHP/Runtime/Shell`, or executor classes only after package-level causes are ruled out.
-
-## Resources
-
-- `references/log-triage.md`: log files, failure categories, search patterns, and likely fixes.

.github/skills/staticphp-build-troubleshooting/agents/openai.yaml

@@ -1,4 +0,0 @@
-interface:
-  display_name: "StaticPHP Build Troubleshooting"
-  short_description: "Diagnose StaticPHP build and log failures."
-  default_prompt: "Use $staticphp-build-troubleshooting to investigate a StaticPHP build, download, doctor, or log failure."

.github/skills/staticphp-build-troubleshooting/references/log-triage.md

@@ -1,209 +0,0 @@
-# StaticPHP Log Triage
-
-## Contents
-
-- Log files
-- Terminal summary
-- Search strategy
-- Failure categories
-- Rebuild hygiene
-- Reporting checklist
-
-## Log Files
-
-Default log directory is `log/`, controlled by `SPC_LOGS_DIR`. The important files are:
-
-- `spc.output.log`: StaticPHP console/logger output and exception summaries.
-- `spc.shell.log`: command execution log with command, caller, inline env, working directory, stdout, stderr, and exit code.
-- `php-src.config.log`: copied when PHP source configure fails.
-- `lib.<pkg>.console.log`: copied Autoconf `config.log` for a library when available.
-- `lib.<pkg>.cmake-configure.log`: copied CMake 3.26+ configure log.
-- `lib.<pkg>.cmake-error.log`: copied CMake error log.
-- `lib.<pkg>.cmake-output.log`: copied CMake output log.
-
-Logs are created when `SPC_ENABLE_LOG_FILE` is true. Old `*.log` files are cleaned unless `SPC_PRESERVE_LOG` is set to a truthy value. The code in `src/bootstrap.php` reads `SPC_PRESERVE_LOG` (no trailing S).
-
-## Terminal Summary
-
-StaticPHP exceptions often print:
-
-- Exception category: build, download, environment, execution, file system, patch, validation, wrong usage, registry, internal.
-- Failed module: package name, type, and sometimes class/file/line.
-- Failed stage: call chain such as `build` or `build -> configure`.
-- Failed command: the command that returned non-zero.
-- Command working directory and inline env.
-- Paths to `spc.output.log`, `spc.shell.log`, and extra logs.
-
-Use this summary to choose the first files to read. If a package and stage are present, start with that package's YAML and class after reading the relevant log tail.
-
-## Search Strategy
-
-For long logs, search from the end first.
-
-Useful patterns:
-
-```text
-Failed module:
-Failed stage:
-Failed command:
-Command exited with non-zero code
-configure: error
-CMake Error
-undefined reference
-cannot find -l
-fatal error:
-No package
-Package .* not found
-Could NOT find
-is not a valid
-permission denied
-curl: (
-HTTP/2 403
-rate limit
-```
-
-In `spc.shell.log`, each command block begins with `>>>>>>>>>>>>>>>>>>>>>>>>>>`, then prints the command, caller, env, and working dir. The last failed block is usually the highest-value evidence.
-
-## Failure Categories
-
-### Download Failure
-
-Signs:
-
-- `Download failed`
-- `curl: (56)`, `curl: (22)`, HTTP 403/404/429
-- GitHub API calls in verbose logs
-- Asset regex did not match a release asset
-
-Likely checks:
-
-- If GitHub rate limited, ask user to set `GITHUB_TOKEN`.
-- Verify artifact source type and regex in `config/pkg/*` or `config/artifact/*`.
-- Use `--dl-retry`, `--dl-parallel`, `--ignore-cache`, `--no-alt`, or custom source options only as repro aids.
-- Prefer fixing stale URLs/regexes over adding workarounds.
-
-### Doctor or Environment Failure
-
-Signs:
-
-- `Environment check failed`
-- missing `make`, `cmake`, `autoconf`, `pkg-config`, compiler, Perl, Visual Studio, MSYS2, Zig, etc.
-- `Some check items can not be fixed`
-
-Likely checks:
-
-- Run `php bin/spc doctor -vvv`.
-- Inspect `src/StaticPHP/Doctor/Item/*` for the check and fix behavior.
-- Inspect `config/pkg/tool/*` for installable helper tools.
-- On Windows, some dependencies cannot be auto-installed.
-
-### Configure Failure
-
-Signs:
-
-- `configure: error`
-- Autoconf failure before compilation
-- extra `config.log` listed
-
-Likely checks:
-
-- Read copied `php-src.config.log` or `lib.<pkg>.console.log`.
-- Look for the first compiler/linker probe that failed.
-- Check `headers`, `static-libs`, `pkg-configs`, dependency order, and `initializeEnv($pkg)` behavior.
-- For extensions, check `php-extension.arg-type` and `#[CustomPhpConfigureArg]`.
-
-### CMake Failure
-
-Signs:
-
-- `CMake Error`
-- `Could NOT find`
-- missing target, package config, or static library
-
-Likely checks:
-
-- Read `lib.<pkg>.cmake-error.log` and `lib.<pkg>.cmake-configure.log`.
-- Inspect `UnixCMakeExecutor`/`WindowsCMakeExecutor` usage in the package class.
-- Check CMake options, toolchain root path, `pkg-configs`, and transitive dependency libraries.
-
-### Compile Failure
-
-Signs:
-
-- compiler `fatal error: header.h: No such file or directory`
-- syntax/type errors from upstream source
-- incompatible PHP API or platform macros
-
-Likely checks:
-
-- Identify the source file and include path from `spc.shell.log`.
-- Verify dependency headers are installed in `buildroot/include`.
-- Check PHP version compatibility and existing patches in `src/globals/patch`.
-- Prefer targeted patches or compile flags in the package class over broad toolchain changes.
-
-### Link Failure
-
-Signs:
-
-- `undefined reference`
-- `cannot find -lfoo`
-- duplicate symbols
-- Windows unresolved external symbol or missing `.lib`
-
-Likely checks:
-
-- Verify `static-libs`, dependency order, and `getStaticLibFiles()` usage.
-- Inspect `SPC_EXTRA_LIBS`, `Libs.private` in `.pc` files, and package-specific pkg-config patching.
-- On Windows, confirm `.lib` names and required system libraries.
-- For OpenSSL/curl-like packages, search existing linker flag hooks before adding a new one.
-
-### Smoke Test or Validation Failure
-
-Signs:
-
-- `Validation failed`
-- `php --ri` failure
-- extension not loaded after build
-- micro/embed runtime smoke test fails
-
-Likely checks:
-
-- Check extension `display-name`; empty string skips `php --ri`.
-- Confirm static vs shared build settings.
-- Confirm the extension is included in the final SAPI target and not only built as a dependency.
-- Inspect `src/globals/ext-tests/*` and common tests for expected runtime behavior.
-
-### Registry or Config Failure
-
-Signs:
-
-- `Registry error`
-- unknown package, invalid field, invalid platform suffix, type mismatch
-- package referenced by attribute but missing config
-
-Likely checks:
-
-- Run `php bin/spc dev:lint-config`.
-- Inspect `ConfigValidator` tests for accepted fields and error expectations.
-- Confirm attribute type matches YAML `type`.
-- Confirm hooks reference existing package names and stages for the current platform.
-
-## Rebuild Hygiene
-
-Use the smallest cleanup that can invalidate the suspected stale state:
-
-- Redownload one artifact: `--ignore-cache="artifact-name"`.
-- Skip downloads to test local source/build logic: `--no-download`.
-- Prefer source when debugging build logic: `--dl-prefer-source`.
-- Clear build products only when necessary. `spc reset --with-download --yes` removes caches and should not be suggested casually.
-
-## Reporting Checklist
-
-When preparing an issue or PR explanation, include:
-
-- Exact `php bin/spc ...` command.
-- OS, architecture, PHP version option, and relevant env vars.
-- Failed package and stage.
-- Last failed command and exit code.
-- Tail of `spc.output.log`, relevant command block from `spc.shell.log`, and any extra config/CMake log.
-- Whether the failure reproduces after a focused clean or cache refresh.

.github/skills/staticphp-package-maintenance/SKILL.md

@@ -1,55 +0,0 @@
----
-name: staticphp-package-maintenance
-description: Maintain StaticPHP v3 packages and artifacts. Use when adding, modifying, reviewing, or validating config under config/pkg or config/artifact; package classes under src/Package; extension/library/target/tool dependencies; PHP configure args; build hooks; package metadata; or related tests and docs.
----
-
-# StaticPHP Package Maintenance
-
-## Overview
-
-Use this skill to make focused package changes without re-reading the entire repository. StaticPHP v3 separates declarative package/artifact YAML from package-specific PHP build logic; prefer config-only edits unless current patterns require a class.
-
-## Quick Workflow
-
-1. Identify the package kind and exact name.
-   - Extension: `config/pkg/ext/ext-name.yml`, class `src/Package/Extension/name.php`.
-   - Library: `config/pkg/lib/name.yml`, class `src/Package/Library/name.php`.
-   - Target or virtual target: `config/pkg/target/name.yml`, class `src/Package/Target/name.php`.
-   - Tool: `config/pkg/tool/name.yml`, class `src/Package/Tool/name.php`.
-   - Shared/custom artifact: `config/artifact/name.yml`, class `src/Package/Artifact/name.php`.
-
-2. Search for the closest existing package before designing anything new.
-   - Similar build system: `rg "#\\[BuildFor|UnixCMakeExecutor|UnixAutoconfExecutor|WindowsCMakeExecutor" src/Package`.
-   - Similar config fields: `rg "static-libs|pkg-configs|arg-type|depends@" config/pkg`.
-   - Similar download type: `rg "type: ghrel|type: pecl|type: pie|type: git|binary: hosted" config`.
-
-3. Read `references/package-reference.md` when changing YAML fields, artifact definitions, package naming, dependencies, platform suffixes, or validation expectations.
-
-4. Read `references/build-class-patterns.md` when PHP build logic, attributes, lifecycle hooks, custom configure args, source patching, or executor usage is needed.
-
-5. Validate narrowly, then broadly if risk warrants it.
-   - Config lint: `php bin/spc dev:lint-config`
-   - Focused tests: `vendor/bin/phpunit tests/StaticPHP/Config tests/StaticPHP/Registry tests/StaticPHP/Util/DependencyResolverTest.php --no-coverage`
-   - Full project checks: `composer test`, `composer analyse`
-
-## Editing Rules
-
-- Treat `config/pkg/*` and `config/artifact/*` as the source of package truth; package classes augment behavior.
-- Use platform suffix fields for declarative OS differences: `@unix`, `@linux`, `@macos`, `@windows`.
-- Add a PHP class only for custom build stages, validation, hook behavior, patches, or custom configure arguments.
-- Keep extension dependencies prefixed with `ext-`; libraries, tools, and targets use their package names.
-- Prefer existing helpers such as `UnixAutoconfExecutor`, `UnixCMakeExecutor`, `WindowsCMakeExecutor`, `shell()`, `cmd()`, and `FileSystem`.
-- Do not modify build outputs (`buildroot/`, `source/`, `downloads/`, `pkgroot/`) to fix package definitions.
-- If upstream metadata changes, update license metadata and smoke-test/display names when relevant.
-
-## Common Task Paths
-
-- Add a new PECL extension: define `config/pkg/ext/ext-name.yml` with `type: php-extension`, `artifact.source.type: pecl`, dependencies, and `php-extension.arg-type`; add a class only if configure args, patches, or hooks are non-standard.
-- Add a library: define `config/pkg/lib/name.yml` with artifact, dependencies, and install verification fields (`headers`, `static-libs`, `pkg-configs`, `static-bins`); add build class methods by OS.
-- Fix an existing package build: start from the failing package config/class, then inspect dependencies and hooks targeting that package before changing shared core code.
-- Update a version source: prefer artifact fields that support update checking (`ghrel`, `ghtar`, `ghtagtar`, `git` with regex, `filelist`, `pecl`, `pie`) over hard-coded URLs when upstream supports it.
-
-## Resources
-
-- `references/package-reference.md`: YAML package/artifact model, naming, fields, validation, and commands.
-- `references/build-class-patterns.md`: PHP package attributes, stages, hooks, executors, and class patterns.

.github/skills/staticphp-package-maintenance/agents/openai.yaml

@@ -1,4 +0,0 @@
-interface:
-  display_name: "StaticPHP Package Maintenance"
-  short_description: "Add, update, and validate StaticPHP v3 package definitions."
-  default_prompt: "Use $staticphp-package-maintenance to add, modify, or review StaticPHP package and artifact definitions."

.github/skills/staticphp-package-maintenance/references/build-class-patterns.md

@@ -1,143 +0,0 @@
-# StaticPHP Build Class Patterns
-
-## Contents
-
-- When a class is needed
-- Package attributes
-- Stage and hook behavior
-- Executor choices
-- Common patterns
-- Failure-safe edits
-
-## When a Class Is Needed
-
-Do not add a PHP package class for simple metadata. Use YAML alone when StaticPHP can infer the configure args, dependencies, and verification.
-
-Add or update a class when the package needs:
-
-- OS-specific build commands.
-- Custom validation before building.
-- Custom PHP configure arguments.
-- Patches or file edits before build.
-- Hooks into another package's stage.
-- Custom source/binary download or extraction logic.
-- Package info shown by dev tooling.
-
-Package classes live in `src/Package/*` and are discovered through PSR-4 plus attributes. Config must exist first; `PackageLoader` throws if an attribute references an undefined package.
-
-## Package Attributes
-
-Class-level package attributes:
-
-- `#[Extension('curl')]` maps to package `ext-curl` if the prefix is omitted.
-- `#[Library('openssl')]`
-- `#[Target('php')]`
-- `#[Tool('zig')]`
-
-Method-level attributes:
-
-- `#[BuildFor('Linux'|'Darwin'|'Windows')]`: registers the `build` stage for that OS.
-- `#[Stage('name')]`: registers a named stage; defaults to the method name when omitted.
-- `#[BeforeStage('package', 'stage', 'only-when-package-resolved')]`: hook before a target package stage.
-- `#[AfterStage('package', 'stage', 'only-when-package-resolved')]`: hook after a target package stage.
-- `#[PatchBeforeBuild]`: runs once before package build unless `.spc-patched` exists; return `true` to write that marker.
-- `#[CustomPhpConfigureArg('Linux')]`: supplies custom extension configure args.
-- `#[Validate]`: validates environment/source assumptions.
-- `#[Info]`: returns package information for tooling.
-- `#[InitPackage]`: runs while loading a package class.
-- `#[ResolveBuild]`: target package callback for resolving build dependencies.
-- `#[ConditionalOn(SomeClass::class)]`: conditionally enables before/after hooks only when DI has the class.
-
-## Stage and Hook Behavior
-
-`PackageBuilder::buildPackage()` does:
-
-1. Ensure build directories exist.
-2. Skip if already installed unless forced.
-3. Ensure source exists for non-virtual packages.
-4. Emit `PatchBeforeBuild` callbacks.
-5. Run the `build` stage.
-6. Install license data.
-7. Record tool package versions where relevant.
-
-`Package::runStage()` wraps a stage with:
-
-1. `BeforeStage` callbacks.
-2. The stage method itself.
-3. `AfterStage` callbacks.
-
-SPC exceptions bind package and stage metadata. Preserve that behavior by throwing existing `SPCException` subclasses instead of raw exceptions when adding new failure paths.
-
-## Executor Choices
-
-Use existing executors where possible:
-
-- `UnixAutoconfExecutor`: for Unix packages using `./configure && make && make install`. It injects default static flags and copies `config.log` into SPC logs on failure.
-- `UnixCMakeExecutor`: for Unix CMake packages. It writes toolchain settings and copies CMake configure/error/output logs on failure.
-- `WindowsCMakeExecutor`: for Windows CMake packages.
-- `shell()->cd(...)->initializeEnv($pkg)`: for custom Unix command chains.
-- `cmd()->cd(...)`: for Windows command chains.
-
-Prefer `FileSystem` helpers for file edits and copies so behavior stays consistent.
-
-## Common Patterns
-
-Minimal library class:
-
-```php
-#[Library('example')]
-class example
-{
-    #[BuildFor('Linux')]
-    public function build(LibraryPackage $pkg): void
-    {
-        (new UnixAutoconfExecutor($pkg))
-            ->configure()
-            ->make();
-    }
-}
-```
-
-Extension hook into PHP build:
-
-```php
-#[Extension('curl')]
-class curl
-{
-    #[BeforeStage('php', [php::class, 'makeForWindows'], 'ext-curl')]
-    public function patchBeforePhpBuild(): void
-    {
-        // Adjust env, generated build files, or linker flags.
-    }
-}
-```
-
-Validation:
-
-```php
-#[Validate]
-public function validate(): void
-{
-    if (SystemTarget::getTargetOS() === 'Windows' && WindowsUtil::findCommand('perl.exe') === null) {
-        throw new EnvironmentException('You need to install perl first!');
-    }
-}
-```
-
-Custom configure args should be used when YAML `arg-type` is `custom` or when args need package/install context:
-
-```php
-#[CustomPhpConfigureArg('Linux')]
-public function configureArg(PhpExtensionPackage $ext): string
-{
-    return '--with-example=' . $ext->getBuildRootPath();
-}
-```
-
-## Failure-Safe Edits
-
-- Make hooks conditional with the third `BeforeStage`/`AfterStage` argument when a dependency must be resolved before the hook should run.
-- Keep platform-specific code under matching `#[BuildFor]` methods rather than branching heavily inside one method.
-- If a patch changes upstream source, place patch files in `src/globals/patch/` and describe them with `#[PatchDescription]` where appropriate.
-- If a class only mutates environment variables for another package, search for existing hooks first to avoid duplicate linker flags.
-- After adding attributes, run registry/config tests because invalid stages and unknown packages are caught during loading.

.github/skills/staticphp-package-maintenance/references/package-reference.md

@@ -1,157 +0,0 @@
-# StaticPHP Package Reference
-
-## Contents
-
-- Package locations
-- Package types
-- Artifact model
-- Common YAML fields
-- PHP extension fields
-- Platform suffixes
-- Validation and tests
-
-## Package Locations
-
-StaticPHP v3 keeps package metadata in YAML and behavior in PHP classes.
-
-| Kind | YAML | PHP class namespace | Typical attribute |
-|---|---|---|---|
-| PHP extension | `config/pkg/ext/ext-name.yml` | `Package\Extension` | `#[Extension('name')]` |
-| Library | `config/pkg/lib/name.yml` | `Package\Library` | `#[Library('name')]` |
-| Target | `config/pkg/target/name.yml` | `Package\Target` | `#[Target('name')]` |
-| Virtual target | `config/pkg/target/name.yml` | `Package\Target` | `#[Target('name')]` |
-| Tool | `config/pkg/tool/name.yml` | `Package\Tool` | `#[Tool('name')]` |
-| Custom artifact | `config/artifact/name.yml` | `Package\Artifact` | artifact attributes |
-
-Prefer one package per YAML file unless an existing file groups related definitions. Match nearby naming and ordering.
-
-## Package Types
-
-`php-extension` packages describe PHP extensions. Config package names must use the `ext-` prefix. Dependencies on extensions also use `ext-`.
-
-`library` packages describe buildable dependency libraries. They usually define source artifacts plus verification fields such as headers, static libraries, pkg-config files, or binaries.
-
-`target` packages represent final build outputs and inherit the library-style fields. StaticPHP automatically exposes build commands for targets.
-
-`virtual-target` packages are abstract dependency/build scheduling nodes. They may omit `artifact`.
-
-`tool` packages are helper programs or toolchains installed into `pkgroot/` or used by builds.
-
-## Artifact Model
-
-Artifacts define downloadable source archives or prebuilt binaries. Use inline artifacts for simple one-package sources and `config/artifact/*.yml` for shared, complex, or custom artifacts.
-
-Top-level artifact sections:
-
-- `source`: source archive, git checkout, PECL/PIE package, local directory, or custom source.
-- `binary`: prebuilt binary by platform, or aliases such as `hosted`/`custom`.
-- `metadata`: `license`, `license-files`, and `source-root`.
-
-Common source types:
-
-- `url`: fixed URL; supports `filename`, `version`, and `extract`.
-- `git`: repository source; use `rev` for a fixed branch/tag/commit or `regex` with named `version` capture for update checks.
-- `ghrel`: GitHub release asset by regex filename match.
-- `ghtar`: generated GitHub release tarball.
-- `ghtagtar`: generated GitHub tag tarball.
-- `filelist`: scrape a download index and extract version/filename with regex.
-- `pecl`: PECL extension by name.
-- `pie`: Packagist PIE extension by `vendor/package`.
-- `php-release`: official PHP source selected by build PHP version.
-- `local`: local source directory for development/offline use.
-- `custom`: PHP artifact class handles source or binary logic.
-
-Use `metadata.source-root` when the actual build directory is inside an extracted subdirectory.
-
-Use `metadata.license-files` for source licenses. `@/file.txt` points to bundled license files in `src/globals/licenses/`.
-
-## Common YAML Fields
-
-Shared fields:
-
-- `type`: required package type.
-- `description`: optional human-readable package description.
-- `license`: package-level license annotation where applicable.
-- `lang`: implementation language such as `c` or `c++`.
-- `frameworks`: macOS framework tags.
-- `artifact`: string reference or inline artifact object. Required for `library` and `target`; optional for built-in extensions and virtual targets.
-- `depends`: hard dependencies.
-- `suggests`: optional dependencies.
-
-Library, target, and tool verification/installation fields:
-
-- `headers`: expected files/directories under `buildroot/include`.
-- `static-libs`: expected static libraries under `buildroot/lib`.
-- `pkg-configs`: expected `.pc` files under `buildroot/lib/pkgconfig`.
-- `static-bins`: expected executables under `buildroot/bin`.
-- `path`: directories appended to PATH after install.
-- `env`: environment variables set after install.
-- `append-env`: values appended to existing environment variables.
-
-Path placeholders in `path`, `env`, and `append-env`:
-
-- `{build_root_path}`: `buildroot/`
-- `{pkg_root_path}`: `pkgroot/`
-- `{working_dir}`: repository or working directory
-- `{download_path}`: `downloads/`
-- `{source_path}`: `source/`
-- `{spc_msys2_path}`: MSYS2 root on Windows
-
-## PHP Extension Fields
-
-Extension-specific fields live under `php-extension`.
-
-- `arg-type`: configure argument behavior. Built-ins include `enable`, `enable-path`, `with`, `with-path`, `custom`, and `none`. Full strings are allowed.
-- `zend-extension`: true for Zend extensions such as opcache/xdebug.
-- `build-shared`: whether shared builds are allowed.
-- `build-static`: whether static builds are allowed.
-- `build-with-php`: true when built inside the PHP source tree.
-- `display-name`: value used for `php --ri` smoke tests and license display; empty string skips the `--ri` check.
-- `os`: allowed OS families: `Linux`, `Darwin`, `Windows`.
-
-Configure string placeholders:
-
-- `@build_root_path@`: absolute buildroot path.
-- `@shared_suffix@`: `=shared` in shared builds, empty in static builds.
-- `@shared_path_suffix@`: `=shared,{buildroot}` in shared builds, `={buildroot}` in static builds.
-
-## Platform Suffixes
-
-Many fields support platform suffixes:
-
-- `@unix`: Linux and macOS.
-- `@linux`: Linux only.
-- `@macos`: macOS only.
-- `@windows`: Windows only.
-
-For Linux, specific fields override generic fields in this order: `field@linux`, then `field@unix`, then `field`.
-
-Use suffixes for declarative differences in dependencies, headers, libraries, pkg-configs, extension args, and suggestions.
-
-## Validation and Tests
-
-Run config validation for most package edits:
-
-```bash
-php bin/spc dev:lint-config
-```
-
-Run focused tests after config or registry changes:
-
-```bash
-vendor/bin/phpunit tests/StaticPHP/Config tests/StaticPHP/Registry tests/StaticPHP/Util/DependencyResolverTest.php --no-coverage
-```
-
-Run broader checks for framework or class changes:
-
-```bash
-composer test
-composer analyse
-```
-
-Build commands are expensive. Use them for user-provided repros, package-specific fixes, or when validation cannot prove the behavior:
-
-```bash
-php bin/spc build:libs "openssl,curl" -vvv
-php bin/spc build:php "bcmath,openssl,curl" --build-cli -vvv
-```

.github/workflows/post-test-bot-comment.yml

@@ -1,48 +0,0 @@
-name: Post Test Bot Comment
-
-on:
-  workflow_run:
-    workflows: ["v3 Tests"]
-    types: [completed]
-
-permissions:
-  pull-requests: write
-  actions: read
-
-jobs:
-  post-comment:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: Download bot output
-        id: download
-        uses: actions/download-artifact@v4
-        continue-on-error: true
-        with:
-          name: bot-output
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Post/Update comment
-        if: steps.download.outcome == 'success'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          COMMENT_BODY=$(jq -r '.comment_body' bot-output.json)
-          PR_NUMBER=$(jq -r '.pr_number' bot-output.json)
-          MARKER="<!-- spc-test-bot -->"
-
-          # Find existing bot comment id
-          EXISTING_ID=$(gh api \
-            "repos/${{ github.repository }}/issues/${PR_NUMBER}/comments" \
-            --jq "[.[] | select(.body | startswith(\"${MARKER}\")) | .id] | first // empty")
-
-          if [ -n "$EXISTING_ID" ]; then
-            gh api --method PATCH \
-              "repos/${{ github.repository }}/issues/comments/${EXISTING_ID}" \
-              -f body="$COMMENT_BODY"
-          else
-            gh pr comment "$PR_NUMBER" \
-              --repo "${{ github.repository }}" \
-              --body "$COMMENT_BODY"
-          fi

.github/workflows/release-build.yml

@@ -38,9 +38,6 @@ jobs:
           - name: "windows-x64"
             os: "ubuntu-latest"
             filename: "spc-windows-x64.exe"
-    permissions:
-      id-token: write
-      attestations: write
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v5"
@@ -108,12 +105,6 @@ jobs:
             fi
           fi
 
-      - name: "Generate build provenance attestation"
-        if: github.event_name != 'pull_request'
-        uses: actions/attest-build-provenance@v4
-        with:
-          subject-path: "${{ github.workspace }}/${{ matrix.operating-system.name == 'windows-x64' && 'spc.exe' || 'spc' }}"
-
       - name: "Copy file"
         run: |
           if [ "${{ matrix.operating-system.name }}" != "windows-x64" ]; then

.github/workflows/tests.yml

@@ -131,6 +131,7 @@ jobs:
     if: needs.check-gate.outputs.enabled == 'true'
     runs-on: ubuntu-latest
     permissions:
+      pull-requests: write
       contents: read
     outputs:
       need_test:             ${{ steps.bot.outputs.need_test }}
@@ -167,17 +168,23 @@ jobs:
           echo "php_versions=$(echo "$BOT_JSON" | jq -c '.php_versions')"                 >> "$GITHUB_OUTPUT"
           echo "tier2=$(echo "$BOT_JSON" | jq -r '.tier2')"                               >> "$GITHUB_OUTPUT"
 
-          # Save JSON for the comment-posting workflow
+          COMMENT_BODY=$(echo "$BOT_JSON" | jq -r '.comment_body')
-          jq -n --argjson bot "$BOT_JSON" \
+          MARKER="<!-- spc-test-bot -->"
-            --arg pr '${{ github.event.pull_request.number }}' \
-            '$bot + {pr_number: $pr}' > bot-output.json
 
-      - name: Upload bot output
+          # Find existing bot comment id
-        uses: actions/upload-artifact@v4
+          EXISTING_ID=$(gh api \
-        with:
+            repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments \
-          name: bot-output
+            --jq "[.[] | select(.body | startswith(\"$MARKER\")) | .id] | first // empty")
-          path: bot-output.json
+
-          retention-days: 1
+          if [ -n "$EXISTING_ID" ]; then
+            gh api --method PATCH \
+              repos/${{ github.repository }}/issues/comments/"$EXISTING_ID" \
+              -f body="$COMMENT_BODY"
+          else
+            gh pr comment ${{ github.event.pull_request.number }} \
+              --repo ${{ github.repository }} \
+              --body "$COMMENT_BODY"
+          fi
 
   gen-matrix:
     name: "Generate test matrix"

AGENTS.md

@@ -1,59 +0,0 @@
-# StaticPHP v3 Agent Guide
-
-StaticPHP is a PHP CLI application for building static PHP binaries, PHP SAPIs, extensions, libraries, helper tools, and project bundles. Prefer the v3 architecture under `src/StaticPHP`, `src/Package`, `config/pkg`, and `config/artifact`.
-
-This file is the shared entry point for coding agents such as Codex, OpenCode, Claude-compatible agents, and GitHub Copilot agents. GitHub Copilot also has `.github/copilot-instructions.md`.
-
-## Skills
-
-Detailed task workflows live in `.github/skills`. Use them when the task matches:
-
-- `.github/skills/staticphp-package-maintenance`: add, modify, review, or validate package, artifact, extension, library, target, or tool definitions.
-- `.github/skills/staticphp-build-troubleshooting`: diagnose build, download, doctor, shell, terminal, CI, smoke-test, or log failures.
-
-If your agent does not automatically discover skills from `.github/skills`, read the matching `SKILL.md` manually before working on that task.
-
-## Project Map
-
-- `bin/spc`: primary CLI entrypoint.
-- `composer.json`: PHP 8.4+, Symfony Console, DI, YAML, logger; useful scripts are `composer test`, `composer analyse`, `composer lint-config`, and `composer cs-fix`.
-- `spc.registry.yml`: built-in `core` registry.
-- `config/pkg/ext`: PHP extension package YAML, usually named `ext-*.yml`.
-- `config/pkg/lib`: library package YAML.
-- `config/pkg/target`: final build target and virtual target YAML.
-- `config/pkg/tool`: helper tool package YAML.
-- `config/artifact`: standalone artifact YAML for shared or complex sources/binaries.
-- `log/`: build and shell execution logs (`spc.output.log`, `spc.shell.log`, and per-package CMake/config logs); controlled by `SPC_LOGS_DIR` and `SPC_ENABLE_LOG_FILE`.
-- `src/StaticPHP`: framework core: registry loading, config validation, dependency resolution, package install/build pipeline, doctor, toolchains, runtime shell/executors, exceptions.
-- `src/Package`: package-specific build logic registered by PHP attributes.
-- `src/globals`: constants, helper functions, patches, smoke tests, bundled license text.
-- `tests`: PHPUnit tests for config, registry, artifacts, dependency resolver, DI, commands, and utilities.
-- `docs/en/develop` and `docs/zh/develop`: developer documentation. Some pages may be TODO; verify against source when behavior matters.
-
-## Working Rules
-
-- Keep changes scoped to the requested package, artifact, command, docs, or tests.
-- Prefer existing package patterns over new abstractions. Search for a similar package first.
-- Use structured YAML config; do not encode dependency logic in PHP when config fields are enough.
-- Match package names exactly: extension packages use `ext-` in config and dependencies; `#[Extension('curl')]` expands to `ext-curl`.
-- Use platform suffixes such as `@unix`, `@linux`, `@macos`, and `@windows` instead of runtime conditionals when the difference is declarative.
-- Add or update PHP package classes only when build commands, validation, custom configure args, hooks, or source patching are required.
-- Do not edit generated build directories (`buildroot/`, `source/`, `downloads/`, `pkgroot/`) as a fix.
-
-## Validation
-
-For config or package changes, run CS checks first:
-
-```bash
-bin/spc dev:lint-config
-composer cs-fix
-```
-
-For broader PHP code changes, also run:
-
-```bash
-composer test
-composer analyse
-```
-
-Use build commands only when needed for the task or when the user provided a repro, because full static builds can be slow and platform-sensitive.

README-zh.md

@@ -104,7 +104,7 @@ echo '<?php echo "Hello world!\n";' > a.php
 
 ## 直接下载
 
-如果你暂时不想构建，或只想先测试，可以从 [Actions](https://github.com/static-php/hosted/actions/workflows/build-php-bulk.yml) 下载示例预编译产物，或从自托管服务器下载。
+如果你暂时不想构建，或只想先测试，可以从 [Actions](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-bulk.yml) 下载示例预编译产物，或从自托管服务器下载。
 
 我们为每个 PHP 版本提供 2 种扩展集合：
 

README.md

@@ -104,7 +104,7 @@ see <https://static-php.dev>.
 
 ## Direct Download
 
-If you do not want to build yet or just want to test first, you can download example pre-compiled artifacts from [Actions](https://github.com/static-php/hosted/actions/workflows/build-php-bulk.yml) or from a self-hosted server.
+If you do not want to build yet or just want to test first, you can download example pre-compiled artifacts from [Actions](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-bulk.yml) or from a self-hosted server.
 
 We offer 2 types of extension sets for each PHP version:
 

box.json

@@ -10,6 +10,7 @@
         "config",
         "src",
         "vendor/psr",
+        "vendor/laravel/prompts",
         "vendor/symfony",
         "vendor/php-di",
         "vendor/zhamao"

composer.json

@@ -12,8 +12,10 @@
         "php": ">=8.4",
         "ext-mbstring": "*",
         "ext-zlib": "*",
+        "laravel/prompts": "~0.1",
         "php-di/php-di": "^7.1",
         "symfony/console": "^5.4 || ^6 || ^7",
+        "symfony/process": "^7.2",
         "symfony/yaml": "^7.2",
         "zhamao/logger": "^1.1.4"
     },

config/artifact/ncurses.yml

@@ -3,10 +3,6 @@ ncurses:
     license-files:
       - COPYING
   source:
-    type: filelist
-    url: 'https://ftp.gnu.org/gnu/ncurses/'
-    regex: '/href="(?<file>ncurses-(?<version>[^"]+)\.tar\.gz)"/'
-  source-mirror:
     type: filelist
     url: 'https://ftpmirror.gnu.org/gnu/ncurses/'
     regex: '/href="(?<file>ncurses-(?<version>[^"]+)\.tar\.gz)"/'

config/env.ini

@@ -53,8 +53,8 @@ PHP_BUILD_PROVIDER="StaticPHP ${SPC_VERSION}"
 SPC_ENABLE_LOG_FILE="yes"
 ; The LOG DIR for spc logs
 SPC_LOGS_DIR="${WORKING_DIR}/log"
-; Preserve old logs when running new builds (code checks SPC_PRESERVE_LOG, not SPC_PRESERVE_LOGS)
+; Preserve old logs when running new builds
-SPC_PRESERVE_LOG="no"
+SPC_PRESERVE_LOGS="no"
 
 ; EXTENSION_DIR where the built php will look for extension when a .ini instructs to load them
 ; only useful for builds targeting not pure-static linking
@@ -68,8 +68,8 @@ SPC_PRESERVE_LOG="no"
 [windows]
 ; build target: win7-static
 SPC_TARGET=native-windows
-; MSYS2 root directory (msys64 subfolder), used by the Windows toolchain
+; php-sdk-binary-tools path
-SPC_MSYS2_PATH="${PKG_ROOT_PATH}\msys2-build-essentials\msys64"
+PHP_SDK_PATH="${WORKING_DIR}\php-sdk-binary-tools"
 ; upx executable path
 UPX_EXEC="${PKG_ROOT_PATH}\bin\upx.exe"
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
@@ -100,9 +100,10 @@ SPC_TARGET=${GNU_ARCH}-linux-musl
 CC=${SPC_DEFAULT_CC}
 CXX=${SPC_DEFAULT_CXX}
 AR=${SPC_DEFAULT_AR}
+RANLIB=${SPC_DEFAULT_RANLIB}
 LD=${SPC_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
-SPC_DEFAULT_CFLAGS="-fPIC -O3 -pipe -fno-plt -fno-semantic-interposition -fstack-clash-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections"
+SPC_DEFAULT_CFLAGS="-fPIC -O3 -pipe -fno-plt -fno-semantic-interposition -fstack-clash-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections -Wno-unused-command-line-argument"
 SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}"
 SPC_DEFAULT_LDFLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -Wl,-z,noexecstack -Wl,--gc-sections"
 ; upx executable path
@@ -125,6 +126,8 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS="-g -fstack-protector-strong -fno-ident -fPIE -fvisibility=hidden -fvisibility-inlines-hidden ${SPC_DEFAULT_CXXFLAGS}"
 ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
+; EXTRA_LDFLAGS_PROGRAM for `make` php; appended only to SAPI executable links (cli/fpm/cgi/micro/embed). Used by PGO to inject -fprofile-use= without polluting libphp.{a,so}.
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM=""
 
 ; 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
@@ -140,6 +143,7 @@ SPC_USE_LLVM=system
 CC=${SPC_DEFAULT_CC}
 CXX=${SPC_DEFAULT_CXX}
 AR=${SPC_DEFAULT_AR}
+RANLIB=${SPC_DEFAULT_RANLIB}
 LD=${SPC_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
 SPC_DEFAULT_CFLAGS="--target=${MAC_ARCH}-apple-darwin -O3 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections"
@@ -163,5 +167,7 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -fvis
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS="-g -fstack-protector-strong -fno-ident -fpie -fvisibility=hidden -fvisibility-inlines-hidden -Werror=unknown-warning-option ${SPC_DEFAULT_CXXFLAGS}"
 ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.dylib
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
+; EXTRA_LDFLAGS_PROGRAM for `make` php; appended only to SAPI executable links (cli/fpm/cgi/micro/embed). Used by PGO to inject -fprofile-use= without polluting libphp.{a,dylib}.
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM=""
 ; minimum compatible macOS version (LLVM vars, availability not guaranteed)
 MACOSX_DEPLOYMENT_TARGET=12.0

config/pkg/ext/ext-gmssl.yml

@@ -10,5 +10,3 @@ ext-gmssl:
       license: PHP-3.01
   depends:
     - gmssl
-  php-extension:
-    arg-type: with-path

config/pkg/ext/ext-imagick.yml

@@ -13,5 +13,4 @@ ext-imagick:
     os:
       - Linux
       - Darwin
-      - Windows
     arg-type: custom

config/pkg/ext/ext-zip.yml

@@ -10,11 +10,6 @@ ext-zip:
       license: PHP-3.01
   depends:
     - libzip
-  depends@windows:
-    - libzip
-    - zlib
-    - xz
-    - bzip2
   php-extension:
     arg-type: custom
     arg-type@windows: enable

config/pkg/lib/gettext.yml

@@ -2,10 +2,6 @@ gettext:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/gettext/'
-      regex: '/href="(?<file>gettext-(?<version>[^"]+)\.tar\.xz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/gettext/'
       regex: '/href="(?<file>gettext-(?<version>[^"]+)\.tar\.xz)"/'

config/pkg/lib/gmp.yml

@@ -2,13 +2,12 @@ gmp:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/gmp/'
-      regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/gmp/'
       regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
+    source-mirror:
+      type: url
+      url: 'https://dl.static-php.dev/static-php-cli/deps/gmp/gmp-6.3.0.tar.xz'
     metadata:
       license-files: ['@/gmp.txt']
       license: Custom

config/pkg/lib/idn2.yml

@@ -2,10 +2,6 @@ idn2:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libidn/'
-      regex: '/href="(?<file>libidn2-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/libidn/'
       regex: '/href="(?<file>libidn2-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/lib/imagemagick.yml

@@ -16,59 +16,13 @@ imagemagick:
     - libtiff
     - libheif
     - bzip2
-  depends@windows:
-    - zlib
   suggests:
     - zstd
     - xz
     - libzip
     - libxml2
-  headers@windows:
-    - imagemagick/MagickWand/MagickWand.h
   lang: cpp
   pkg-configs:
     - Magick++-7.Q16HDRI
     - MagickCore-7.Q16HDRI
     - MagickWand-7.Q16HDRI
-  static-libs@windows:
-    - CORE_RL_MagickWand_.lib
-    - CORE_RL_MagickCore_.lib
-    - CORE_RL_coders_.lib
-    - CORE_RL_filters_.lib
-    - CORE_RL_aom_.lib
-    - CORE_RL_brotli_.lib
-    - CORE_RL_bzip2_.lib
-    - CORE_RL_cairo_.lib
-    - CORE_RL_croco_.lib
-    - CORE_RL_de265_.lib
-    - CORE_RL_exr_.lib
-    - CORE_RL_ffi_.lib
-    - CORE_RL_freetype_.lib
-    - CORE_RL_fribidi_.lib
-    - CORE_RL_gdk-pixbuf_.lib
-    - CORE_RL_glib_.lib
-    - CORE_RL_harfbuzz_.lib
-    - CORE_RL_heif_.lib
-    - CORE_RL_highway_.lib
-    - CORE_RL_imath_.lib
-    - CORE_RL_jpeg-turbo-12_.lib
-    - CORE_RL_jpeg-turbo-16_.lib
-    - CORE_RL_jpeg-turbo_.lib
-    - CORE_RL_jpeg-xl_.lib
-    - CORE_RL_lcms_.lib
-    - CORE_RL_lqr_.lib
-    - CORE_RL_lzma_.lib
-    - CORE_RL_openh264_.lib
-    - CORE_RL_openjpeg_.lib
-    - CORE_RL_openjph_.lib
-    - CORE_RL_pango_.lib
-    - CORE_RL_pixman_.lib
-    - CORE_RL_png_.lib
-    - CORE_RL_raqm_.lib
-    - CORE_RL_raw_.lib
-    - CORE_RL_rsvg_.lib
-    - CORE_RL_tiff_.lib
-    - CORE_RL_webp_.lib
-    - CORE_RL_xml_.lib
-    - CORE_RL_zip_.lib
-    - CORE_RL_zlib_.lib

config/pkg/lib/libiconv.yml

@@ -2,10 +2,6 @@ libiconv:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libiconv/'
-      regex: '/href="(?<file>libiconv-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/libiconv/'
       regex: '/href="(?<file>libiconv-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/lib/libssh2.yml

@@ -9,10 +9,8 @@ libssh2:
     metadata:
       license-files: [COPYING]
       license: BSD-3-Clause
-  depends@unix:
+  depends:
     - openssl
-  depends@windows:
-    - zlib
   headers:
     - libssh2.h
     - libssh2_publickey.h

config/pkg/lib/libunistring.yml

@@ -2,10 +2,6 @@ libunistring:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libunistring/'
-      regex: '/href="(?<file>libunistring-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/libunistring/'
       regex: '/href="(?<file>libunistring-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/lib/libzip.yml

@@ -11,10 +11,6 @@ libzip:
       license: BSD-3-Clause
   depends:
     - zlib
-  depends@windows:
-    - zlib
-    - bzip2
-    - xz
   suggests:
     - bzip2
     - xz

config/pkg/lib/openssl.yml

@@ -17,6 +17,7 @@ openssl:
     - zlib
   depends@windows:
     - zlib
+    - jom
   headers:
     - openssl
   static-libs@unix:
@@ -25,6 +26,3 @@ openssl:
   static-libs@windows:
     - libssl.lib
     - libcrypto.lib
-  tools@windows:
-    - jom
-    - strawberry-perl

config/pkg/lib/postgresql.yml

@@ -5,6 +5,8 @@ postgresql:
       type: ghtagtar
       repo: postgres/postgres
       match: REL_18_\d+
+    binary:
+      windows-x86_64: { type: url, url: 'https://get.enterprisedb.com/postgresql/postgresql-16.8-1-windows-x64-binaries.zip', extract: { lib/libpq.lib: '{build_root_path}/lib/libpq.lib', lib/libpgport.lib: '{build_root_path}/lib/libpgport.lib', lib/libpgcommon.lib: '{build_root_path}/lib/libpgcommon.lib', include/libpq-fe.h: '{build_root_path}/include/libpq-fe.h', include/postgres_ext.h: '{build_root_path}/include/postgres_ext.h', include/pg_config_ext.h: '{build_root_path}/include/pg_config_ext.h', include/libpq/libpq-fs.h: '{build_root_path}/include/libpq/libpq-fs.h' } }
     metadata:
       license-files: ['@/postgresql.txt']
       license: PostgreSQL
@@ -14,9 +16,6 @@ postgresql:
     - openssl
     - zlib
     - libedit
-  depends@windows:
-    - openssl
-    - zlib
   suggests@unix:
     - icu
     - libxslt

config/pkg/lib/readline.yml

@@ -2,10 +2,6 @@ readline:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/readline/'
-      regex: '/href="(?<file>readline-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/readline/'
       regex: '/href="(?<file>readline-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/target/frankenphp.yml

@@ -10,8 +10,10 @@ frankenphp:
       license: MIT
   depends:
     - php-embed
+    - go-xcaddy
   depends@windows:
     - php-embed
+    - go-win
     - pthreads4w
   suggests@unix:
     - brotli
@@ -22,7 +24,3 @@ frankenphp:
     - frankenphp
   static-bins@windows:
     - frankenphp.exe
-  tools:
-    - go-xcaddy
-  tools@windows:
-    - go-win

config/pkg/target/go-win.yml

@@ -1,5 +1,5 @@
 go-win:
-  type: tool
+  type: target
   artifact:
     binary: custom
   env:
@@ -8,8 +8,3 @@ go-win:
     GOPATH: '{pkg_root_path}/go-win/go'
   path@windows:
     - '{pkg_root_path}/go-win/bin'
-  tool:
-    provides:
-      - go.exe
-      - gofmt.exe
-    binary-subdir: go-win/bin

config/pkg/target/go-xcaddy.yml

@@ -1,5 +1,5 @@
 go-xcaddy:
-  type: tool
+  type: target
   artifact:
     binary: custom
   env:
@@ -8,8 +8,5 @@ go-xcaddy:
     GOPATH: '{pkg_root_path}/go-xcaddy/go'
   path@unix:
     - '{pkg_root_path}/go-xcaddy/bin'
-  tool:
+  static-bins:
-    provides:
+    - xcaddy
-      - go
-      - gofmt
-    binary-subdir: go-xcaddy/bin

config/pkg/target/jom.yml

@@ -1,11 +1,7 @@
 jom:
-  type: tool
+  type: target
   artifact:
     binary:
       windows-x86_64: { type: url, url: 'https://download.qt.io/official_releases/jom/jom.zip', extract: '{pkg_root_path}/jom' }
   path@windows:
     - '{pkg_root_path}\jom'
-  tool:
-    provides:
-      - jom.exe
-    binary-subdir: jom

config/pkg/target/llvm-compiler-rt.yml

@@ -0,0 +1,6 @@
+llvm-compiler-rt:
+  type: target
+  artifact:
+    binary: custom
+  depends:
+    - zig

config/pkg/target/llvm-tools.yml

@@ -0,0 +1,6 @@
+llvm-tools:
+  type: target
+  artifact:
+    binary: custom
+  depends:
+    - zig

config/pkg/target/msys2-build-essentials.yml

@@ -1,8 +0,0 @@
-msys2-build-essentials:
-  type: target
-  artifact:
-    binary: custom
-  env:
-    SPC_MSYS2_PATH: '{pkg_root_path}/msys2-build-essentials/msys64'
-  path@windows:
-    - '{pkg_root_path}/msys2-build-essentials/msys64/usr/bin'

config/pkg/target/nasm.yml

@@ -0,0 +1,5 @@
+nasm:
+  type: target
+  artifact:
+    binary:
+      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip', extract: { nasm.exe: '{php_sdk_path}/bin/nasm.exe', ndisasm.exe: '{php_sdk_path}/bin/ndisasm.exe' } }

config/pkg/target/php-sdk-binary-tools.yml

@@ -0,0 +1,5 @@
+php-sdk-binary-tools:
+  type: target
+  artifact:
+    binary:
+      windows-x86_64: { type: git, rev: master, url: 'https://github.com/php/php-sdk-binary-tools.git', extract: '{php_sdk_path}' }

config/pkg/target/pkg-config.yml

@@ -0,0 +1,9 @@
+pkg-config:
+  type: target
+  artifact:
+    source: 'https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz'
+    binary:
+      linux-x86_64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-x86_64-linux-musl-1.2.5.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
+      linux-aarch64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-aarch64-linux-musl-1.2.5.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
+      macos-x86_64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-x86_64-darwin.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
+      macos-aarch64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-aarch64-darwin.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }

config/pkg/target/protoc.yml

@@ -1,12 +1,8 @@
 protoc:
-  type: tool
+  type: target
   artifact:
     binary:
       linux-x86_64: { type: ghrel, repo: protocolbuffers/protobuf, match: 'protoc-([0-9.]+)-linux-x86_64\.zip', extract: '{pkg_root_path}/protoc' }
       linux-aarch64: { type: ghrel, repo: protocolbuffers/protobuf, match: 'protoc-([0-9.]+)-linux-aarch_64\.zip', extract: '{pkg_root_path}/protoc' }
   path:
     - '{pkg_root_path}/protoc/bin'
-  tool:
-    provides:
-      - protoc
-    binary-subdir: protoc/bin

config/pkg/target/strawberry-perl.yml

@@ -1,9 +1,5 @@
 strawberry-perl:
-  type: tool
+  type: target
   artifact:
     binary:
       windows-x86_64: { type: url, url: 'https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip', extract: '{pkg_root_path}/strawberry-perl' }
-  tool:
-    provides:
-      - perl.exe
-    binary-subdir: strawberry-perl/perl/bin

config/pkg/target/upx.yml

@@ -1,13 +1,7 @@
 upx:
-  type: tool
+  type: target
   artifact:
     binary:
       linux-x86_64: { type: ghrel, repo: upx/upx, match: upx.+-amd64_linux\.tar\.xz, extract: { upx: '{pkg_root_path}/bin/upx' } }
       linux-aarch64: { type: ghrel, repo: upx/upx, match: upx.+-arm64_linux\.tar\.xz, extract: { upx: '{pkg_root_path}/bin/upx' } }
       windows-x86_64: { type: ghrel, repo: upx/upx, match: upx.+-win64\.zip, extract: { upx.exe: '{pkg_root_path}/bin/upx.exe' } }
-  tool:
-    provides:
-      - upx
-    provides@windows:
-      - upx.exe
-    binary-subdir: bin

config/pkg/target/vswhere.yml

@@ -1,9 +1,5 @@
 vswhere:
-  type: tool
+  type: target
   artifact:
     binary:
       windows-x86_64: { type: url, url: 'https://github.com/microsoft/vswhere/releases/download/3.1.7/vswhere.exe', extract: '{pkg_root_path}/bin/vswhere.exe' }
-  tool:
-    provides:
-      - vswhere.exe
-    binary-subdir: bin

config/pkg/target/zig.yml

@@ -0,0 +1,4 @@
+zig:
+  type: target
+  artifact:
+    binary: custom

config/pkg/tool/7za-win.yml

@@ -1,9 +0,0 @@
-7za-win:
-  type: tool
-  artifact:
-    binary:
-      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/v3/tools/7zip/7za.exe', extract: '{pkg_root_path}/bin/7za.exe' }
-  tool:
-    provides:
-      - 7za.exe
-    binary-subdir: bin

config/pkg/tool/nasm.yml

@@ -1,10 +0,0 @@
-nasm:
-  type: tool
-  artifact:
-    binary:
-      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip', extract: { nasm.exe: '{pkg_root_path}/bin/nasm.exe', ndisasm.exe: '{pkg_root_path}/bin/ndisasm.exe' } }
-  tool:
-    provides:
-      - nasm.exe
-      - ndisasm.exe
-    binary-subdir: bin

config/pkg/tool/pkg-config.yml

@@ -1,13 +0,0 @@
-pkg-config:
-  type: tool
-  artifact:
-    source: 'https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz'
-    binary:
-      linux-x86_64: { type: ghrel, repo: static-php/hosted, match: pkg-config-x86_64-linux-musl-1.2.5.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
-      linux-aarch64: { type: ghrel, repo: static-php/hosted, match: pkg-config-aarch64-linux-musl-1.2.5.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
-      macos-x86_64: { type: ghrel, repo: static-php/hosted, match: pkg-config-x86_64-darwin.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
-      macos-aarch64: { type: ghrel, repo: static-php/hosted, match: pkg-config-aarch64-darwin.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
-  tool:
-    provides:
-      - pkg-config
-    binary-subdir: bin

config/pkg/tool/zig.yml

@@ -1,14 +0,0 @@
-zig:
-  type: tool
-  artifact:
-    binary: custom
-  tool:
-    provides:
-      - zig
-      - zig-cc
-      - zig-c++
-      - zig-ar
-      - zig-ld.lld
-      - zig-ranlib
-      - zig-objcopy
-    binary-subdir: zig

docs/en/develop/package-model.md

@@ -229,7 +229,7 @@ The following path placeholders are supported in string values of the `path`, `e
 | `{working_dir}` | Working directory (project root) |
 | `{download_path}` | Download cache directory (`downloads/`) |
 | `{source_path}` | Extracted source directory (`source/`) |
-| `{spc_msys2_path}` | MSYS2 root directory (`msys64/`) — Windows only |
+| `{php_sdk_path}` | Windows PHP SDK directory |
 
 ## target Package Type
 

docs/en/guide/migrate-from-v2.md

@@ -58,13 +58,7 @@ A single-file hook API for lightweight patches may be provided in a future relea
 
 ### Windows-only: `--with-sdk-binary-dir` and `--vs-ver`
 
-These options are no longer accepted on the command line. In v3, the `php-sdk-binary-tools` dependency has been completely removed. v3 now manages its own **MSYS2** environment to support autotools-based library builds on Windows. Run `spc doctor --install` to download and configure MSYS2 automatically.
+These options are no longer accepted on the command line. Instead, set the `PHP_SDK_PATH` environment variable to point to your PHP SDK binary tools directory. The Visual Studio version is now managed by the toolchain configuration.
-
-If you need to point to a custom MSYS2 installation, set the `SPC_MSYS2_PATH` environment variable to the `msys64` directory (e.g. `C:\msys64`). Visual Studio is now auto-detected by the toolchain — no manual version flag needed.
-
-::: warning Migrating from v2
-v2 relied on `php-sdk-binary-tools` and required `--with-sdk-binary-dir` and `--vs-ver` on every build invocation. In v3 these options are gone. Remove them from all CI scripts and run `spc doctor --install` once to set up the Windows build environment.
-:::
 
 ## Renamed / Deprecated Options
 

docs/zh/develop/package-model.md

@@ -223,7 +223,7 @@ openssl:
 | `{working_dir}` | 工作目录（项目根目录） |
 | `{download_path}` | 下载缓存目录（`downloads/`） |
 | `{source_path}` | 解压源码目录（`source/`） |
-| `{spc_msys2_path}` | MSYS2 根目录（`msys64/`）——仅 Windows |
+| `{php_sdk_path}` | Windows PHP SDK 目录 |
 
 ## target 包类型
 

docs/zh/guide/migrate-from-v2.md

@@ -58,13 +58,7 @@ curl -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-x86_64
 
 ### Windows 专有：`--with-sdk-binary-dir` 和 `--vs-ver`
 
-这两个选项已不再被命令行接受。在 v3 中，`php-sdk-binary-tools` 依赖已被完全移除。v3 现在通过管理自己的 **MSYS2** 环境来支持 Windows 上基于 autotools 的库构建。运行 `spc doctor --install` 即可自动下载并配置 MSYS2。
+这两个选项已不再被命令行接受。请改为设置 `PHP_SDK_PATH` 环境变量，指向你的 PHP SDK binary tools 目录。Visual Studio 版本现在由工具链配置统一管理。
-
-如需指向自定义 MSYS2 安装目录，请设置 `SPC_MSYS2_PATH` 环境变量，值为 `msys64` 目录路径（例如 `C:\msys64`）。Visual Studio 版本现在由工具链自动检测，无需手动指定版本号。
-
-::: warning 从 v2 迁移
-v2 依赖 `php-sdk-binary-tools`，并在每次构建时需要传入 `--with-sdk-binary-dir` 和 `--vs-ver` 参数。在 v3 中这些选项已被移除。请从所有 CI 脚本中删除这些参数，并使用 `spc doctor --install` 一次性完成 Windows 构建环境的配置。
-:::
 
 ## 已重命名 / 已弃用的选项
 

phpstan.neon

@@ -1,6 +1,6 @@
 parameters:
   reportUnmatchedIgnoredErrors: false
-  level: 5
+  level: 4
   phpVersion: 80400
   paths:
     - ./src/

spc.registry.yml

@@ -10,7 +10,6 @@ package:
     - config/pkg/lib/
     - config/pkg/target/
     - config/pkg/ext/
-    - config/pkg/tool/
 artifact:
   config:
     - config/artifact/

src/Package/Artifact/go_xcaddy.php

@@ -25,7 +25,6 @@ class go_xcaddy
     ])]
     public function downBinary(ArtifactDownloader $downloader): DownloadResult
     {
-        $pkgroot = PKG_ROOT_PATH;
         $name = SystemTarget::getCurrentPlatformString();
         $arch = match (explode('-', $name)[1]) {
             'x86_64' => 'amd64',
@@ -64,7 +63,7 @@ class go_xcaddy
         if ($file_hash !== $hash) {
             throw new DownloaderException("Hash mismatch for downloaded go-xcaddy binary. Expected {$hash}, got {$file_hash}");
         }
-        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: "{$pkgroot}/go-xcaddy", verified: true, version: $version);
+        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: '{pkg_root_path}/go-xcaddy', verified: true, version: $version);
     }
 
     #[CustomBinaryCheckUpdate('go-xcaddy', [
@@ -109,7 +108,7 @@ class go_xcaddy
             'GOROOT' => "{$target_path}",
             'GOBIN' => "{$target_path}/bin",
             'GOPATH' => "{$target_path}/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');
         GlobalEnvManager::addPathIfNotExists("{$target_path}/bin");
     }
 }

src/Package/Artifact/llvm_compiler_rt.php

@@ -0,0 +1,193 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Artifact;
+
+use StaticPHP\Artifact\ArtifactDownloader;
+use StaticPHP\Artifact\Downloader\DownloadResult;
+use StaticPHP\Artifact\Downloader\Type\CheckUpdateResult;
+use StaticPHP\Artifact\Downloader\Type\GitHubTokenSetupTrait;
+use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
+use StaticPHP\Attribute\Artifact\CustomBinary;
+use StaticPHP\Attribute\Artifact\CustomBinaryCheckUpdate;
+use StaticPHP\Exception\BuildFailureException;
+use StaticPHP\Exception\DownloaderException;
+use StaticPHP\Runtime\SystemTarget;
+
+/**
+ * Builds the compiler-rt bits zig ships without — libclang_rt.profile.a (PGO instrumentation)
+ * and clang_rt.crtbegin.o/crtend.o (__dso_handle for shared libs). Target-arch specific:
+ * libs land in PKG_ROOT_PATH/zig/lib/{triple}.
+ * Also builds libclang_rt.cpu_model.a (__cpu_model / __cpu_indicator_init, the libgcc-compatible
+ * globals that __builtin_cpu_supports()/__builtin_cpu_init() reference) for arches that have it.
+ */
+class llvm_compiler_rt
+{
+    use GitHubTokenSetupTrait;
+
+    #[CustomBinary('llvm-compiler-rt', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function downBinary(ArtifactDownloader $downloader): DownloadResult
+    {
+        $llvmVersion = $this->detectZigLlvmVersion()
+            ?? throw new DownloaderException('llvm-compiler-rt: could not detect bundled clang version from zig cc --version');
+        $tarball = "compiler-rt-{$llvmVersion}.src.tar.xz";
+        $url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-{$llvmVersion}/{$tarball}";
+        $tarballPath = DOWNLOAD_PATH . '/' . $tarball;
+        default_shell()->executeCurlDownload($url, $tarballPath, headers: $this->getGitHubTokenHeaders(), retries: $downloader->getRetry());
+        return DownloadResult::archive($tarball, ['url' => $url, 'version' => $llvmVersion], extract: '{source_path}/llvm-compiler-rt', verified: false, version: $llvmVersion);
+    }
+
+    #[CustomBinaryCheckUpdate('llvm-compiler-rt', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function checkUpdateBinary(?string $old_version, ArtifactDownloader $downloader): CheckUpdateResult
+    {
+        $llvmVersion = $this->detectZigLlvmVersion()
+            ?? throw new DownloaderException('llvm-compiler-rt: could not detect bundled clang version from zig cc --version');
+        return new CheckUpdateResult(
+            old: $old_version,
+            new: $llvmVersion,
+            needUpdate: $old_version === null || $llvmVersion !== $old_version,
+        );
+    }
+
+    #[AfterBinaryExtract('llvm-compiler-rt', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function postExtract(string $target_path): void
+    {
+        $this->buildForTriple($target_path);
+    }
+
+    public function buildForTriple(?string $sourceDir = null, ?string $triple = null): void
+    {
+        $sourceDir ??= SOURCE_PATH . '/llvm-compiler-rt';
+        $triple ??= SystemTarget::getCanonicalTriple();
+        $libDir = zig::path() . '/lib/' . $triple;
+        if ($this->isBuilt($libDir)) {
+            return;
+        }
+        if (!is_dir($sourceDir) || !is_dir("{$sourceDir}/lib/profile")) {
+            throw new BuildFailureException("llvm-compiler-rt: missing source at {$sourceDir} (extraction layout changed?)");
+        }
+        f_mkdir($libDir, recursive: true);
+        $profileLib = "{$libDir}/libclang_rt.profile.a";
+        $crtBegin = "{$libDir}/clang_rt.crtbegin.o";
+        $crtEnd = "{$libDir}/clang_rt.crtend.o";
+        if (!file_exists($profileLib)) {
+            $this->buildProfileRuntime($sourceDir, $profileLib, $triple);
+        }
+        if (!file_exists($crtBegin) || !file_exists($crtEnd)) {
+            $this->buildCrtObjects($sourceDir, $crtBegin, $crtEnd, $triple);
+        }
+        $cpuModelLib = "{$libDir}/libclang_rt.cpu_model.a";
+        if (self::cpuModelArch($triple) !== null && !file_exists($cpuModelLib)) {
+            $this->buildCpuModelBuiltins($sourceDir, $cpuModelLib, $triple);
+        }
+    }
+
+    public function isBuilt(string $libDir): bool
+    {
+        return file_exists("{$libDir}/libclang_rt.profile.a")
+            && file_exists("{$libDir}/clang_rt.crtbegin.o")
+            && file_exists("{$libDir}/clang_rt.crtend.o")
+            && (self::cpuModelArch(basename($libDir)) === null || file_exists("{$libDir}/libclang_rt.cpu_model.a"));
+    }
+
+    private function detectZigLlvmVersion(): ?string
+    {
+        if (!zig::isInstalled()) {
+            return null;
+        }
+        [$rc, $out] = shell()->execWithResult(escapeshellarg(zig::binary()) . ' cc --version', false);
+        if ($rc !== 0) {
+            return null;
+        }
+        return preg_match('/clang version (\d+\.\d+\.\d+)/', implode("\n", $out), $m) ? $m[1] : null;
+    }
+
+    private function buildProfileRuntime(string $srcRoot, string $libPath, string $triple): void
+    {
+        $profileSrc = "{$srcRoot}/lib/profile";
+        $profileInc = "{$srcRoot}/include";
+        // Skip OS-specific sources we can't satisfy without their SDKs.
+        $skip = ['/PlatformAIX', '/PlatformDarwin', '/PlatformFuchsia', '/PlatformOther', '/PlatformWindows', '/WindowsMMap'];
+        $sources = array_filter(
+            array_merge(glob("{$profileSrc}/*.c") ?: [], glob("{$profileSrc}/*.cpp") ?: []),
+            fn ($f) => !array_any($skip, fn ($s) => str_contains($f, $s)),
+        );
+
+        $objDir = "{$srcRoot}/obj-profile-{$triple}";
+        f_mkdir($objDir, recursive: true);
+        $cflags = "-target {$triple} -c -O2 -fPIC -fvisibility=hidden "
+            . '-I' . escapeshellarg($profileInc) . ' '
+            . '-DCOMPILER_RT_HAS_ATOMICS=1 -DCOMPILER_RT_HAS_FCNTL_LCK=1 -DCOMPILER_RT_HAS_UNAME=1';
+        $srcArgs = implode(' ', array_map('escapeshellarg', $sources));
+        shell()->cd($objDir)->exec("zig cc {$cflags} {$srcArgs}");
+        shell()->cd($objDir)->exec('zig ar rcs ' . escapeshellarg($libPath) . ' *.o');
+    }
+
+    private function buildCrtObjects(string $srcRoot, string $crtBegin, string $crtEnd, string $triple): void
+    {
+        $beginSrc = "{$srcRoot}/lib/builtins/crtbegin.c";
+        $endSrc = "{$srcRoot}/lib/builtins/crtend.c";
+        if (!is_file($beginSrc) || !is_file($endSrc)) {
+            throw new BuildFailureException("llvm-compiler-rt: crtbegin/crtend source missing under {$srcRoot}/lib/builtins");
+        }
+        $cflags = "-target {$triple} -c -O2 -fPIC -fvisibility=hidden -DCRT_HAS_INITFINI_ARRAY";
+        foreach ([[$beginSrc, $crtBegin], [$endSrc, $crtEnd]] as [$src, $dst]) {
+            shell()->exec("zig cc {$cflags} -o " . escapeshellarg($dst) . ' ' . escapeshellarg($src));
+        }
+    }
+
+    /**
+     * Build libclang_rt.cpu_model.a, provides
+     * the globals that __builtin_cpu_supports() reference.
+     */
+    private function buildCpuModelBuiltins(string $srcRoot, string $libPath, string $triple): void
+    {
+        $builtins = "{$srcRoot}/lib/builtins";
+        $family = self::cpuModelArch($triple);
+        $cpuModelDir = "{$builtins}/cpu_model";
+        if (is_dir($cpuModelDir)) {
+            $src = "{$cpuModelDir}/{$family}.c";
+            $includes = '-I' . escapeshellarg($builtins) . ' -I' . escapeshellarg($cpuModelDir);
+        } else {
+            $src = "{$builtins}/cpu_model.c";
+            $includes = '-I' . escapeshellarg($builtins);
+        }
+        if (!is_file($src)) {
+            throw new BuildFailureException("llvm-compiler-rt: cpu_model source not found for {$triple} under {$builtins}");
+        }
+
+        $objDir = "{$srcRoot}/obj-cpu-model-{$triple}";
+        f_mkdir($objDir, recursive: true);
+        $obj = "{$objDir}/cpu_model.o";
+        $cflags = "-target {$triple} -c -O2 -fPIC {$includes}";
+        shell()->exec('zig cc ' . $cflags . ' -o ' . escapeshellarg($obj) . ' ' . escapeshellarg($src));
+        shell()->exec('zig ar rcs ' . escapeshellarg($libPath) . ' ' . escapeshellarg($obj));
+    }
+
+    private static function cpuModelArch(string $triple): ?string
+    {
+        $arch = explode('-', $triple)[0];
+        return match (true) {
+            in_array($arch, ['x86_64', 'amd64', 'i386', 'i686', 'x86'], true) => 'x86',
+            in_array($arch, ['aarch64', 'arm64'], true) => 'aarch64',
+            str_starts_with($arch, 'riscv') => 'riscv',
+            default => null,
+        };
+    }
+}

src/Package/Artifact/llvm_tools.php

@@ -0,0 +1,149 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Artifact;
+
+use StaticPHP\Artifact\ArtifactDownloader;
+use StaticPHP\Artifact\Downloader\DownloadResult;
+use StaticPHP\Artifact\Downloader\Type\CheckUpdateResult;
+use StaticPHP\Artifact\Downloader\Type\GitHubTokenSetupTrait;
+use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
+use StaticPHP\Attribute\Artifact\CustomBinary;
+use StaticPHP\Attribute\Artifact\CustomBinaryCheckUpdate;
+use StaticPHP\DI\ApplicationContext;
+use StaticPHP\Exception\BuildFailureException;
+use StaticPHP\Exception\DownloaderException;
+use StaticPHP\Package\PackageBuilder;
+
+class llvm_tools
+{
+    use GitHubTokenSetupTrait;
+
+    public const array TOOLS = ['llvm-objcopy', 'llvm-strip', 'llvm-profdata'];
+
+    #[CustomBinary('llvm-tools', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function downBinary(ArtifactDownloader $downloader): DownloadResult
+    {
+        $llvmVersion = $this->detectLlvmVersion()
+            ?? throw new DownloaderException('Could not detect a clang version on host; install zig or clang first');
+        $tarball = "llvm-project-{$llvmVersion}.src.tar.xz";
+        $url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-{$llvmVersion}/{$tarball}";
+        $tarballPath = DOWNLOAD_PATH . '/' . $tarball;
+        default_shell()->executeCurlDownload($url, $tarballPath, headers: $this->getGitHubTokenHeaders(), retries: $downloader->getRetry());
+        return DownloadResult::archive($tarball, ['url' => $url, 'version' => $llvmVersion], extract: '{source_path}/llvm-tools', verified: false, version: $llvmVersion);
+    }
+
+    #[CustomBinaryCheckUpdate('llvm-tools', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function checkUpdateBinary(?string $old_version, ArtifactDownloader $downloader): CheckUpdateResult
+    {
+        $llvmVersion = $this->detectLlvmVersion()
+            ?? throw new DownloaderException('Could not detect a clang version on host; install zig or clang first');
+        return new CheckUpdateResult(
+            old: $old_version,
+            new: $llvmVersion,
+            needUpdate: $old_version === null || $llvmVersion !== $old_version,
+        );
+    }
+
+    #[AfterBinaryExtract('llvm-tools', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function postExtract(string $target_path): void
+    {
+        $this->buildForHost($target_path);
+    }
+
+    public function buildForHost(?string $sourceRoot = null): void
+    {
+        $sourceRoot ??= SOURCE_PATH . '/llvm-tools';
+        $binDir = PKG_ROOT_PATH . '/llvm-tools/bin';
+        if ($this->allBuilt($binDir)) {
+            return;
+        }
+        $llvmDir = "{$sourceRoot}/llvm";
+        if (!is_dir($llvmDir)) {
+            throw new BuildFailureException("llvm-tools: missing source at {$llvmDir} (extraction layout changed?)");
+        }
+        $buildDir = "{$sourceRoot}/build";
+        $installDir = PKG_ROOT_PATH . '/llvm-tools';
+        f_mkdir($buildDir, recursive: true);
+        f_mkdir($binDir, recursive: true);
+
+        $cmakeArgs = implode(' ', array_map('escapeshellarg', [
+            '-S', $llvmDir,
+            '-B', $buildDir,
+            '-DCMAKE_BUILD_TYPE=Release',
+            '-DLLVM_ENABLE_PROJECTS=',
+            '-DLLVM_TARGETS_TO_BUILD=',
+            '-DLLVM_INCLUDE_BENCHMARKS=OFF',
+            '-DLLVM_INCLUDE_TESTS=OFF',
+            '-DLLVM_INCLUDE_EXAMPLES=OFF',
+            '-DLLVM_INCLUDE_DOCS=OFF',
+            '-DLLVM_ENABLE_ZLIB=OFF',
+            '-DLLVM_ENABLE_ZSTD=OFF',
+            '-DLLVM_ENABLE_LIBXML2=OFF',
+            '-DLLVM_ENABLE_TERMINFO=OFF',
+            '-DLLVM_ENABLE_LIBEDIT=OFF',
+            '-DLLVM_ENABLE_LIBPFM=OFF',
+            '-DLLVM_BUILD_LLVM_DYLIB=OFF',
+            '-DLLVM_LINK_LLVM_DYLIB=OFF',
+            '-DBUILD_SHARED_LIBS=OFF',
+            '-DCMAKE_C_COMPILER=' . zig::binary('zig-cc'),
+            '-DCMAKE_CXX_COMPILER=' . zig::binary('zig-c++'),
+            '-DCMAKE_INSTALL_PREFIX=' . $installDir,
+        ]));
+        $jobs = ApplicationContext::get(PackageBuilder::class)->concurrency;
+        $targetArgs = implode(' ', array_map(fn ($t) => '--target ' . escapeshellarg($t), self::TOOLS));
+
+        shell()
+            ->setEnv(['SPC_TARGET' => GNU_ARCH . '-linux-musl'])
+            ->exec('cmake ' . $cmakeArgs)
+            ->exec('cmake --build ' . escapeshellarg($buildDir) . ' ' . $targetArgs . " -j {$jobs}");
+
+        foreach (self::TOOLS as $t) {
+            $built = "{$buildDir}/bin/{$t}";
+            if (!is_file($built)) {
+                throw new BuildFailureException("llvm-tools: missing build output {$built}");
+            }
+            copy($built, "{$binDir}/{$t}");
+            chmod("{$binDir}/{$t}", 0755);
+        }
+    }
+
+    public function allBuilt(string $binDir): bool
+    {
+        foreach (self::TOOLS as $t) {
+            $p = "{$binDir}/{$t}";
+            if (!is_file($p) || !is_executable($p)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private function detectLlvmVersion(): ?string
+    {
+        if (!zig::isInstalled()) {
+            return null;
+        }
+        [$rc, $out] = shell()->execWithResult(escapeshellarg(zig::binary()) . ' cc --version', false);
+        if ($rc !== 0) {
+            return null;
+        }
+        return preg_match('/clang version (\d+\.\d+\.\d+)/', implode("\n", $out), $m) ? $m[1] : null;
+    }
+}

src/Package/Artifact/msys2_build_essentials.php

@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Artifact;
-
-use StaticPHP\Artifact\ArtifactDownloader;
-use StaticPHP\Artifact\Downloader\DownloadResult;
-use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
-use StaticPHP\Attribute\Artifact\BinaryExtract;
-use StaticPHP\Attribute\Artifact\CustomBinary;
-use StaticPHP\Exception\DownloaderException;
-use StaticPHP\Util\FileSystem;
-use StaticPHP\Util\GlobalEnvManager;
-
-class msys2_build_essentials
-{
-    // MSYS subsystem packages required for autotools-based builds.
-    private const REQUIRED_PACKAGES = ['make', 'autoconf', 'automake', 'libtool', 'pkgconf', 'perl', 'bison', 're2c'];
-
-    #[CustomBinary('msys2-build-essentials', ['windows-x86_64'])]
-    public function downBinary(ArtifactDownloader $downloader): DownloadResult
-    {
-        // MSYS2 nightly self-extracting archive; running it with `-y -oTARGET` extracts to TARGET\msys64\.
-        $url = 'https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-base-x86_64-latest.sfx.exe';
-        $filename = 'msys2-base-x86_64-latest.sfx.exe';
-        $path = DOWNLOAD_PATH . DIRECTORY_SEPARATOR . $filename;
-
-        default_shell()->executeCurlDownload($url, $path, retries: $downloader->getRetry());
-
-        return DownloadResult::file(
-            $filename,
-            ['url' => $url, 'version' => 'nightly'],
-            version: 'nightly',
-            extract: '{pkg_root_path}/msys2-build-essentials',
-        );
-    }
-
-    #[BinaryExtract('msys2-build-essentials', ['windows-x86_64'])]
-    public function extractBinary(string $source_file, string $target_path): void
-    {
-        $target_path = FileSystem::convertPath($target_path);
-        $source_file = FileSystem::convertPath($source_file);
-
-        // Guard: skip re-extraction if already initialized (marker written at end of this method).
-        $marker = "{$target_path}\\.spc-msys2-initialized";
-        if (file_exists($marker)) {
-            return;
-        }
-
-        if (!is_dir($target_path)) {
-            FileSystem::createDir($target_path);
-        }
-
-        cmd()->exec("\"{$source_file}\" -y -o\"{$target_path}\"");
-
-        $msys2_bin = "{$target_path}\\msys64\\usr\\bin";
-        if (!file_exists("{$msys2_bin}\\bash.exe")) {
-            throw new DownloaderException("MSYS2 extraction failed: bash.exe not found at {$msys2_bin}\\bash.exe");
-        }
-
-        // Add MSYS2 usr\bin to PATH so pacman.exe can load msys-2.0.dll.
-        GlobalEnvManager::addPathIfNotExists($msys2_bin);
-        GlobalEnvManager::putenv('CHERE_INVOKING=yes');
-        GlobalEnvManager::putenv('MSYSTEM=MSYS');
-
-        // Disable PGP signature checking: pacman-key --init requires a pseudo-TTY which is unavailable
-        // from PHP. Patching pacman.conf is the standard approach for CI pipelines.
-        $pacman_conf = "{$target_path}\\msys64\\etc\\pacman.conf";
-        FileSystem::replaceFileRegex($pacman_conf, '/^SigLevel\s*=.*$/m', 'SigLevel = Never');
-
-        $pacman = "{$target_path}\\msys64\\usr\\bin\\pacman.exe";
-
-        // Two-pass update as recommended by MSYS2 CI docs.
-        cmd()->exec("\"{$pacman}\" --noconfirm -Syuu");
-        cmd()->exec("\"{$pacman}\" --noconfirm -Syuu");
-
-        $pkgs = implode(' ', self::REQUIRED_PACKAGES);
-        cmd()->exec("\"{$pacman}\" --noconfirm -S --needed {$pkgs}");
-
-        FileSystem::writeFile($marker, date('Y-m-d H:i:s'));
-    }
-
-    #[AfterBinaryExtract('msys2-build-essentials', ['windows-x86_64'])]
-    public function afterExtract(string $target_path): void
-    {
-        $target_path = FileSystem::convertPath($target_path);
-        $msys2_root = "{$target_path}\\msys64";
-
-        GlobalEnvManager::putenv("SPC_MSYS2_PATH={$msys2_root}");
-        GlobalEnvManager::addPathIfNotExists("{$msys2_root}\\usr\\bin");
-    }
-}

src/Package/Artifact/zig.php

@@ -15,6 +15,23 @@ use StaticPHP\Runtime\SystemTarget;
 
 class zig
 {
+    /** Directory zig extracts into. */
+    public static function path(): string
+    {
+        return PKG_ROOT_PATH . '/zig';
+    }
+
+    /** Path to a binary inside the zig install dir (zig, zig-cc, zig-c++, zig-ar, …). */
+    public static function binary(string $name = 'zig'): string
+    {
+        return self::path() . '/' . $name;
+    }
+
+    public static function isInstalled(): bool
+    {
+        return is_file(self::binary());
+    }
+
     #[CustomBinary('zig', [
         'linux-x86_64',
         'linux-aarch64',
@@ -61,7 +78,7 @@ class zig
         if ($file_hash !== $sha256) {
             throw new DownloaderException("Hash mismatch for downloaded Zig binary. Expected {$sha256}, got {$file_hash}");
         }
-        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $latest_version], extract: PKG_ROOT_PATH . '/zig', verified: true, version: $latest_version);
+        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $latest_version], extract: '{pkg_root_path}/zig', verified: true, version: $latest_version);
     }
 
     #[CustomBinaryCheckUpdate('zig', [
@@ -110,10 +127,7 @@ class zig
                 break;
             }
         }
-        if ($all_exist) {
+        if (!$all_exist) {
-            return;
-        }
-
             $script_path = ROOT_DIR . '/src/globals/scripts/zig-cc.sh';
             $script_content = file_get_contents($script_path);
 
@@ -132,4 +146,5 @@ class zig
             chmod("{$target_path}/zig-ranlib", 0755);
             chmod("{$target_path}/zig-objcopy", 0755);
         }
+    }
 }

src/Package/Extension/curl.php

@@ -20,7 +20,7 @@ class curl
         // which requires secur32.lib for SSL/TLS functions (SslEncryptPackage, etc.).
         $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
         if (!str_contains($extra_libs, 'secur32.lib')) {
-            putenv('SPC_EXTRA_LIBS=' . trim("{$extra_libs} secur32.lib"));
+            putenv('SPC_EXTRA_LIBS=' . trim($extra_libs . ' secur32.lib'));
         }
     }
 }

src/Package/Extension/gmssl.php

@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Extension;
-
-use Package\Target\php;
-use StaticPHP\Attribute\Package\BeforeStage;
-use StaticPHP\Attribute\Package\Extension;
-use StaticPHP\Attribute\PatchDescription;
-use StaticPHP\Package\PhpExtensionPackage;
-use StaticPHP\Util\FileSystem;
-
-#[Extension('gmssl')]
-class gmssl extends PhpExtensionPackage
-{
-    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-gmssl')]
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Fix ext-gmssl v1.1.1 compatibility with GmSSL >= 3.1.0 where SM2_VERIFY_CTX was removed (unified into SM2_SIGN_CTX)')]
-    public function patchSm2VerifyCtx(): void
-    {
-        // See: https://github.com/crazywhalecc/static-php-cli/issues/1182
-        FileSystem::replaceFileStr(
-            "{$this->getSourceDir()}/gmssl.c",
-            'SM2_VERIFY_CTX',
-            'SM2_SIGN_CTX'
-        );
-    }
-
-    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-gmssl')]
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Fix ext-gmssl v1.1.1: pbkdf2_hmac_sm3_genkey was renamed to sm3_pbkdf2 in GmSSL >= 3.2.0')]
-    public function patchPbkdf2Rename(): void
-    {
-        FileSystem::replaceFileStr(
-            "{$this->getSourceDir()}/gmssl.c",
-            'pbkdf2_hmac_sm3_genkey',
-            'sm3_pbkdf2'
-        );
-    }
-
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Add CHECK_LIB to config.w32 for static Windows builds')]
-    public function patchBeforeBuildconfWin(): bool
-    {
-        $configW32 = "{$this->getSourceDir()}/config.w32";
-        if (str_contains(FileSystem::readFile($configW32), 'CHECK_LIB(')) {
-            return false;
-        }
-        FileSystem::replaceFileStr(
-            $configW32,
-            'AC_DEFINE(',
-            'CHECK_LIB("gmssl.lib", "gmssl", PHP_GMSSL);' . PHP_EOL . 'AC_DEFINE('
-        );
-        return true;
-    }
-}

src/Package/Extension/imagick.php

@@ -4,17 +4,12 @@ declare(strict_types=1);
 
 namespace Package\Extension;
 
-use Package\Target\php;
-use StaticPHP\Attribute\Package\BeforeStage;
 use StaticPHP\Attribute\Package\CustomPhpConfigureArg;
 use StaticPHP\Attribute\Package\Extension;
-use StaticPHP\Attribute\PatchDescription;
 use StaticPHP\Package\PackageBuilder;
-use StaticPHP\Package\PhpExtensionPackage;
-use StaticPHP\Util\FileSystem;
 
 #[Extension('imagick')]
-class imagick extends PhpExtensionPackage
+class imagick
 {
     #[CustomPhpConfigureArg('Darwin')]
     #[CustomPhpConfigureArg('Linux')]
@@ -23,35 +18,4 @@ class imagick extends PhpExtensionPackage
         $disable_omp = ' ac_cv_func_omp_pause_resource_all=no';
         return '--with-imagick=' . ($shared ? 'shared,' : '') . $builder->getBuildRootPath() . $disable_omp;
     }
-
-    #[CustomPhpConfigureArg('Windows')]
-    public function getWindowsConfigureArg(bool $shared): string
-    {
-        // config.w32 uses PHP_IMAGICK as an extra search path for CORE_RL_*.lib; the static
-        // ImageMagick libs are installed flat in buildroot/lib (headers in buildroot/include/imagemagick).
-        return '--with-imagick=' . BUILD_LIB_PATH;
-    }
-
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-imagick')]
-    #[PatchDescription('Add the Win32 system libraries the static ImageMagick stack needs')]
-    public function patchConfigW32ForWindows(): void
-    {
-        $config = $this->getSourceDir() . '/config.w32';
-
-        // Idempotency guard (the source dir may be patched in place and reused across builds).
-        if (str_contains(FileSystem::readFile($config), 'LIBS_IMAGICK')) {
-            return;
-        }
-
-        // The static ImageMagick stack needs several Win32 system libraries (GDI/GDI+, WIC, urlmon, ...)
-        // that aren't already pulled in by the other extensions. (imagick itself builds as plain C:
-        // ImageMagick is built with a 32-bit channel mask, see imagemagick.php buildWin, so the
-        // MagickCore headers don't require a C++ translation unit.)
-        FileSystem::replaceFileStr(
-            $config,
-            "AC_DEFINE('HAVE_IMAGICK', 1);",
-            'ADD_FLAG("LIBS_IMAGICK", "gdi32.lib gdiplus.lib urlmon.lib msimg32.lib oleaut32.lib windowscodecs.lib iphlpapi.lib");' . "\n\t\t" .
-            "AC_DEFINE('HAVE_IMAGICK', 1);"
-        );
-    }
 }

src/Package/Extension/pdo_sqlite.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Extension;
+
+use Package\Target\php;
+use StaticPHP\Attribute\Package\BeforeStage;
+use StaticPHP\Attribute\Package\Extension;
+use StaticPHP\Package\PackageInstaller;
+use StaticPHP\Util\FileSystem;
+
+#[Extension('pdo_sqlite')]
+class pdo_sqlite
+{
+    #[BeforeStage('php', [php::class, 'configureForUnix'], 'ext-pdo_sqlite')]
+    public function patchBeforeConfigure(PackageInstaller $installer): void
+    {
+        FileSystem::replaceFileRegex(
+            "{$installer->getTargetPackage('php')->getSourceDir()}/configure",
+            '/sqlite3_column_table_name=yes/',
+            'sqlite3_column_table_name=no'
+        );
+    }
+}

src/Package/Extension/simdjson.php

@@ -50,9 +50,8 @@ class simdjson extends PhpExtensionPackage
             if (!str_contains((string) $extra, '-lstdc++')) {
                 f_putenv('SPC_COMPILER_EXTRA=' . clean_spaces($extra . ' -lstdc++'));
             }
-
+            $env['CFLAGS'] .= ' -Xclang -target-feature -Xclang +evex512';
-            $env['CFLAGS'] .= ' -fno-sanitize=undefined -Xclang -target-feature -Xclang +evex512';
+            $env['CXXFLAGS'] .= ' -Xclang -target-feature -Xclang +evex512';
-            $env['CXXFLAGS'] .= ' -fno-sanitize=undefined -Xclang -target-feature -Xclang +evex512';
         }
         return $env;
     }
@@ -64,8 +63,8 @@ class simdjson extends PhpExtensionPackage
             return;
         }
         $extra_cflags = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') ?: '';
-        GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . trim($extra_cflags . ' -fno-sanitize=undefined -Xclang -target-feature -Xclang +evex512'));
+        GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . trim($extra_cflags . ' -Xclang -target-feature -Xclang +evex512'));
         $extra_cxxflags = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS') ?: '';
-        GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS=' . trim($extra_cxxflags . ' -fno-sanitize=undefined -Xclang -target-feature -Xclang +evex512'));
+        GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS=' . trim($extra_cxxflags . ' -Xclang -target-feature -Xclang +evex512'));
     }
 }

src/Package/Extension/swoole.php

@@ -30,7 +30,6 @@ class swoole extends PhpExtensionPackage
         if ($installer->getPhpExtensionPackage('swoole-hook-odbc') && $installer->getPhpExtensionPackage('pdo_odbc')?->isBuildStatic()) {
             throw new WrongUsageException('swoole-hook-odbc provides pdo_odbc, if you enable odbc hook for swoole, you must remove pdo_odbc extension.');
         }
-
         // swoole-hook-pgsql conflicts with pdo_pgsql
         if ($installer->getPhpExtensionPackage('swoole-hook-pgsql') && $installer->getPhpExtensionPackage('pdo_pgsql')?->isBuildStatic()) {
             throw new WrongUsageException('swoole-hook-pgsql provides pdo_pgsql, if you enable pgsql hook for swoole, you must remove pdo_pgsql extension.');

src/Package/Extension/xlswriter.php

@@ -11,6 +11,7 @@ use StaticPHP\Attribute\Package\Extension;
 use StaticPHP\Attribute\PatchDescription;
 use StaticPHP\Package\PackageInstaller;
 use StaticPHP\Package\PhpExtensionPackage;
+use StaticPHP\Util\GlobalEnvManager;
 use StaticPHP\Util\SourcePatcher;
 
 #[Extension('xlswriter')]
@@ -20,27 +21,37 @@ class xlswriter extends PhpExtensionPackage
     #[CustomPhpConfigureArg('Linux')]
     public function getUnixConfigureArg(bool $shared, PackageInstaller $installer): string
     {
-        $shared = $shared ? '=shared' : '';
+        $arg = '--with-xlswriter --enable-reader';
-        $arg = "--with-xlswriter{$shared} --enable-reader";
         if ($installer->getLibraryPackage('openssl')) {
             $arg .= ' --with-openssl=' . $installer->getLibraryPackage('openssl')->getBuildRootPath();
         }
         return $arg;
     }
 
+    #[BeforeStage('php', [php::class, 'makeForUnix'], 'ext-xlswriter')]
+    #[PatchDescription('Fix Unix build: add -std=gnu17 to CFLAGS to fix build errors on older GCC versions')]
+    public function patchBeforeUnixMake(): void
+    {
+        GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');
+    }
+
     #[BeforeStage('php', [php::class, 'makeForWindows'], 'ext-xlswriter')]
     #[PatchDescription('Fix Windows build: apply win32 patch and add UTF-8 BOM to theme.c')]
     public function patchBeforeMakeForWindows(): void
     {
-        $source_dir = $this->getSourceDir();
-        $theme_file = "{$source_dir}/library/libxlsx/src/theme.c";
-
         // fix windows build with openssl extension duplicate symbol bug
-        SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $source_dir);
+        SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $this->getSourceDir());
-        $content = file_get_contents($theme_file);
+        $content = file_get_contents($this->getSourceDir() . '/library/libxlsxwriter/src/theme.c');
         $bom = pack('CCC', 0xEF, 0xBB, 0xBF);
         if (!str_starts_with($content, $bom)) {
-            file_put_contents($theme_file, $bom . $content);
+            file_put_contents($this->getSourceDir() . '/library/libxlsxwriter/src/theme.c', $bom . $content);
         }
     }
+
+    public function getSharedExtensionEnv(): array
+    {
+        $parent = parent::getSharedExtensionEnv();
+        $parent['CFLAGS'] .= ' -std=gnu17';
+        return $parent;
+    }
 }

src/Package/Library/bzip2.php

@@ -17,7 +17,9 @@ class bzip2
     #[PatchBeforeBuild]
     public function patchBeforeBuild(LibraryPackage $lib): void
     {
-        FileSystem::replaceFileStr($lib->getSourceDir() . '/Makefile', 'CFLAGS=-Wall', 'CFLAGS=-fPIC -Wall');
+        // Makefile pins -O2 -fPIC; inject SPC_DEFAULT_CFLAGS
+        $extra = deduplicate_flags(trim((string) getenv('SPC_DEFAULT_CFLAGS')) . ' -fPIC -Wall');
+        FileSystem::replaceFileStr($lib->getSourceDir() . '/Makefile', 'CFLAGS=-Wall', "CFLAGS={$extra}");
     }
 
     #[BuildFor('Windows')]

src/Package/Library/fastlz.php

@@ -18,9 +18,11 @@ class fastlz
     {
         $cc = getenv('CC') ?: 'cc';
         $ar = getenv('AR') ?: 'ar';
+        $extra = trim((string) getenv('SPC_DEFAULT_CFLAGS'));
+        $extra = $extra !== '' ? $extra . ' -fPIC' : '-O3 -fPIC';
 
         shell()->cd($lib->getSourceDir())->initializeEnv($lib)
-            ->exec("{$cc} -c -O3 -fPIC fastlz.c -o fastlz.o")
+            ->exec("{$cc} -c {$extra} fastlz.c -o fastlz.o")
             ->exec("{$ar} rcs libfastlz.a fastlz.o");
 
         // Copy header file

src/Package/Library/gettext_win.php

@@ -22,7 +22,6 @@ class gettext_win
     {
         $ver = WindowsUtil::findVisualStudio();
         $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the VS2022 (MSVC17) solution, which msbuild builds via forward compatibility.
             '17' => '\MSVC17',
             '16' => '\MSVC16',
             default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),
@@ -45,9 +44,7 @@ class gettext_win
     {
         $vs_ver_dir = ApplicationContext::get('gettext_win_vs_ver_dir');
         cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}\\libintl_static")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            ->exec('msbuild libintl_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0');
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libintl_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0 /p:WholeProgramOptimization=false');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
         // libintl_a.lib is the static library output; copy as libintl.lib for linker compatibility

src/Package/Library/gmssl.php

@@ -18,9 +18,7 @@ class gmssl
     #[BuildFor('Darwin')]
     public function build(LibraryPackage $lib): void
     {
-        UnixCMakeExecutor::create($lib)
+        UnixCMakeExecutor::create($lib)->build();
-            ->addConfigureArgs('-DENABLE_SM2_PRIVATE_KEY_EXPORT=ON')
-            ->build();
     }
 
     #[BuildFor('Windows')]
@@ -35,7 +33,6 @@ class gmssl
                 '-G "NMake Makefiles"',
                 '-DWIN32=ON',
                 '-DBUILD_SHARED_LIBS=OFF',
-                '-DENABLE_SM2_PRIVATE_KEY_EXPORT=ON',
                 '-DCMAKE_BUILD_TYPE=Release',
                 '-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"',
                 '-DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"',
@@ -45,13 +42,13 @@ class gmssl
             ->toStep(1)
             ->build();
 
-        cmd()->cd($buildDir)->exec('nmake gmssl XCFLAGS=/MT');
+        // fix cmake_install.cmake install prefix (GmSSL overrides it internally)
+        $installCmake = "{$buildDir}\\cmake_install.cmake";
+        FileSystem::writeFile(
+            $installCmake,
+            'set(CMAKE_INSTALL_PREFIX "' . str_replace('\\', '/', $lib->getBuildRootPath()) . '")' . PHP_EOL . FileSystem::readFile($installCmake)
+        );
 
-        $libPath = "{$lib->getBuildRootPath()}/lib";
+        cmd()->cd($buildDir)->exec('nmake install XCFLAGS=/MT');
-        $incPath = "{$lib->getBuildRootPath()}/include/gmssl";
-        FileSystem::createDir($libPath);
-        FileSystem::createDir($incPath);
-        FileSystem::copy("{$buildDir}\\bin\\gmssl.lib", "{$libPath}/gmssl.lib");
-        FileSystem::copyDir("{$lib->getSourceDir()}\\include\\gmssl", $incPath);
     }
 }

src/Package/Library/icu.php

@@ -24,9 +24,12 @@ class icu
     #[BuildFor('Linux')]
     public function buildLinux(LibraryPackage $lib, ToolchainInterface $toolchain, PackageBuilder $builder): void
     {
+        // runConfigureICU bakes CXXFLAGS/LDFLAGS, apply user flags too
+        $userCxxFlags = trim((string) getenv('SPC_DEFAULT_CXXFLAGS'));
+        $userLdFlags = trim((string) getenv('SPC_DEFAULT_LDFLAGS'));
         $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"';
+        $cxxflags = "CXXFLAGS=\"-std=c++17 -DPIC -fPIC -fno-ident {$userCxxFlags}\"";
-        $ldflags = $toolchain->isStatic() ? 'LDFLAGS="-static"' : '';
+        $ldflags = $toolchain->isStatic() ? "LDFLAGS=\"-static {$userLdFlags}\"" : "LDFLAGS=\"{$userLdFlags}\"";
         shell()->cd($lib->getSourceDir() . '/source')->initializeEnv($lib)
             ->exec(
                 "{$cppflags} {$cxxflags} {$ldflags} " .

src/Package/Library/imagemagick.php

@@ -6,86 +6,15 @@ namespace Package\Library;
 
 use StaticPHP\Attribute\Package\BuildFor;
 use StaticPHP\Attribute\Package\Library;
-use StaticPHP\Exception\EnvironmentException;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
 use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Toolchain\Interface\ToolchainInterface;
 use StaticPHP\Util\FileSystem;
-use StaticPHP\Util\System\WindowsUtil;
 
 #[Library('imagemagick')]
 class imagemagick
 {
-    /**
-     * Build a fully static, self-contained ImageMagick 7 (Q16-HDRI, /MT) on Windows using the
-     * official VisualMagick build (the ImageMagick/Windows + Configure + Dependencies repos), which
-     * bundles every delegate. ImageMagick has no autoconf/CMake build on Windows, so this clones the
-     * VisualMagick tree, generates a static x64 solution via the Configure tool, and builds it with
-     * msbuild. The resulting CORE_RL_*.lib static libraries + MagickWand/MagickCore headers are
-     * installed into the build root for ext-imagick to link.
-     *
-     * A short working directory is used (VisualMagick's tree is deeply nested and otherwise exceeds
-     * MAX_PATH); override with SPC_IMAGEMAGICK_BUILD_DIR.
-     */
-    #[BuildFor('Windows')]
-    public function buildWin(LibraryPackage $lib): void
-    {
-        $work = getenv('SPC_IMAGEMAGICK_BUILD_DIR') ?: 'C:\im';
-        $configure_release = '2026.05.30.2033';
-        $configure_url = "https://github.com/ImageMagick/Configure/releases/download/{$configure_release}/Configure.Release.x64.exe";
-
-        FileSystem::createDir($work);
-        // Clone the VisualMagick repos (ImageMagick source + Configure + Dependencies + all delegates).
-        if (!is_dir("{$work}\\ImageMagick")) {
-            cmd()->cd($work)->exec(SPC_GIT_EXEC . ' clone --depth 1 https://github.com/ImageMagick/Windows.git .');
-            cmd()->cd($work)->exec('bash clone-repositories.sh --imagemagick7');
-        }
-        // Use the prebuilt Configure tool (building it from source needs the MFC components).
-        default_shell()->executeCurlDownload($configure_url, "{$work}\\Configure\\Configure.Release.x64.exe", retries: 2);
-
-        // Generate a static, /MT (linkRuntime), x64, Q16-HDRI solution with the configs embedded
-        // (zeroConfigurationSupport) and OpenMP off (no vcomp runtime dependency).
-        $ver = WindowsUtil::findVisualStudio();
-        $vs_major = is_array($ver) ? $ver['major_version'] : 'unknown';
-        $vs_arg = match ($vs_major) {
-            '18',
-            '17' => '/VS2022',
-            '16' => '/VS2019',
-            default => throw new EnvironmentException("Current VS version {$vs_major} is not supported yet!"),
-        };
-        cmd()->cd("{$work}\\Configure")
-            ->exec("Configure.Release.x64.exe /noWizard {$vs_arg} /x64 /static /linkRuntime /noOpenMP /zeroConfigurationSupport");
-
-        // x64 IM7 defaults to a 64-bit channel mask, whose magick-baseconfig.h #errors unless the
-        // consuming translation unit is C++. ext-imagick is plain C, so force a 32-bit channel mask
-        // (ample: 32 channels >> RGBA/CMYK) before building, keeping libs and the installed header in sync.
-        FileSystem::replaceFileStr(
-            "{$work}\\ImageMagick\\MagickCore\\magick-baseconfig.h",
-            '#define MAGICKCORE_CHANNEL_MASK_DEPTH 64',
-            '#define MAGICKCORE_CHANNEL_MASK_DEPTH 32'
-        );
-
-        cmd()->cd($work)
-            ->exec('msbuild IM7.Static.x64.sln /m /t:Rebuild /nologo /p:Configuration=Release /p:Platform=x64');
-
-        $artifacts = "{$work}\\Artifacts\\lib";
-        if (!is_dir($artifacts)) {
-            throw new EnvironmentException('ImageMagick VisualMagick build produced no Artifacts/lib; build failed.');
-        }
-        // Install the static libs (flat, onto the build-root lib path) and the public headers.
-        FileSystem::createDir($lib->getLibDir());
-        foreach (glob("{$artifacts}\\CORE_RL_*.lib") as $f) {
-            FileSystem::copy($f, $lib->getLibDir() . '\\' . basename($f));
-        }
-        foreach (['MagickWand', 'MagickCore'] as $dir) {
-            FileSystem::createDir($lib->getIncludeDir() . "\\imagemagick\\{$dir}");
-            foreach (glob("{$work}\\ImageMagick\\{$dir}\\*.h") as $h) {
-                FileSystem::copy($h, $lib->getIncludeDir() . "\\imagemagick\\{$dir}\\" . basename($h));
-            }
-        }
-    }
-
     #[BuildFor('Darwin')]
     #[BuildFor('Linux')]
     public function buildUnix(LibraryPackage $lib, ToolchainInterface $toolchain): void

src/Package/Library/jbig.php

@@ -17,7 +17,9 @@ class jbig
     #[PatchBeforeBuild]
     public function patchBeforeBuild(LibraryPackage $lib): void
     {
-        FileSystem::replaceFileStr($lib->getSourceDir() . '/Makefile', 'CFLAGS = -O2 -W -Wno-unused-result', 'CFLAGS = -O2 -W -Wno-unused-result -fPIC');
+        $extra = trim((string) getenv('SPC_DEFAULT_CFLAGS'));
+        $cflags = ($extra !== '' ? $extra : '-O2') . ' -W -Wno-unused-result -fPIC';
+        FileSystem::replaceFileStr($lib->getSourceDir() . '/Makefile', 'CFLAGS = -O2 -W -Wno-unused-result', "CFLAGS = {$cflags}");
     }
 
     #[BuildFor('Darwin')]

src/Package/Library/krb5.php

@@ -27,7 +27,7 @@ class krb5
 
         $resolved = array_keys($installer->getResolvedPackages());
         $spc = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true]);
-        $config = $spc->getPackageDepsConfig($lib->getName(), $resolved, include_suggests: true);
+        $config = $spc->getPackageDepsConfig($lib->getName(), $resolved);
         $extraEnv = [
             'CFLAGS' => '-fcommon',
             'LIBS' => $config['libs'],

src/Package/Library/libaom.php

@@ -9,8 +9,10 @@ use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixCMakeExecutor;
 use StaticPHP\Runtime\Executor\WindowsCMakeExecutor;
+use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Toolchain\Interface\ToolchainInterface;
 use StaticPHP\Toolchain\ZigToolchain;
+use StaticPHP\Util\System\UnixUtil;
 
 #[Library('libaom')]
 class libaom extends LibraryPackage
@@ -39,9 +41,23 @@ class libaom extends LibraryPackage
             $new = trim($extra . ' -D_GNU_SOURCE');
             f_putenv("SPC_COMPILER_EXTRA={$new}");
         }
+        $targetCpu = SystemTarget::getTargetArch();
+        if (str_starts_with($targetCpu, 'aarch')) {
+            $targetCpu = str_replace('aarch', 'arm', $targetCpu);
+        }
+        if (!UnixUtil::findCommand('nasm') && !UnixUtil::findCommand('yasm')) {
+            $targetCpu = 'generic';
+        }
         UnixCMakeExecutor::create($this)
             ->setBuildDir("{$this->getSourceDir()}/builddir")
-            ->addConfigureArgs('-DAOM_TARGET_CPU=generic')
+            ->addConfigureArgs(
+                "-DAOM_TARGET_CPU={$targetCpu}",
+                '-DCONFIG_RUNTIME_CPU_DETECT=1',
+                '-DENABLE_EXAMPLES=OFF',
+                '-DENABLE_TESTS=OFF',
+                '-DENABLE_TOOLS=OFF',
+                '-DENABLE_DOCS=OFF',
+            )
             ->build();
         f_putenv("SPC_COMPILER_EXTRA={$extra}");
         $this->patchPkgconfPrefix(['aom.pc']);

src/Package/Library/libde265.php

@@ -20,7 +20,6 @@ class libde265 extends LibraryPackage
             ->addConfigureArgs(
                 '-DENABLE_SDL=OFF',
                 '-DENABLE_DECODER=OFF',
-                '-DENABLE_SIMD=OFF',
                 '-DHAVE_NEON=OFF',
             )
             ->build();

src/Package/Library/libffi.php

@@ -8,6 +8,7 @@ use StaticPHP\Attribute\Package\BuildFor;
 use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
+use StaticPHP\Runtime\SystemTarget;
 
 #[Library('libffi')]
 class libffi extends LibraryPackage
@@ -28,7 +29,7 @@ class libffi extends LibraryPackage
     #[BuildFor('Darwin')]
     public function buildDarwin(): void
     {
-        $arch = getenv('SPC_ARCH');
+        $arch = SystemTarget::getTargetArch();
         UnixAutoconfExecutor::create($this)
             ->configure(
                 "--host={$arch}-apple-darwin",

src/Package/Library/libffi_win.php

@@ -21,7 +21,6 @@ class libffi_win
     {
         $ver = WindowsUtil::findVisualStudio();
         $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the vs17 solution, which msbuild builds via forward compatibility.
             '17' => '\win32\vs17_x64',
             '16' => '\win32\vs16_x64',
             default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported!"),
@@ -34,9 +33,7 @@ class libffi_win
     {
         $vs_ver_dir = ApplicationContext::get('libffi_win_vs_ver_dir');
         cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            ->exec('msbuild libffi-msvc.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64');
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libffi-msvc.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WholeProgramOptimization=false');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
 

src/Package/Library/libheif.php

@@ -24,6 +24,17 @@ class libheif
                 'list(APPEND REQUIRES_PRIVATE "libbrotlidec")' . "\n" . '        list(APPEND REQUIRES_PRIVATE "libbrotlienc")'
             );
         }
+        // libheif 1.22+ ships a C-incompatible header: `struct heif_bad_pixel`
+        $heif_properties = $lib->getSourceDir() . '/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;'
+            );
+        }
     }
 
     #[BuildFor('Darwin')]

src/Package/Library/libiconv_win.php

@@ -21,7 +21,6 @@ class libiconv_win
     {
         $ver = WindowsUtil::findVisualStudio();
         $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the VS2022 (MSVC17) solution, which msbuild builds via forward compatibility.
             '17' => '\MSVC17',
             '16' => '\MSVC16',
             default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),
@@ -34,9 +33,7 @@ class libiconv_win
     {
         $vs_ver_dir = ApplicationContext::get('vs_ver_dir');
         cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            ->exec('msbuild libiconv.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64');
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libiconv.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WholeProgramOptimization=false');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
         FileSystem::copy("{$lib->getSourceDir()}{$vs_ver_dir}\\x64\\lib\\libiconv.lib", "{$lib->getLibDir()}\\libiconv.lib");

src/Package/Library/liblz4.php

@@ -17,10 +17,17 @@ use StaticPHP\Util\FileSystem;
 class liblz4
 {
     #[PatchBeforeBuild]
-    #[PatchDescription('Fix Makefile install target for static liblz4')]
+    #[PatchDescription('Compile lib sources individually so -flto -c with multiple inputs works under zig-cc/clang')]
     public function patchBeforeBuild(LibraryPackage $lib): void
     {
-        FileSystem::replaceFileStr($lib->getSourceDir() . '/programs/Makefile', 'install: lz4', "install: lz4\n\ninstallewfwef: lz4");
+        // `-flto -c` with multiple input files only writes a .o for the
+        // first source — the others are silently dropped, leaving liblz4.a with a
+        // single object. Compile each source individually so all .o files exist.
+        FileSystem::replaceFileStr(
+            $lib->getSourceDir() . '/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"
+        );
     }
 
     #[BuildFor('Windows')]

src/Package/Library/libpng.php

@@ -9,6 +9,7 @@ use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
 use StaticPHP\Runtime\Executor\WindowsCMakeExecutor;
+use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Util\FileSystem;
 
 #[Library('libpng')]
@@ -24,7 +25,7 @@ class libpng
         ];
 
         // Enable architecture-specific optimizations
-        match (getenv('SPC_ARCH')) {
+        match (SystemTarget::getTargetArch()) {
             'x86_64' => $args[] = '--enable-intel-sse',
             'aarch64' => $args[] = '--enable-arm-neon',
             default => null,

src/Package/Library/libsodium.php

@@ -42,16 +42,13 @@ class libsodium
     {
         $ver = WindowsUtil::findVisualStudio();
         $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the vs2022 solution, which msbuild builds via forward compatibility.
             '17' => '\vs2022',
             '16' => '\vs2019',
             default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),
         };
 
         cmd()->cd("{$lib->getSourceDir()}\\builds\\msvc{$vs_ver_dir}")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            ->exec('msbuild libsodium.sln /t:Rebuild /p:Configuration=StaticRelease /p:Platform=x64 /p:PreprocessorDefinitions="SODIUM_STATIC=1"');
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libsodium.sln /t:Rebuild /p:Configuration=StaticRelease /p:Platform=x64 /p:WholeProgramOptimization=false /p:PreprocessorDefinitions="SODIUM_STATIC=1"');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
 

src/Package/Library/libssh2.php

@@ -18,7 +18,6 @@ class libssh2
     {
         WindowsCMakeExecutor::create($lib)
             ->addConfigureArgs(
-                '-DCRYPTO_BACKEND=WinCNG',
                 '-DENABLE_ZLIB_COMPRESSION=ON',
                 '-DBUILD_TESTING=OFF'
             )

src/Package/Library/mpir.php

@@ -21,7 +21,6 @@ class mpir
     {
         $ver = WindowsUtil::findVisualStudio();
         $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the build.vc17 solution, which msbuild builds via forward compatibility.
             '17' => '\build.vc17',
             '16' => '\build.vc16',
             default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),

src/Package/Library/ncurses.php

@@ -6,6 +6,8 @@ namespace Package\Library;
 
 use StaticPHP\Attribute\Package\BuildFor;
 use StaticPHP\Attribute\Package\Library;
+use StaticPHP\Attribute\Package\PatchBeforeBuild;
+use StaticPHP\Attribute\PatchDescription;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
 use StaticPHP\Toolchain\Interface\ToolchainInterface;
@@ -16,6 +18,24 @@ use StaticPHP\Util\FileSystem;
 #[Library('ncursesw')]
 class ncurses
 {
+    #[PatchBeforeBuild]
+    #[PatchDescription('Filter clang/zig "N warning(s) generated." line out of MKlib_gen.sh preprocessor pipe')]
+    public function patchBeforeBuild(LibraryPackage $lib): void
+    {
+        // MKlib_gen.sh feeds the C preprocessor's stdout through a sed/awk
+        // pipeline into lib_gen.c. zig-cc/clang emits "N warning(s) generated."
+        // on stdout (not stderr), and that line ends up as invalid C in the
+        // generated source. Filter it out of the pipe before sed sees it.
+        $mklibGen = $lib->getSourceDir() . '/ncurses/base/MKlib_gen.sh';
+        if (is_file($mklibGen) && !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\\.\$' \\",
+            );
+        }
+    }
+
     #[BuildFor('Darwin')]
     #[BuildFor('Linux')]
     public function build(LibraryPackage $package, ToolchainInterface $toolchain): void
@@ -45,6 +65,7 @@ class ncurses
             '--without-tests',
             '--without-dlsym',
             '--without-debug',
+            '--disable-stripping',
             '--enable-symlinks',
             "--with-terminfo-dirs={$terminfo_dirs}",
             "--bindir={$package->getBinDir()}",

src/Package/Library/openssl.php

@@ -24,7 +24,7 @@ class openssl
     {
         if (SystemTarget::getTargetOS() === 'Windows') {
             global $argv;
-            $perl_path_native = PKG_ROOT_PATH . '\strawberry-perl\perl\bin\perl.exe';
+            $perl_path_native = PKG_ROOT_PATH . '\strawberry-perl-' . arch2gnu(php_uname('m')) . '-win\perl\bin\perl.exe';
             $perl = file_exists($perl_path_native) ? ($perl_path_native) : WindowsUtil::findCommand('perl.exe');
             if ($perl === null) {
                 throw new EnvironmentException(
@@ -76,7 +76,7 @@ class openssl
     public function buildForDarwin(LibraryPackage $pkg): void
     {
         $zlib_libs = $pkg->getInstaller()->getLibraryPackage('zlib')->getStaticLibFiles();
-        $arch = getenv('SPC_ARCH');
+        $arch = SystemTarget::getTargetArch();
 
         shell()->cd($pkg->getSourceDir())->initializeEnv($pkg)
             ->exec(
@@ -95,12 +95,7 @@ class openssl
     #[BuildFor('Linux')]
     public function build(LibraryPackage $lib): void
     {
-        $arch = getenv('SPC_ARCH');
+        $arch = SystemTarget::getTargetArch();
-
-        $env = "CC='" . getenv('CC') . ' -idirafter ' . BUILD_INCLUDE_PATH .
-            ' -idirafter /usr/include/ ' .
-            ' -idirafter /usr/include/' . getenv('SPC_ARCH') . '-linux-gnu/ ' .
-            "' ";
 
         $ex_lib = trim($lib->getInstaller()->getLibraryPackage('zlib')->getStaticLibFiles()) . ' -ldl -pthread';
         $zlib_extra =
@@ -111,9 +106,15 @@ class openssl
         $openssl_dir ??= LinuxUtil::getOSRelease()['dist'] === 'redhat' ? '/etc/pki/tls' : '/etc/ssl';
         $ex_lib = trim($ex_lib);
 
+        // anything we want included (PGO -fprofile-*, LTO, custom hardening)
+        // has to be appended on the command line *after* the target name.
+        $userCFlags = trim((string) getenv('SPC_DEFAULT_CFLAGS'));
+        $userLdFlags = trim((string) getenv('SPC_DEFAULT_LDFLAGS'));
+        $userExtra = trim($userCFlags . ' ' . $userLdFlags);
+
         shell()->cd($lib->getSourceDir())->initializeEnv($lib)
             ->exec(
-                "{$env} ./Configure no-shared zlib " .
+                './Configure no-shared zlib ' .
                 "--prefix={$lib->getBuildRootPath()} " .
                 "--libdir={$lib->getLibDir()} " .
                 "--openssldir={$openssl_dir} " .
@@ -121,7 +122,8 @@ class openssl
                 'enable-pie ' .
                 'no-legacy ' .
                 'no-tests ' .
-                "linux-{$arch}"
+                "linux-{$arch} " .
+                $userExtra
             )
             ->exec('make clean')
             ->exec("make -j{$lib->getBuilder()->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")

src/Package/Library/postgresql.php

@@ -37,10 +37,6 @@ class postgresql extends LibraryPackage
     #[PatchDescription('Various patches before building PostgreSQL')]
     public function patchBeforeBuild(): bool
     {
-        // These patches target the autoconf/Make build; the Windows build uses Meson (see buildWin).
-        if (SystemTarget::getTargetOS() === 'Windows') {
-            return true;
-        }
         // skip the test on platforms where libpq infrastructure may be provided by statically-linked libraries
         FileSystem::replaceFileStr("{$this->getSourceDir()}/src/interfaces/libpq/Makefile", 'invokes exit\'; exit 1;', 'invokes exit\';');
         // disable shared libs build
@@ -57,78 +53,12 @@ class postgresql extends LibraryPackage
         return true;
     }
 
-    #[BuildFor('Windows')]
-    public function buildWin(LibraryPackage $lib): void
-    {
-        $src = $lib->getSourceDir();
-        $build_root = $lib->getBuildRootPath();
-        $lib_dir = $lib->getLibDir();
-        $inc_dir = $lib->getIncludeDir();
-        $build = "{$src}\\build";
-
-        // Export the public pg_char_to_encoding()/pg_encoding_to_char() from libpgcommon.a so a
-        // statically-linked libpq.a resolves them (PHP's ext/pgsql relies on them too). This mirrors
-        // the Unix build's -UUSE_PRIVATE_ENCODING_FUNCS patch, but for the Meson build.
-        FileSystem::replaceFileStr(
-            "{$src}\\src\\common\\meson.build",
-            "'c_args': ['-DUSE_PRIVATE_ENCODING_FUNCS'],",
-            "'c_args': [],"
-        );
-
-        // Fresh Meson build dir (Meson refuses to reuse a dir configured differently).
-        if (is_dir($build)) {
-            FileSystem::removeDir($build);
-        }
-
-        // Meson's OpenSSL detection link-tests CRYPTO_new_ex_data; our static libcrypto needs its
-        // Win32 deps (and zlib, since OpenSSL was built with zlib) on the link line to succeed.
-        $ld = 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib secur32.lib zlibstatic.lib';
-
-        $configure = 'meson setup build'
-            . ' --prefix=' . escapeshellarg($build_root)
-            . ' -Ddefault_library=static'   // static libpq.a / libpgcommon.a / libpgport.a
-            . ' -Db_vscrt=mt'               // /MT static CRT, matching the rest of the build
-            . ' -Dssl=openssl'
-            // Everything libpq doesn't need: keeps deps minimal and avoids server-only detection.
-            . ' -Dzlib=disabled -Dnls=disabled -Dreadline=disabled -Dicu=disabled'
-            . ' -Dlz4=disabled -Dzstd=disabled -Dtap_tests=disabled'
-            . ' -Dplperl=disabled -Dplpython=disabled -Dpltcl=disabled'
-            . ' -Dgssapi=disabled -Dldap=disabled -Dlibxml=disabled -Dlibxslt=disabled'
-            . ' -Dextra_include_dirs=' . escapeshellarg("{$build_root}\\include")
-            . ' -Dextra_lib_dirs=' . escapeshellarg($lib_dir);
-
-        // Build only the three frontend static libs (not the server) — keeps it fast and avoids
-        // needing every backend dependency. meson/ninja/win_bison/win_flex/perl come from PATH.
-        $targets = 'src/interfaces/libpq/libpq.a src/common/libpgcommon.a src/port/libpgport.a';
-
-        cmd()->cd($src)
-            ->setEnv([
-                'LIB' => $lib_dir . ';' . (getenv('LIB') ?: ''),
-                'LDFLAGS' => $ld,
-            ])
-            ->exec($configure)
-            ->exec("ninja -C build {$targets}");
-
-        // Install the static libs under the names PHP's ext/pgsql + frankenphp expect (.lib).
-        FileSystem::createDir($lib_dir);
-        FileSystem::createDir($inc_dir);
-        FileSystem::copy("{$build}\\src\\interfaces\\libpq\\libpq.a", "{$lib_dir}\\libpq.lib");
-        FileSystem::copy("{$build}\\src\\common\\libpgcommon.a", "{$lib_dir}\\libpgcommon.lib");
-        FileSystem::copy("{$build}\\src\\port\\libpgport.a", "{$lib_dir}\\libpgport.lib");
-
-        // Install the public libpq headers (PG18 no longer ships pg_config_ext.h).
-        FileSystem::copy("{$src}\\src\\interfaces\\libpq\\libpq-fe.h", "{$inc_dir}\\libpq-fe.h");
-        FileSystem::copy("{$src}\\src\\include\\postgres_ext.h", "{$inc_dir}\\postgres_ext.h");
-        FileSystem::createDir("{$inc_dir}\\libpq");
-        FileSystem::copy("{$src}\\src\\include\\libpq\\libpq-fs.h", "{$inc_dir}\\libpq\\libpq-fs.h");
-    }
-
     #[BuildFor('Darwin')]
     #[BuildFor('Linux')]
     public function buildUnix(PackageInstaller $installer, PackageBuilder $builder): void
     {
         $spc_config = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true]);
-        $config = $spc_config->getPackageDepsConfig('postgresql', array_keys($installer->getResolvedPackages()), include_suggests: $builder->getOption('with-suggests', false));
+        $config = $spc_config->getPackageDepsConfig('postgresql', array_keys($installer->getResolvedPackages()));
 
         $env_vars = [
             'CFLAGS' => $config['cflags'] . ' -std=c17',

src/Package/Library/qdbm.php

@@ -20,6 +20,11 @@ class qdbm
     {
         $ac = UnixAutoconfExecutor::create($lib)->configure();
         FileSystem::replaceFileRegex($lib->getSourceDir() . '/Makefile', '/MYLIBS = libqdbm.a.*/m', 'MYLIBS = libqdbm.a');
+        // Makefile pins -O3, replace with SPC_DEFAULT_CFLAGS
+        $extra = trim((string) getenv('SPC_DEFAULT_CFLAGS'));
+        if ($extra !== '') {
+            FileSystem::replaceFileRegex($lib->getSourceDir() . '/Makefile', '/^CFLAGS = .*$/m', "CFLAGS = -Wall {$extra}");
+        }
         $ac->make(SystemTarget::getTargetOS() === 'Darwin' ? 'mac' : '');
         $lib->patchPkgconfPrefix(['qdbm.pc']);
     }

src/Package/Library/sqlite.php

@@ -19,12 +19,7 @@ class sqlite
     #[BuildFor('Linux')]
     public function buildUnix(LibraryPackage $lib): void
     {
-        UnixAutoconfExecutor::create($lib)
+        UnixAutoconfExecutor::create($lib)->configure()->make();
-            ->appendEnv([
-                'CFLAGS' => '-DSQLITE_ENABLE_COLUMN_METADATA=1',
-            ])
-            ->configure()
-            ->make();
         $lib->patchPkgconfPrefix(['sqlite3.pc']);
     }
 

src/Package/Library/unixodbc.php

@@ -20,14 +20,27 @@ class unixodbc extends LibraryPackage
     {
         $sysconf_selector = match ($os = SystemTarget::getTargetOS()) {
             'Darwin' => match (SystemTarget::getTargetArch()) {
-                'x86_64' => is_dir('/usr/local/etc') ? '/usr/local/etc' : '/opt/local/etc',
+                'x86_64' => '/usr/local/etc',
-                'aarch64' => is_dir('/opt/homebrew/etc') ? '/opt/homebrew/etc' : '/opt/local/etc',
+                'aarch64' => '/opt/homebrew/etc',
                 default => throw new WrongUsageException('Unsupported architecture: ' . GNU_ARCH),
             },
             'Linux' => '/etc',
             default => throw new WrongUsageException("Unsupported OS: {$os}"),
         };
-        UnixAutoconfExecutor::create($this)
+
+        // unixodbc bundles libltdl; libltdl is incompatible with -flto
+        // (https://bugs.gentoo.org/532672).
+        $stripLto = static fn (string $s): string => clean_spaces((string) preg_replace('/(^|\s)-flto(=\S+)?(?=\s|$)/', ' ', $s));
+        $cflags = $stripLto((string) getenv('SPC_DEFAULT_CFLAGS'));
+        $cxxflags = $stripLto((string) getenv('SPC_DEFAULT_CXXFLAGS'));
+        $ldflags = $stripLto((string) getenv('SPC_DEFAULT_LDFLAGS'));
+
+        $make = UnixAutoconfExecutor::create($this)
+            ->setEnv([
+                'CFLAGS' => $cflags,
+                'CXXFLAGS' => $cxxflags,
+                'LDFLAGS' => $ldflags,
+            ])
             ->configure(
                 '--disable-debug',
                 '--disable-dependency-tracking',
@@ -35,8 +48,15 @@ class unixodbc extends LibraryPackage
                 '--with-included-ltdl',
                 "--sysconfdir={$sysconf_selector}",
                 '--enable-gui=no',
-            )
+            );
-            ->make();
+
+        // The exe/ subdirectory builds odbcinst/iusql/etc, turn it into a no-op
+        file_put_contents(
+            "{$this->getSourceDir()}/exe/Makefile",
+            ".PHONY: all install clean check distclean install-strip\nall install clean check distclean install-strip:\n\t@true\n",
+        );
+
+        $make->make();
         $this->patchPkgconfPrefix(['odbc.pc', 'odbccr.pc', 'odbcinst.pc']);
         $this->patchLaDependencyPrefix();
     }

src/Package/Target/curl.php

@@ -35,16 +35,12 @@ class curl
     #[BuildFor('Windows')]
     public function buildWin(LibraryPackage $lib): void
     {
-        $lib_dir = str_replace('\\', '/', $lib->getLibDir());
-        $zstd_lib = "{$lib_dir}/zstd_static.lib";
-        $extra_libs = "{$lib_dir}/libcrypto.lib {$lib_dir}/libssl.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib";
         WindowsCMakeExecutor::create($lib)
             ->optionalPackage('zstd', ...cmake_boolean_args('CURL_ZSTD'))
             ->optionalPackage('brotli', ...cmake_boolean_args('CURL_BROTLI'))
             ->addConfigureArgs(
                 '-DBUILD_CURL_EXE=ON',
-                '-DCMAKE_C_STANDARD_LIBRARIES=' . escapeshellarg($extra_libs),
+                '-DZSTD_LIBRARY=zstd_static.lib',
-                '-DZSTD_LIBRARY=' . escapeshellarg($zstd_lib),
                 '-DBUILD_TESTING=OFF',
                 '-DBUILD_EXAMPLES=OFF',
                 '-DUSE_LIBIDN2=OFF',

src/Package/Target/php.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Package\Target;
 
 use Package\Target\php\frankenphp;
+use Package\Target\php\pgo;
 use Package\Target\php\unix;
 use Package\Target\php\windows;
 use StaticPHP\Artifact\ArtifactCache;
@@ -48,6 +49,7 @@ class php extends TargetPackage
     use unix;
     use windows;
     use frankenphp;
+    use pgo;
 
     /** @var string[] Supported major PHP versions */
     public const array SUPPORTED_MAJOR_VERSIONS = ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'];
@@ -255,13 +257,6 @@ class php extends TargetPackage
             $installer->addBuildPackage('php-embed');
         }
 
-        // UPX compression: ensure the upx tool package is installed when requested.
-        // upx is a ToolPackage now, so it's installed directly rather than added as a
-        // library dependency (tool packages bypass the DependencyResolver graph).
-        if ($package->getBuildOption('with-upx-pack')) {
-            $installer->addInstallPackage('upx');
-        }
-
         return [...$extensions_pkg, ...$additional_packages];
     }
 
@@ -275,6 +270,7 @@ class php extends TargetPackage
             }
         }
         // linux does not support loading shared libraries when target is pure static
+        if ($package->getName() === 'php-embed') {
             $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
             if (SystemTarget::getTargetOS() === 'Linux' && ApplicationContext::get(ToolchainInterface::class)->isStatic() && $embed_type === 'shared') {
                 throw new WrongUsageException(
@@ -283,6 +279,7 @@ class php extends TargetPackage
                 );
             }
         }
+    }
 
     #[Info]
     public function info(Package $package, PackageInstaller $installer): array
@@ -339,7 +336,7 @@ class php extends TargetPackage
             logger()->info("Adding hardcoded INI [{$source_name} = {$ini_value}]");
         }
         if (!empty($custom_ini)) {
-            ApplicationContext::invoke([SourcePatcher::class, 'patchHardcodedINI'], [$package->getSourceDir(), $custom_ini]);
+            ApplicationContext::invoke([SourcePatcher::class, 'patchHardcodedINI'], ['php_source_dir' => $package->getSourceDir(), 'ini' => $custom_ini]);
         }
 
         // Patch StaticPHP version

src/Package/Target/php/frankenphp.php

@@ -73,10 +73,7 @@ trait frankenphp
             $staticFlags = '';
         }
 
-        $resolved = array_keys($installer->getResolvedPackages());
+        $config = new SPCConfigUtil()->config(['frankenphp']);
-        // remove self from deps
-        $resolved = array_filter($resolved, fn ($pkg_name) => $pkg_name !== $package->getName());
-        $config = new SPCConfigUtil()->config($resolved);
         $cflags = "{$package->getLibExtraCFlags()} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . " -DFRANKENPHP_VERSION={$frankenphp_version}";
         $libs = $config['libs'];
 
@@ -88,10 +85,13 @@ trait frankenphp
             $libs .= ' -lgcov';
         }
 
+        $extraLdProgram = clean_spaces((string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM'));
         $env = [
             'CGO_ENABLED' => '1',
             'CGO_CFLAGS' => clean_spaces($cflags),
-            'CGO_LDFLAGS' => "{$package->getLibExtraLdFlags()} {$staticFlags} {$config['ldflags']} {$libs}",
+            'CGO_LDFLAGS' => clean_spaces("{$package->getLibExtraLdFlags()} {$staticFlags} {$config['ldflags']} {$libs} {$extraLdProgram}"),
+            // cgo strips flags not on its safe allowlist; widen it
+            'CGO_LDFLAGS_ALLOW' => '-Wl,-z,.*|-Wl,--.*|-flto.*|-fprofile-.*',
             'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
                 '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' .
                 '-X \'github.com/caddyserver/caddy/v2/modules/caddyhttp.ServerHeader=FrankenPHP Caddy\' ' .
@@ -101,10 +101,12 @@ trait frankenphp
                 "-tags={$muslTags}nobadger,nomysql,nopgx{$no_brotli}{$no_watcher}",
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ];
+        $pgo = file_exists("{$source_dir}/caddy/frankenphp/default.pgo") ? "--pgo {$source_dir}/caddy/frankenphp/default.pgo " : '';
         InteractiveTerm::setMessage('Building frankenphp: ' . ConsoleColor::yellow('building with xcaddy'));
         shell()->cd(BUILD_LIB_PATH)
             ->setEnv($env)
-            ->exec("xcaddy build --output frankenphp {$xcaddy_modules}");
+            ->exec('go clean -cache') // fix stale include evaluation
+            ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddy_modules}");
 
         $builder->deployBinary(BUILD_LIB_PATH . '/frankenphp', BUILD_BIN_PATH . '/frankenphp');
         $package->setOutput('Binary path for FrankenPHP SAPI', BUILD_BIN_PATH . '/frankenphp');
@@ -233,21 +235,10 @@ trait frankenphp
         $dep_libs = array_unique($dep_libs);
         $lib_dir = str_replace('\\', '/', BUILD_LIB_PATH);
         $php_embed_lib = "-lphp{$major}embed";
-        // pathcch: PathCchCanonicalizeEx etc. used by frankenphp/caddy path handling.
+        $win_sys_libs = '-lkernel32 -lole32 -luser32 -ladvapi32 -lshell32 -lws2_32 -ldnsapi -lpsapi -lbcrypt';
-        // secur32: InitSecurityInterfaceA (curl Schannel/SSPI). crypt32/gdi32: OpenSSL + Schannel.
-        $win_sys_libs = '-lkernel32 -lole32 -luser32 -ladvapi32 -lshell32 -lws2_32 -ldnsapi -lpsapi -lbcrypt -lpathcch -lsecur32 -lcrypt32 -lgdi32';
         $cgo_ldflags = clean_spaces(implode(' ', array_filter([
             "-L{$lib_dir}",
             $php_embed_lib,
-            // FrankenPHP's cgo code references PHP/lexbor/zend symbols via __declspec(dllimport).
-            // Their definitions live in php{N}embed.lib but are only pulled in if the plain symbol
-            // is referenced, so the __imp_ refs go unresolved. Force-include one symbol from each
-            // defining object (zend_atomic.obj, lexbor url.obj, lexbor idna.obj) to pull them in;
-            // lld then auto-imports the __imp_ refs. (/WHOLEARCHIVE would also drag in libxml2.res,
-            // which collides with Go's own resource object: "more than one resource obj file".)
-            '-Wl,/INCLUDE:zend_atomic_bool_store',
-            '-Wl,/INCLUDE:lxb_url_parse',
-            '-Wl,/INCLUDE:lxb_unicode_idna_init',
             implode(' ', $dep_libs),
             $win_sys_libs,
             '-llibcmt',
@@ -273,11 +264,10 @@ trait frankenphp
         // Fix: prepend clang's directory to PATH and use plain executable names instead,
         // which matches FrankenPHP's official CI approach (CC=clang, CXX=clang++).
         $clang_dir = dirname($clang_info['clang']);
-        [$cc, $cxx] = $this->windowsCgoCompilers($package, $clang_info['clang']);
         $env = [
             'CGO_ENABLED' => '1',
-            'CC' => $cc,
+            'CC' => 'clang.exe',
-            'CXX' => $cxx,
+            'CXX' => 'clang++.exe',
             'PATH' => $clang_dir . ';' . getenv('PATH'),
             'CGO_CFLAGS' => clean_spaces($cgo_cflags),
             'CGO_LDFLAGS' => $cgo_ldflags,
@@ -378,41 +368,6 @@ trait frankenphp
         }
     }
 
-    /**
-     * Return the [CC, CXX] cgo should use to build FrankenPHP on Windows.
-     *
-     * Go passes the MinGW-only `-mthreads` flag to the C compiler for cgo builds;
-     * Clang >= 20 rejects it for the MSVC target. When it does, wrap Clang with
-     * a tiny .bat that strips the flag before forwarding.
-     *
-     * Workaround for https://github.com/golang/go/issues/80290, remove once Go
-     * stops passing the flag.
-     *
-     * @return array{0: string, 1: string}
-     */
-    protected function windowsCgoCompilers(TargetPackage $package, string $clang): array
-    {
-        $probe = $package->getSourceDir() . '\mthreads-probe.c';
-        file_put_contents($probe, "int main(void){return 0;}\n");
-        [$ret] = cmd()->execWithResult('"' . $clang . '" -mthreads -c ' . escapeshellarg($probe) . ' -o ' . escapeshellarg($probe . '.o'), false);
-        FileSystem::removeFileIfExists($probe);
-        FileSystem::removeFileIfExists($probe . '.o');
-        if ($ret === 0) {
-            return ['clang.exe', 'clang++.exe'];
-        }
-
-        logger()->info('Clang rejects -mthreads; wrapping it to strip the flag (golang/go#80290)');
-        $dir = dirname($clang);
-        $cc = $package->getSourceDir() . '\cc-nothreads.bat';
-        $cxx = $package->getSourceDir() . '\cxx-nothreads.bat';
-        // %*: the whole command line; the substring replace drops the -mthreads token,
-        // preserving quoting of paths that a for-loop would mangle.
-        file_put_contents($cc, "@echo off\r\nset \"a=%*\"\r\nset \"a=%a: -mthreads = %\"\r\n\"{$dir}\\clang.exe\" %a%\r\n");
-        file_put_contents($cxx, "@echo off\r\nset \"a=%*\"\r\nset \"a=%a: -mthreads = %\"\r\n\"{$dir}\\clang++.exe\" %a%\r\n");
-
-        return [$cc, $cxx];
-    }
-
     protected function getFrankenPHPVersion(TargetPackage $package): string
     {
         if ($version = getenv('FRANKENPHP_VERSION')) {

src/Package/Target/php/pgo.php

@@ -0,0 +1,127 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Target\php;
+
+use StaticPHP\Attribute\Package\AfterStage;
+use StaticPHP\Attribute\Package\BeforeStage;
+use StaticPHP\Attribute\Package\ConditionalOn;
+use StaticPHP\Attribute\PatchDescription;
+use StaticPHP\Exception\WrongUsageException;
+use StaticPHP\Package\TargetPackage;
+use StaticPHP\Util\Pgo\PgoContext;
+use StaticPHP\Util\SourcePatcher;
+
+trait pgo
+{
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'buildconfForUnix'], 'php')]
+    #[PatchDescription('Inject __llvm_profile_write_file() flush at php/frankenphp shutdown for instrumented builds')]
+    public function pgoApplyShutdownPatches(PgoContext $pgo): void
+    {
+        if (!$pgo->isInstrument() && !$pgo->isCsInstrument()) {
+            return;
+        }
+        foreach (PgoContext::SHUTDOWN_PATCHES as $dir => $patch) {
+            $cwd = SOURCE_PATH . '/' . $dir;
+            if (!is_dir($cwd)) {
+                continue;
+            }
+            if (!SourcePatcher::patchFile($patch, $cwd)) {
+                throw new WrongUsageException("PGO --phase=instrument: patch {$patch} failed to apply in {$cwd}");
+            }
+            logger()->info("PGO --phase=instrument: applied {$patch}");
+        }
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[AfterStage('php', [self::class, 'configureForUnix'], 'php')]
+    #[PatchDescription('Patch libtool to passthrough -fcs-profile-* for context-sensitive PGO')]
+    public function pgoPatchLibtoolForCsInstrument(PgoContext $pgo): void
+    {
+        if (!$pgo->isCsInstrument()) {
+            return;
+        }
+        $libtool = SOURCE_PATH . '/php-src/libtool';
+        if (!is_file($libtool)) {
+            return;
+        }
+        $contents = (string) 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 --phase=cs-instrument: could not patch libtool for -fcs-profile-* passthrough');
+            return;
+        }
+        file_put_contents($libtool, $patched);
+        logger()->info('PGO --phase=cs-instrument: patched libtool for -fcs-profile-* passthrough');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'configureForUnix'], 'php')]
+    public function pgoApplyConfigureFlags(PgoContext $pgo): void
+    {
+        $sapis = $pgo->trainableSapis();
+        if ($sapis === []) {
+            return;
+        }
+        $pgo->applyEnvFor($sapis[0]);
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'makeCliForUnix'], 'php')]
+    public function pgoBeforeMakeCli(PgoContext $pgo, TargetPackage $package): void
+    {
+        $this->pgoBeforeSapiMake($pgo, $package, 'cli');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'makeCgiForUnix'], 'php')]
+    public function pgoBeforeMakeCgi(PgoContext $pgo, TargetPackage $package): void
+    {
+        $this->pgoBeforeSapiMake($pgo, $package, 'cgi');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'makeFpmForUnix'], 'php')]
+    public function pgoBeforeMakeFpm(PgoContext $pgo, TargetPackage $package): void
+    {
+        $this->pgoBeforeSapiMake($pgo, $package, 'fpm');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'makeMicroForUnix'], 'php')]
+    public function pgoBeforeMakeMicro(PgoContext $pgo, TargetPackage $package): void
+    {
+        $this->pgoBeforeSapiMake($pgo, $package, 'micro');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'makeEmbedForUnix'], 'php')]
+    public function pgoBeforeMakeEmbed(PgoContext $pgo, TargetPackage $package): void
+    {
+        $this->pgoBeforeSapiMake($pgo, $package, 'embed');
+    }
+
+    #[ConditionalOn(PgoContext::class)]
+    #[BeforeStage('php', [self::class, 'buildFrankenphpForUnix'], 'php')]
+    public function pgoBeforeBuildFrankenphp(PgoContext $pgo): void
+    {
+        $pgo->applyEnvFor('frankenphp');
+        logger()->info("PGO {$pgo->mode}: applying flags for frankenphp");
+    }
+
+    private function pgoBeforeSapiMake(PgoContext $pgo, TargetPackage $package, string $sapi): void
+    {
+        $resolved = $pgo->resolveSapi($sapi);
+        if (!in_array($resolved, $pgo->trainableSapis(), true)) {
+            return;
+        }
+        shell()->cd($package->getSourceDir())->exec('make clean');
+        $pgo->applyEnvFor($sapi);
+        logger()->info("PGO {$pgo->mode}: applying flags for {$sapi}");
+    }
+}