forward port #1138

don't extract local sources
fix version reevaluating regression from v2
2026-07-09 09:55:37 +08:00 · 2026-05-15 14:54:04 +07:00 · 2026-05-15 14:30:58 +07:00 · 2026-05-15 14:05:33 +07:00 · 2026-05-15 12:54:05 +07:00 · 2026-05-15 12:36:34 +07:00
183 changed files with 2698 additions and 4517 deletions
--- a/.gitattributes
+++ b/.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
--- a/.github/copilot-instructions.md
+++ b/.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/`
--- a/.github/skills/staticphp-build-troubleshooting/SKILL.md
+++ b/.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.
--- a/.github/skills/staticphp-build-troubleshooting/agents/openai.yaml
+++ b/.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."
--- a/.github/skills/staticphp-build-troubleshooting/references/log-triage.md
+++ b/.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.
--- a/.github/skills/staticphp-package-maintenance/SKILL.md
+++ b/.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.
--- a/.github/skills/staticphp-package-maintenance/agents/openai.yaml
+++ b/.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."
--- a/.github/skills/staticphp-package-maintenance/references/build-class-patterns.md
+++ b/.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.
--- a/.github/skills/staticphp-package-maintenance/references/package-reference.md
+++ b/.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
 ```
--- a/.github/workflows/post-test-bot-comment.yml
+++ b/.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
--- a/.github/workflows/release-build.yml
+++ b/.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
--- a/.github/workflows/tests.yml
+++ b/.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"
--- a/.github/workflows/vitepress-deploy.yml
+++ b/.github/workflows/vitepress-deploy.yml
@@ -1,68 +1,68 @@
-name: Docs build test and auto deploy
+name: Docs build test and auto deploy
-on:
+on:
-  pull_request:
+  pull_request:
-    branches: [ "v3" ]
+    branches: [ "v3" ]
-    types: [ opened, synchronize, reopened ]
+    types: [ opened, synchronize, reopened ]
-    paths:
+    paths:
-      - 'config/**.yml'
+      - 'config/**.yml'
-      - 'docs/**'
+      - 'docs/**'
-      - 'package.json'
+      - 'package.json'
-      - 'yarn.lock'
+      - 'yarn.lock'
-      - '.github/workflows/vitepress-deploy.yml'
+      - '.github/workflows/vitepress-deploy.yml'
-  push:
+  push:
-    branches: [ "v3" ]
+    branches: [ "v3" ]
-    paths:
+    paths:
-      - 'config/**.yml'
+      - 'config/**.yml'
-      - 'docs/**'
+      - 'docs/**'
-      - 'package.json'
+      - 'package.json'
-      - 'yarn.lock'
+      - 'yarn.lock'
-      - '.github/workflows/vitepress-deploy.yml'
+      - '.github/workflows/vitepress-deploy.yml'
-
+
-jobs:
+jobs:
-  build:
+  build:
-    name: Deploy docs
+    name: Deploy docs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-    if: github.repository == 'crazywhalecc/static-php-cli'
+    if: github.repository == 'crazywhalecc/static-php-cli'
-    steps:
+    steps:
-      - name: Checkout
+      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4
-
+
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v3
-
+
-      - run: npm install
+      - run: npm install
-
+
-      - name: "Install PHP for official runners"
+      - name: "Install PHP for official runners"
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@v2
-        with:
+        with:
-          coverage: none
+          coverage: none
-          tools: composer:v2
+          tools: composer:v2
-          php-version: 8.4
+          php-version: 8.4
-          ini-values: memory_limit=-1
+          ini-values: memory_limit=-1
-          extensions: curl, openssl, mbstring
+          extensions: curl, openssl, mbstring
-
+
-      - name: "Get Composer Cache Directory"
+      - name: "Get Composer Cache Directory"
-        id: composer-cache
+        id: composer-cache
-        run: |
+        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
+
-      - name: "Cache Composer dependencies"
+      - name: "Cache Composer dependencies"
-        uses: "actions/cache@v4"
+        uses: "actions/cache@v4"
-        with:
+        with:
-          path: "${{ steps.composer-cache.outputs.dir }}"
+          path: "${{ steps.composer-cache.outputs.dir }}"
-          key: "php-8.2-locked-composer-${{ hashFiles('**/composer.lock') }}"
+          key: "php-8.2-locked-composer-${{ hashFiles('**/composer.lock') }}"
-          restore-keys: |
+          restore-keys: |
-            php-8.2-locked-composer
+            php-8.2-locked-composer
-
+
-      - name: "Install Locked Dependencies"
+      - name: "Install Locked Dependencies"
-        run: "composer install --no-interaction --no-progress"
+        run: "composer install --no-interaction --no-progress"
-
+
-      - name: Build
+      - name: Build
-        run: npm run docs:build
+        run: npm run docs:build
-
+
-      # Deploy to GitHub Pages only when the workflow is triggered by a push to the v3 branch
+      # Deploy to GitHub Pages only when the workflow is triggered by a push to the v3 branch
-      - name: Deploy to GitHub Pages
+      - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v3
-        if: github.event_name == 'push' && github.ref == 'refs/heads/v3'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/v3'
-        with:
+        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: docs/.vitepress/dist
+          publish_dir: docs/.vitepress/dist
--- a/AGENTS.md
+++ b/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.
--- a/README-zh.md
+++ b/README-zh.md
@@ -1,156 +1,156 @@
-# StaticPHP
+# StaticPHP
-
+
-[![Chinese readme](https://img.shields.io/badge/README-%E4%B8%AD%E6%96%87%20%F0%9F%87%A8%F0%9F%87%B3-moccasin?style=flat-square)](README-zh.md)
+[![Chinese readme](https://img.shields.io/badge/README-%E4%B8%AD%E6%96%87%20%F0%9F%87%A8%F0%9F%87%B3-moccasin?style=flat-square)](README-zh.md)
-[![English readme](https://img.shields.io/badge/README-English%20%F0%9F%87%AC%F0%9F%87%A7-moccasin?style=flat-square)](README.md)
+[![English readme](https://img.shields.io/badge/README-English%20%F0%9F%87%AC%F0%9F%87%A7-moccasin?style=flat-square)](README.md)
-[![Releases](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/releases)
+[![Releases](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/releases)
-[![CI](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
+[![CI](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
-[![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/main/LICENSE)
+[![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/main/LICENSE)
-[![Discord](https://img.shields.io/discord/nrSRbpMJ?label=Discord&logo=discord&style=flat-square)](https://discord.gg/xf6Rd4pEAk)
+[![Discord](https://img.shields.io/discord/nrSRbpMJ?label=Discord&logo=discord&style=flat-square)](https://discord.gg/nrSRbpMJ)
-
+
-**StaticPHP** 是一个强大的工具，用于构建可移植的可执行文件，包括 PHP、扩展等。
+**StaticPHP** 是一个强大的工具，用于构建可移植的可执行文件，包括 PHP、扩展等。
-
+
-> [!IMPORTANT]
+> [!IMPORTANT]
-> 我们正准备发布 **v3** 版本，届时项目名称将从 **static-php-cli** 更改为 **StaticPHP**。
+> 我们正准备发布 **v3** 版本，届时项目名称将从 **static-php-cli** 更改为 **StaticPHP**。
-> 此分支对应 v3 版本。v2 版本请查看 [v2 分支](https://github.com/crazywhalecc/static-php-cli/tree/main)。
+> 此分支对应 v3 版本。v2 版本请查看 [v2 分支](https://github.com/crazywhalecc/static-php-cli/tree/main)。
-> 请更新您的参考资料，并关注正式版发布。
+> 请更新您的参考资料，并关注正式版发布。
-
+
-## 特性
+## 特性
-
+
- :elephant: 支持多个 PHP 版本 - PHP 8.1, 8.2, 8.3, 8.4, 8.5
+- :elephant: 支持多个 PHP 版本 - PHP 8.1, 8.2, 8.3, 8.4, 8.5
- :handbag: 构建零依赖的单文件 PHP 可执行程序
+- :handbag: 构建零依赖的单文件 PHP 可执行程序
- :hamburger: 构建 **[phpmicro](https://github.com/static-php/phpmicro)** 自解压可执行文件（将 PHP 二进制和源码合并为单个文件）
+- :hamburger: 构建 **[phpmicro](https://github.com/static-php/phpmicro)** 自解压可执行文件（将 PHP 二进制和源码合并为单个文件）
- :pill: 自动构建环境检查器，支持自动修复
+- :pill: 自动构建环境检查器，支持自动修复
- :zap: 支持 `Linux`、`macOS`、`Windows`
+- :zap: 支持 `Linux`、`macOS`、`Windows`
- :wrench: 通过 vendor 模式和自定义注册表实现便捷扩展
+- :wrench: 通过 vendor 模式和自定义注册表实现便捷扩展
- :books: 智能依赖管理
+- :books: 智能依赖管理
- 📦 自包含 `spc` 可执行文件，便于自安装
+- 📦 自包含 `spc` 可执行文件，便于自安装
- :fire: 支持 100+ 热门 [PHP 扩展](https://static-php.dev/en/guide/extensions.html)
+- :fire: 支持 100+ 热门 [PHP 扩展](https://static-php.dev/en/guide/extensions.html)
- :floppy_disk: 支持 UPX 压缩（二进制体积可缩小 30-50%）
+- :floppy_disk: 支持 UPX 压缩（二进制体积可缩小 30-50%）
-
+
-**单文件独立 php-cli：**
+**单文件独立 php-cli：**
-
+
-<img width="700" alt="out1" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/01a2e60f-13b0-4242-a645-f7afa4936396">
+<img width="700" alt="out1" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/01a2e60f-13b0-4242-a645-f7afa4936396">
-
+
-**使用 phpmicro 将 PHP 代码与 PHP 解释器结合：**
+**使用 phpmicro 将 PHP 代码与 PHP 解释器结合：**
-
+
-<img width="700" alt="out2" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/46b7128d-fb72-4169-957e-48564c3ff3e2">
+<img width="700" alt="out2" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/46b7128d-fb72-4169-957e-48564c3ff3e2">
-
+
-## 快速开始
+## 快速开始
-
+
-### 1. 下载 spc 二进制
+### 1. 下载 spc 二进制
-
+
-```bash
+```bash
-# For Linux x86_64
+# For Linux x86_64
-curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-x86_64
+curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-x86_64
-# For Linux aarch64
+# For Linux aarch64
-curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-aarch64
+curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-aarch64
-# macOS x86_64 (Intel)
+# macOS x86_64 (Intel)
-curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-macos-x86_64
+curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-macos-x86_64
-# macOS aarch64 (Apple)
+# macOS aarch64 (Apple)
-curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-macos-aarch64
+curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-macos-aarch64
-# Windows (x86_64, win10 build 17063 or later, please install VS2022 first)
+# Windows (x86_64, win10 build 17063 or later, please install VS2022 first)
-curl.exe -fsSL -o spc.exe https://dl.static-php.dev/v3/spc-bin/nightly/spc-windows-x64.exe
+curl.exe -fsSL -o spc.exe https://dl.static-php.dev/v3/spc-bin/nightly/spc-windows-x64.exe
-```
+```
-
+
-对于 macOS 和 Linux，请先添加可执行权限：
+对于 macOS 和 Linux，请先添加可执行权限：
-
+
-```bash
+```bash
-chmod +x ./spc
+chmod +x ./spc
-```
+```
-
+
-### 2. 构建静态 PHP
+### 2. 构建静态 PHP
-
+
-首先，创建 `craft.yml` 文件，并从 [扩展列表](https://static-php.dev/en/guide/extensions.html) 或 [命令生成器](https://static-php.dev/en/guide/cli-generator.html) 指定要包含的扩展：
+首先，创建 `craft.yml` 文件，并从 [扩展列表](https://static-php.dev/en/guide/extensions.html) 或 [命令生成器](https://static-php.dev/en/guide/cli-generator.html) 指定要包含的扩展：
-
+
-```yml
+```yml
-# PHP version support: 8.1, 8.2, 8.3, 8.4, 8.5
+# PHP version support: 8.1, 8.2, 8.3, 8.4, 8.5
-php-version: 8.5
+php-version: 8.5
-# Put your extension list here
+# Put your extension list here
-extensions: "apcu,bcmath,calendar,ctype,curl,dba,dom,exif,fileinfo,filter,gd,iconv,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,readline,redis,session,simplexml,sockets,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib"
+extensions: "apcu,bcmath,calendar,ctype,curl,dba,dom,exif,fileinfo,filter,gd,iconv,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,readline,redis,session,simplexml,sockets,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib"
-sapi:
+sapi:
-  - cli
+  - cli
-  - micro
+  - micro
-download-options:
+download-options:
-  parallel: 10
+  parallel: 10
-```
+```
-
+
-运行命令：
+运行命令：
-
+
-```bash
+```bash
-./spc craft
+./spc craft
-
+
-# 输出完整控制台日志
+# 输出完整控制台日志
-./spc craft -vvv
+./spc craft -vvv
-```
+```
-
+
-### 3. 静态 PHP 使用
+### 3. 静态 PHP 使用
-
+
-现在你可以将 StaticPHP 构建的二进制复制到另一台机器并在无依赖环境下运行：
+现在你可以将 StaticPHP 构建的二进制复制到另一台机器并在无依赖环境下运行：
-
+
-```
+```
-# php-cli
+# php-cli
-buildroot/bin/php -v
+buildroot/bin/php -v
-
+
-# phpmicro
+# phpmicro
-echo '<?php echo "Hello world!\n";' > a.php
+echo '<?php echo "Hello world!\n";' > a.php
-./spc micro:combine a.php -O my-app
+./spc micro:combine a.php -O my-app
-./my-app
+./my-app
-```
+```
-
+
-## 文档
+## 文档
-
+
-当前 README 包含基础用法。有关 StaticPHP 的完整功能集，
+当前 README 包含基础用法。有关 StaticPHP 的完整功能集，
-请访问 <https://static-php.dev>。
+请访问 <https://static-php.dev>。
-
+
-## 直接下载
+## 直接下载
-
+
-如果你暂时不想构建，或只想先测试，可以从 [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 种扩展集合：
+我们为每个 PHP 版本提供 2 种扩展集合：
-
+
- **gigantic**：尽可能包含更多扩展，二进制大小约 100-150MB。
+- **gigantic**：尽可能包含更多扩展，二进制大小约 100-150MB。
- **base**：仅包含 StaticPHP 自身使用的少量扩展，二进制大小约 10MB。
+- **base**：仅包含 StaticPHP 自身使用的少量扩展，二进制大小约 10MB。
-
+
-> WIP
+> WIP
-
+
-### 在线构建（使用 GitHub Actions）
+### 在线构建（使用 GitHub Actions）
-
+
-当上方直接下载的二进制无法满足你的需求时，
+当上方直接下载的二进制无法满足你的需求时，
-你可以使用 GitHub Actions 轻松构建静态编译的 PHP，
+你可以使用 GitHub Actions 轻松构建静态编译的 PHP，
-并同时自定义要编译的扩展列表。
+并同时自定义要编译的扩展列表。
-
+
-1. Fork 此仓库。
+1. Fork 此仓库。
-2. 进入项目的 Actions 并选择 `CI`。
+2. 进入项目的 Actions 并选择 `CI`。
-3. 选择 `Run workflow`，填写你要编译的 PHP 版本、目标类型和扩展列表。（扩展用逗号分隔，例如 `bcmath,curl,mbstring`）
+3. 选择 `Run workflow`，填写你要编译的 PHP 版本、目标类型和扩展列表。（扩展用逗号分隔，例如 `bcmath,curl,mbstring`）
-4. 等待工作流执行完成后，进入对应运行记录并下载 `Artifacts`。
+4. 等待工作流执行完成后，进入对应运行记录并下载 `Artifacts`。
-
+
-如果你启用 `debug`，构建时将输出所有日志，包括编译日志，便于排查问题。
+如果你启用 `debug`，构建时将输出所有日志，包括编译日志，便于排查问题。
-
+
-> 我们也计划在未来提供可复用的 GitHub Actions 工作流，
+> 我们也计划在未来提供可复用的 GitHub Actions 工作流，
-> 这样你无需 fork 本项目，也能在自己的仓库中轻松构建 static PHP。
+> 这样你无需 fork 本项目，也能在自己的仓库中轻松构建 static PHP。
-
+
-## 贡献
+## 贡献
-
+
-如果你需要的扩展缺失，可以创建 issue。
+如果你需要的扩展缺失，可以创建 issue。
-如果你熟悉本项目，也欢迎发起 pull request。
+如果你熟悉本项目，也欢迎发起 pull request。
-
+
-如果你想贡献文档，请直接编辑 `docs/`。
+如果你想贡献文档，请直接编辑 `docs/`。
-
+
-## 赞助本项目
+## 赞助本项目
-
+
-你可以通过 [GitHub Sponsor](https://github.com/crazywhalecc) 赞助我或我的项目。你捐赠的一部分将用于维护 **static-php.dev** 服务器。
+你可以通过 [GitHub Sponsor](https://github.com/crazywhalecc) 赞助我或我的项目。你捐赠的一部分将用于维护 **static-php.dev** 服务器。
-
+
-**特别感谢以下赞助商：**
+**特别感谢以下赞助商：**
-
+
-<a href="https://beyondco.de/"><img src="/docs/public/images/beyondcode-seeklogo.png" width="300" alt="Beyond Code Logo" /></a>
+<a href="https://beyondco.de/"><img src="/docs/public/images/beyondcode-seeklogo.png" width="300" alt="Beyond Code Logo" /></a>
-
+
-<a href="https://nativephp.com/"><img src="/docs/public/images/nativephp-logo.svg" width="300" alt="NativePHP Logo" /></a>
+<a href="https://nativephp.com/"><img src="/docs/public/images/nativephp-logo.svg" width="300" alt="NativePHP Logo" /></a>
-
+
-## 开源许可证
+## 开源许可证
-
+
-本项目本身采用 MIT 许可证。
+本项目本身采用 MIT 许可证。
-一些新添加的扩展和依赖可能来自其他项目。
+一些新添加的扩展和依赖可能来自其他项目。
-这些源码文件头部也可能包含额外的 LICENSE 和 AUTHOR 信息。
+这些源码文件头部也可能包含额外的 LICENSE 和 AUTHOR 信息。
-
+
-请在编译后使用 `bin/spc dump-license` 命令导出项目中使用的开源许可证，
+请在编译后使用 `bin/spc dump-license` 命令导出项目中使用的开源许可证，
-并遵守对应项目的 LICENSE。
+并遵守对应项目的 LICENSE。
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Releases](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/releases)
 [![CI](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/main/LICENSE)
-[![Discord](https://img.shields.io/discord/nrSRbpMJ?label=Discord&logo=discord&style=flat-square)](https://discord.gg/xf6Rd4pEAk)
+[![Discord](https://img.shields.io/discord/nrSRbpMJ?label=Discord&logo=discord&style=flat-square)](https://discord.gg/nrSRbpMJ)
 **StaticPHP** is a powerful tool designed for building portable executables including PHP, extensions, and more.
@@ -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:
--- a/bin/setup-runtime.ps1
+++ b/bin/setup-runtime.ps1
@@ -1,116 +1,116 @@
-param (
+param (
-    [string] ${action}
+    [string] ${action}
-)
+)
-
+
-function AddToPath {
+function AddToPath {
-    param (
+    param (
-        [string]$pathToAdd
+        [string]$pathToAdd
-    )
+    )
-
+
-    $currentPath = [System.Environment]::GetEnvironmentVariable('Path', 'User')
+    $currentPath = [System.Environment]::GetEnvironmentVariable('Path', 'User')
-
+
-    if ($currentPath -notlike "*$pathToAdd*") {
+    if ($currentPath -notlike "*$pathToAdd*") {
-        $newPath = $currentPath + ";$pathToAdd"
+        $newPath = $currentPath + ";$pathToAdd"
-        [System.Environment]::SetEnvironmentVariable('Path', $newPath, 'User')
+        [System.Environment]::SetEnvironmentVariable('Path', $newPath, 'User')
-        Write-Host "Added '$pathToAdd' to Path."
+        Write-Host "Added '$pathToAdd' to Path."
-        Write-Host "To remove path, use: " -NoNewline
+        Write-Host "To remove path, use: " -NoNewline
-        Write-Host "bin/setup-runtime remove-path" -ForegroundColor Cyan
+        Write-Host "bin/setup-runtime remove-path" -ForegroundColor Cyan
-    } else {
+    } else {
-        Write-Host "Path already exists."
+        Write-Host "Path already exists."
-    }
+    }
-}
+}
-
+
-function RemoveFromPath {
+function RemoveFromPath {
-    param (
+    param (
-        [string]$pathToRemove
+        [string]$pathToRemove
-    )
+    )
-
+
-    $currentPath = [System.Environment]::GetEnvironmentVariable('Path', 'User')
+    $currentPath = [System.Environment]::GetEnvironmentVariable('Path', 'User')
-
+
-    if ($currentPath -like "*$pathToRemove*") {
+    if ($currentPath -like "*$pathToRemove*") {
-        $newPath = $currentPath -replace [regex]::Escape(';' + $pathToRemove), ''
+        $newPath = $currentPath -replace [regex]::Escape(';' + $pathToRemove), ''
-        [System.Environment]::SetEnvironmentVariable('Path', $newPath, 'User')
+        [System.Environment]::SetEnvironmentVariable('Path', $newPath, 'User')
-        Write-Host "Removed Path '$pathToRemove'"
+        Write-Host "Removed Path '$pathToRemove'"
-    } else {
+    } else {
-        Write-Host "Path '$pathToRemove' not in Path"
+        Write-Host "Path '$pathToRemove' not in Path"
-    }
+    }
-}
+}
-
+
-# working dir
+# working dir
-$WorkingDir = (Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Definition))
+$WorkingDir = (Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Definition))
-
+
-if ($action -eq 'add-path') {
+if ($action -eq 'add-path') {
-    AddToPath ($WorkingDir + '\runtime')
+    AddToPath ($WorkingDir + '\runtime')
-    exit 0
+    exit 0
-} elseif ($action -eq 'remove-path') {
+} elseif ($action -eq 'remove-path') {
-    RemoveFromPath ($WorkingDir + '\runtime')
+    RemoveFromPath ($WorkingDir + '\runtime')
-    exit 0
+    exit 0
-} elseif (-not($action -eq '')) {
+} elseif (-not($action -eq '')) {
-    Write-Host ("Invalid action: " + $action) -ForegroundColor Red
+    Write-Host ("Invalid action: " + $action) -ForegroundColor Red
-    exit 1
+    exit 1
-}
+}
-
+
-# get php 8.1 specific version
+# get php 8.1 specific version
-
+
-# php windows download
+# php windows download
-$PHPRuntimeUrl = "https://windows.php.net/downloads/releases/archives/php-8.4.4-nts-Win32-vs17-x64.zip"
+$PHPRuntimeUrl = "https://windows.php.net/downloads/releases/archives/php-8.4.4-nts-Win32-vs17-x64.zip"
-Write-Host "Downloading PHP from: " -NoNewline
+Write-Host "Downloading PHP from: " -NoNewline
-Write-Host $PHPRuntimeUrl -ForegroundColor Cyan
+Write-Host $PHPRuntimeUrl -ForegroundColor Cyan
-$ComposerUrl = "https://getcomposer.org/download/latest-stable/composer.phar"
+$ComposerUrl = "https://getcomposer.org/download/latest-stable/composer.phar"
-
+
-# create dir
+# create dir
-New-Item -Path "downloads" -ItemType Directory -Force | Out-Null
+New-Item -Path "downloads" -ItemType Directory -Force | Out-Null
-
+
-# download php
+# download php
-if (-not(Test-Path "downloads\php.zip"))
+if (-not(Test-Path "downloads\php.zip"))
-{
+{
-    Write-Host "Downloading PHP ..."
+    Write-Host "Downloading PHP ..."
-    Invoke-WebRequest $PHPRuntimeUrl -OutFile "downloads\php.zip"
+    Invoke-WebRequest $PHPRuntimeUrl -OutFile "downloads\php.zip"
-}
+}
-
+
-# extract php
+# extract php
-New-Item -Path "runtime" -ItemType Directory -Force | Out-Null
+New-Item -Path "runtime" -ItemType Directory -Force | Out-Null
-Write-Host "Extracting php.zip ..."
+Write-Host "Extracting php.zip ..."
-Expand-Archive -Path "downloads/php.zip" -DestinationPath "runtime" -Force
+Expand-Archive -Path "downloads/php.zip" -DestinationPath "runtime" -Force
-# make php.ini
+# make php.ini
-Move-Item -Path "runtime\php.ini-production" -Destination "runtime\php.ini" -Force
+Move-Item -Path "runtime\php.ini-production" -Destination "runtime\php.ini" -Force
-$OriginINI = Get-Content -Path "runtime\php.ini" -Raw
+$OriginINI = Get-Content -Path "runtime\php.ini" -Raw
-$OriginINI = $OriginINI -replace ';extension=openssl', 'extension=openssl'
+$OriginINI = $OriginINI -replace ';extension=openssl', 'extension=openssl'
-$OriginINI = $OriginINI -replace ';extension=curl', 'extension=curl'
+$OriginINI = $OriginINI -replace ';extension=curl', 'extension=curl'
-$OriginINI = $OriginINI -replace ';extension=mbstring', 'extension=mbstring'
+$OriginINI = $OriginINI -replace ';extension=mbstring', 'extension=mbstring'
-$OriginINI = $OriginINI -replace ';extension=sodium', 'extension=sodium'
+$OriginINI = $OriginINI -replace ';extension=sodium', 'extension=sodium'
-$OriginINI = $OriginINI -replace ';extension_dir = "./"', ('extension_dir = "' + (Split-Path -Parent $MyInvocation.MyCommand.Definition) + '\..\runtime\ext"')
+$OriginINI = $OriginINI -replace ';extension_dir = "./"', ('extension_dir = "' + (Split-Path -Parent $MyInvocation.MyCommand.Definition) + '\..\runtime\ext"')
-$OriginINI | Set-Content -Path "runtime\php.ini"
+$OriginINI | Set-Content -Path "runtime\php.ini"
-
+
-# download composer
+# download composer
-if (-not(Test-Path "runtime\composer.phar"))
+if (-not(Test-Path "runtime\composer.phar"))
-{
+{
-    Write-Host "Downloading composer ..."
+    Write-Host "Downloading composer ..."
-    Invoke-WebRequest $ComposerUrl -OutFile "downloads\composer.phar"
+    Invoke-WebRequest $ComposerUrl -OutFile "downloads\composer.phar"
-    Move-Item -Path "downloads\composer.phar" -Destination "runtime\composer.phar" -Force
+    Move-Item -Path "downloads\composer.phar" -Destination "runtime\composer.phar" -Force
-}
+}
-
+
-# create runtime\composer.ps1
+# create runtime\composer.ps1
-$ComposerContent = '
+$ComposerContent = '
-$WorkingDir = (Split-Path -Parent $MyInvocation.MyCommand.Definition)
+$WorkingDir = (Split-Path -Parent $MyInvocation.MyCommand.Definition)
-& ($WorkingDir + "\php.exe") (Join-Path $WorkingDir "\composer.phar") @args
+& ($WorkingDir + "\php.exe") (Join-Path $WorkingDir "\composer.phar") @args
-'
+'
-$ComposerContent | Set-Content -Path 'runtime\composer.ps1' -Encoding UTF8
+$ComposerContent | Set-Content -Path 'runtime\composer.ps1' -Encoding UTF8
-
+
-Write-Host "Successfully downloaded PHP and Composer !" -ForegroundColor Green
+Write-Host "Successfully downloaded PHP and Composer !" -ForegroundColor Green
-Write-Host "Use static-php-cli: " -NoNewline
+Write-Host "Use static-php-cli: " -NoNewline
-Write-Host "bin/spc" -ForegroundColor Cyan
+Write-Host "bin/spc" -ForegroundColor Cyan
-Write-Host "Use php:            " -NoNewline
+Write-Host "Use php:            " -NoNewline
-Write-Host "runtime/php" -ForegroundColor Cyan
+Write-Host "runtime/php" -ForegroundColor Cyan
-Write-Host "Use composer:       " -NoNewline
+Write-Host "Use composer:       " -NoNewline
-Write-Host "runtime/composer" -ForegroundColor Cyan
+Write-Host "runtime/composer" -ForegroundColor Cyan
-Write-Host ""
+Write-Host ""
-Write-Host "Don't forget installing composer dependencies '" -NoNewline
+Write-Host "Don't forget installing composer dependencies '" -NoNewline
-Write-Host "runtime/composer install" -ForegroundColor Cyan -NoNewline
+Write-Host "runtime/composer install" -ForegroundColor Cyan -NoNewline
-Write-Host "' before using static-php-cli !"
+Write-Host "' before using static-php-cli !"
-Write-Host ""
+Write-Host ""
-Write-Host "If you want to use this PHP for quality tools (like phpstan, php-cs-fixer) or other project,"
+Write-Host "If you want to use this PHP for quality tools (like phpstan, php-cs-fixer) or other project,"
-Write-Host "or use PHP, Composer as system executable,"
+Write-Host "or use PHP, Composer as system executable,"
-Write-Host "use '" -NoNewline
+Write-Host "use '" -NoNewline
-Write-Host "bin/setup-runtime add-path" -ForegroundColor Cyan -NoNewline
+Write-Host "bin/setup-runtime add-path" -ForegroundColor Cyan -NoNewline
-Write-Host "' to add runtime dir in Path."
+Write-Host "' to add runtime dir in Path."
--- a/bin/spc-debug.ps1
+++ b/bin/spc-debug.ps1
@@ -1,12 +1,12 @@
-$PHP_Exec = ".\runtime\php.exe"
+$PHP_Exec = ".\runtime\php.exe"
-
+
-if (-not(Test-Path $PHP_Exec)) {
+if (-not(Test-Path $PHP_Exec)) {
-    $PHP_Exec = Get-Command php.exe -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Definition
+    $PHP_Exec = Get-Command php.exe -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Definition
-    if (-not $PHP_Exec) {
+    if (-not $PHP_Exec) {
-        Write-Host "Error: PHP not found, you need to install PHP on your system or use 'bin/setup-runtime'." -ForegroundColor Red
+        Write-Host "Error: PHP not found, you need to install PHP on your system or use 'bin/setup-runtime'." -ForegroundColor Red
-        exit 1
+        exit 1
-    }
+    }
-}
+}
-
+
-& "$PHP_Exec" -d xdebug.mode=debug -d xdebug.client_host=127.0.0.1 -d xdebug.client_port=9003 -d xdebug.start_with_request=yes ("bin/spc") @args
+& "$PHP_Exec" -d xdebug.mode=debug -d xdebug.client_host=127.0.0.1 -d xdebug.client_port=9003 -d xdebug.start_with_request=yes ("bin/spc") @args
-exit $LASTEXITCODE
+exit $LASTEXITCODE
--- a/bin/spc.ps1
+++ b/bin/spc.ps1
@@ -1,12 +1,12 @@
-$PHP_Exec = ".\runtime\php.exe"
+$PHP_Exec = ".\runtime\php.exe"
-
+
-if (-not(Test-Path $PHP_Exec)) {
+if (-not(Test-Path $PHP_Exec)) {
-    $PHP_Exec = Get-Command php.exe -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Definition
+    $PHP_Exec = Get-Command php.exe -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Definition
-    if (-not $PHP_Exec) {
+    if (-not $PHP_Exec) {
-        Write-Host "Error: PHP not found, you need to install PHP on your system or use 'bin/setup-runtime'." -ForegroundColor Red
+        Write-Host "Error: PHP not found, you need to install PHP on your system or use 'bin/setup-runtime'." -ForegroundColor Red
-        exit 1
+        exit 1
-    }
+    }
-}
+}
-
+
-& "$PHP_Exec" ("bin/spc") @args
+& "$PHP_Exec" ("bin/spc") @args
-exit $LASTEXITCODE
+exit $LASTEXITCODE
--- a/box.json
+++ b/box.json
@@ -10,6 +10,7 @@
        "config",
        "src",
        "vendor/psr",
        "vendor/laravel/prompts",
        "vendor/symfony",
        "vendor/php-di",
        "vendor/zhamao"
--- a/composer.json
+++ b/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"
    },
--- a/composer.lock
+++ b/composer.lock
--- a/config/artifact/ncurses.yml
+++ b/config/artifact/ncurses.yml
@@ -4,9 +4,5 @@ ncurses:
      - COPYING
  source:
    type: filelist
-    url: 'https://ftp.gnu.org/gnu/ncurses/'
+    url: 'https://ftp.gnu.org/pub/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)"/'
--- a/config/env.ini
+++ b/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,6 +100,7 @@ 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"
@@ -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,9 +143,10 @@ 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"
+SPC_DEFAULT_CFLAGS="--target=${MAC_ARCH}-apple-darwin -O3 -fno-plt -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections"
 SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}"
 SPC_DEFAULT_LDFLAGS="-Wl,-dead_strip"
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
@@ -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
--- a/config/pkg/ext/ext-fastchart.yml
+++ b/config/pkg/ext/ext-fastchart.yml
@@ -1,20 +0,0 @@
 ext-fastchart:
  type: php-extension
  artifact:
    source:
      type: ghtar
      repo: iliaal/fastchart
      extract: php-src/ext/fastchart
      prefer-stable: true
    metadata:
      license-files: [LICENSE]
  depends:
    - freetype
  suggests:
    - libpng
    - libjpeg
    - libwebp
  php-extension:
    os:
      - Linux
      - Darwin
--- a/config/pkg/ext/ext-fastjson.yml
+++ b/config/pkg/ext/ext-fastjson.yml
@@ -1,14 +0,0 @@
 ext-fastjson:
  type: php-extension
  artifact:
    source:
      type: ghtar
      repo: iliaal/fastjson
      extract: php-src/ext/fastjson
      prefer-stable: true
    metadata:
      license-files: [LICENSE]
  php-extension:
    os:
      - Linux
      - Darwin
--- a/config/pkg/ext/ext-gmssl.yml
+++ b/config/pkg/ext/ext-gmssl.yml
@@ -10,5 +10,3 @@ ext-gmssl:
      license: PHP-3.01
  depends:
    - gmssl
  php-extension:
    arg-type: with-path
--- a/config/pkg/ext/ext-zip.yml
+++ b/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
--- a/config/pkg/lib/gettext-win.yml
+++ b/config/pkg/lib/gettext-win.yml
@@ -4,6 +4,6 @@ gettext-win:
    source:
      type: git
      url: 'https://github.com/winlibs/gettext.git'
-      rev: '0.18'
+      rev: master
  static-libs@windows:
    - libintl_a.lib
--- a/config/pkg/lib/gettext.yml
+++ b/config/pkg/lib/gettext.yml
@@ -3,11 +3,7 @@ gettext:
  artifact:
    source:
      type: filelist
-      url: 'https://ftp.gnu.org/gnu/gettext/'
+      url: 'https://ftp.gnu.org/pub/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)"/'
    metadata:
      license-files: [gettext-runtime/intl/COPYING.LIB]
--- a/config/pkg/lib/gmp.yml
+++ b/config/pkg/lib/gmp.yml
@@ -6,9 +6,8 @@ gmp:
      url: 'https://ftp.gnu.org/gnu/gmp/'
      regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
    source-mirror:
-      type: filelist
+      type: url
-      url: 'https://ftpmirror.gnu.org/gnu/gmp/'
+      url: 'https://dl.static-php.dev/static-php-cli/deps/gmp/gmp-6.3.0.tar.xz'
      regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
    metadata:
      license-files: ['@/gmp.txt']
      license: Custom
--- a/config/pkg/lib/idn2.yml
+++ b/config/pkg/lib/idn2.yml
@@ -5,10 +5,6 @@ idn2:
      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)"/'
    metadata:
      license-files: [COPYING.LESSERv3]
      license: LGPL-3.0-or-later
--- a/config/pkg/lib/libiconv.yml
+++ b/config/pkg/lib/libiconv.yml
@@ -5,10 +5,6 @@ libiconv:
      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)"/'
    metadata:
      license-files: [COPYING.LIB]
      license: LGPL-2.0-or-later
--- a/config/pkg/lib/libssh2.yml
+++ b/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
--- a/config/pkg/lib/libunistring.yml
+++ b/config/pkg/lib/libunistring.yml
@@ -5,10 +5,6 @@ libunistring:
      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)"/'
    metadata:
      license-files: [COPYING.LIB]
      license: LGPL-3.0-or-later
--- a/config/pkg/lib/openssl.yml
+++ b/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
--- a/config/pkg/lib/readline.yml
+++ b/config/pkg/lib/readline.yml
@@ -3,11 +3,7 @@ readline:
  artifact:
    source:
      type: filelist
-      url: 'https://ftp.gnu.org/gnu/readline/'
+      url: 'https://ftp.gnu.org/pub/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)"/'
    metadata:
      license-files: [COPYING]
--- a/config/pkg/target/frankenphp.yml
+++ b/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
--- a/config/pkg/target/go-win.yml
+++ b/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
--- a/config/pkg/target/go-xcaddy.yml
+++ b/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
--- a/config/pkg/target/jom.yml
+++ b/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
--- a/config/pkg/target/msys2-build-essentials.yml
+++ b/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'
--- a/config/pkg/target/nasm.yml
+++ b/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' } }
--- a/config/pkg/target/php-sdk-binary-tools.yml
+++ b/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}' }
--- a/config/pkg/target/pkg-config.yml
+++ b/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' } }
--- a/config/pkg/target/protoc.yml
+++ b/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
--- a/config/pkg/target/strawberry-perl.yml
+++ b/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
--- a/config/pkg/target/upx.yml
+++ b/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
--- a/config/pkg/target/vswhere.yml
+++ b/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
--- a/config/pkg/target/zig.yml
+++ b/config/pkg/target/zig.yml
@@ -0,0 +1,4 @@
 zig:
  type: target
  artifact:
    binary: custom
--- a/config/pkg/tool/7za-win.yml
+++ b/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
--- a/config/pkg/tool/nasm.yml
+++ b/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
--- a/config/pkg/tool/pkg-config.yml
+++ b/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
--- a/config/pkg/tool/zig.yml
+++ b/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
--- a/docs/en/develop/package-model.md
+++ b/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
--- a/docs/en/guide/index.md
+++ b/docs/en/guide/index.md
@@ -47,7 +47,7 @@ Build your CLI with [symfony/console](https://symfony.com/doc/current/components
 ## Community
-Join our [Discord server](https://discord.gg/xf6Rd4pEAk) to ask questions, share your builds, and connect with other StaticPHP users.
+Join our [Discord server](https://discord.gg/nrSRbpMJ) to ask questions, share your builds, and connect with other StaticPHP users.
 ## Next steps
--- a/docs/en/guide/migrate-from-v2.md
+++ b/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
--- a/docs/zh/develop/package-model.md
+++ b/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 包类型
--- a/docs/zh/guide/index.md
+++ b/docs/zh/guide/index.md
@@ -55,7 +55,7 @@ StaticPHP 支持将 FrankenPHP 连同所需扩展一起静态编译，
 ## 社区
-加入我们的 [Discord 服务器](https://discord.gg/xf6Rd4pEAk)，提问、分享构建成果，与其他 StaticPHP 用户交流。
+加入我们的 [Discord 服务器](https://discord.gg/nrSRbpMJ)，提问、分享构建成果，与其他 StaticPHP 用户交流。
 ## 接下来
--- a/docs/zh/guide/migrate-from-v2.md
+++ b/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 构建环境的配置。
 :::
 ## 已重命名 / 已弃用的选项
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,6 +1,6 @@
 parameters:
  reportUnmatchedIgnoredErrors: false
-  level: 5
+  level: 4
  phpVersion: 80400
  paths:
    - ./src/
--- a/spc.registry.yml
+++ b/spc.registry.yml
@@ -10,7 +10,6 @@ package:
    - config/pkg/lib/
    - config/pkg/target/
    - config/pkg/ext/
    - config/pkg/tool/
 artifact:
  config:
    - config/artifact/
--- a/src/Package/Artifact/go_xcaddy.php
+++ b/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@latest');
        GlobalEnvManager::addPathIfNotExists("{$target_path}/bin");
    }
 }
--- a/src/Package/Artifact/msys2_build_essentials.php
+++ b/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");
    }
 }
--- a/src/Package/Artifact/zig.php
+++ b/src/Package/Artifact/zig.php
@@ -12,6 +12,7 @@ use StaticPHP\Attribute\Artifact\CustomBinary;
 use StaticPHP\Attribute\Artifact\CustomBinaryCheckUpdate;
 use StaticPHP\Exception\DownloaderException;
 use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Util\FileSystem;
 class zig
 {
@@ -61,7 +62,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', [
@@ -131,5 +132,151 @@ class zig
        chmod("{$target_path}/zig-ld.lld", 0755);
        chmod("{$target_path}/zig-ranlib", 0755);
        chmod("{$target_path}/zig-objcopy", 0755);
        // Build the clang runtime bits zig 0.15+ doesn't ship: profile runtime
        // (so -fprofile-generate actually emits .profraw) and crtbegin/crtend
        // (so shared libs get __dso_handle and the __cxa_finalize atexit hook).
        // These get auto-linked by the zig-cc wrapper when the right flags fly past.
        $this->buildClangRuntimeBits($target_path);
    }
    /**
     * Detect the bundled clang version and build the missing clang runtime
     * archives into `<zig>/lib/`. Compiles from a 2 MB compiler-rt-<llvm>.src
     * tarball — far cheaper than fetching the 2 GB prebuilt LLVM tarball.
     */
    private function buildClangRuntimeBits(string $zig_bin_dir): void
    {
        if (PHP_OS_FAMILY !== 'Linux') {
            return;
        }
        $libDir = "{$zig_bin_dir}/lib";
        $profileLib = "{$libDir}/libclang_rt.profile.a";
        $crtBegin = "{$libDir}/clang_rt.crtbegin.o";
        $crtEnd = "{$libDir}/clang_rt.crtend.o";
        if (file_exists($profileLib) && file_exists($crtBegin) && file_exists($crtEnd)) {
            return;
        }
        $zig = "{$zig_bin_dir}/zig";
        $verLine = trim((string) shell_exec(escapeshellarg($zig) . ' cc --version 2>/dev/null'));
        if (!preg_match('/clang version (\d+\.\d+\.\d+)/', $verLine, $m)) {
            logger()->warning('[zig] could not detect bundled clang version; skipping runtime bit build (PGO + shared libs without __dso_handle will fail to link)');
            return;
        }
        $llvmVersion = $m[1];
        logger()->info("Building clang runtime bits for LLVM {$llvmVersion} (zig's bundled clang)");
        $srcRoot = $this->fetchCompilerRtSource($llvmVersion);
        if ($srcRoot === null) {
            return;
        }
        f_mkdir($libDir, recursive: true);
        if (!file_exists($profileLib)) {
            $this->buildProfileRuntime($zig, $srcRoot, $profileLib);
        }
        if (!file_exists($crtBegin) || !file_exists($crtEnd)) {
            $this->buildCrtObjects($zig, $srcRoot, $crtBegin, $crtEnd);
        }
        FileSystem::removeDir($srcRoot);
    }
    private function fetchCompilerRtSource(string $llvmVersion): ?string
    {
        $tarball = "compiler-rt-{$llvmVersion}.src.tar.xz";
        $url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-{$llvmVersion}/{$tarball}";
        $tarballPath = DOWNLOAD_PATH . '/' . $tarball;
        if (!file_exists($tarballPath)) {
            try {
                default_shell()->executeCurlDownload($url, $tarballPath);
            } catch (\Throwable $e) {
                logger()->warning("[zig] failed to download {$tarball}: {$e->getMessage()}");
                return null;
            }
        }
        $srcRoot = PKG_ROOT_PATH . "/compiler-rt-src-{$llvmVersion}";
        FileSystem::removeDir($srcRoot);
        FileSystem::createDir($srcRoot);
        try {
            default_shell()->executeTarExtract($tarballPath, $srcRoot, 'xz');
        } catch (\Throwable $e) {
            logger()->warning("[zig] failed to extract {$tarball}: {$e->getMessage()}");
            return null;
        }
        return $srcRoot;
    }
    private function buildProfileRuntime(string $zig, string $srcRoot, string $libPath): void
    {
        $profileSrc = "{$srcRoot}/lib/profile";
        $profileInc = "{$srcRoot}/include";
        if (!is_dir($profileSrc)) {
            logger()->warning("[zig] profile src dir missing at {$profileSrc} — PGO will not work");
            return;
        }
        $sources = array_merge(
            glob("{$profileSrc}/*.c") ?: [],
            glob("{$profileSrc}/*.cpp") ?: []
        );
        // Keep Linux-only compilation units; the others bring in OS-specific headers
        // we can't satisfy without their respective SDKs.
        $skip = ['/PlatformAIX', '/PlatformDarwin', '/PlatformFuchsia', '/PlatformOther', '/PlatformWindows', '/WindowsMMap'];
        $sources = array_filter($sources, function ($f) use ($skip) {
            foreach ($skip as $s) {
                if (str_contains($f, $s)) {
                    return false;
                }
            }
            return true;
        });
        $objDir = "{$srcRoot}/obj-profile";
        f_mkdir($objDir, recursive: true);
        $cflags = '-c -O2 -fPIC -fvisibility=hidden ' .
            '-I' . escapeshellarg($profileInc) . ' ' .
            '-DCOMPILER_RT_HAS_ATOMICS=1 -DCOMPILER_RT_HAS_FCNTL_LCK=1 -DCOMPILER_RT_HAS_UNAME=1';
        $objs = [];
        foreach ($sources as $src) {
            $obj = $objDir . '/' . pathinfo($src, PATHINFO_FILENAME) . '.o';
            $cmd = escapeshellarg($zig) . ' cc ' . $cflags . ' -o ' . escapeshellarg($obj) . ' ' . escapeshellarg($src) . ' 2>&1';
            if (!$this->runZigCmd($cmd, $obj, "failed to compile {$src}")) {
                return;
            }
            $objs[] = $obj;
        }
        $arCmd = escapeshellarg($zig) . ' ar rcs ' . escapeshellarg($libPath) . ' ' . implode(' ', array_map('escapeshellarg', $objs)) . ' 2>&1';
        if (!$this->runZigCmd($arCmd, $libPath, 'zig ar failed')) {
            return;
        }
        logger()->info('[zig] libclang_rt.profile.a installed (' . filesize($libPath) . ' bytes)');
    }
    private function buildCrtObjects(string $zig, string $srcRoot, string $crtBegin, string $crtEnd): void
    {
        $beginSrc = "{$srcRoot}/lib/builtins/crtbegin.c";
        $endSrc = "{$srcRoot}/lib/builtins/crtend.c";
        if (!is_file($beginSrc) || !is_file($endSrc)) {
            logger()->error("[zig] crtbegin/crtend source missing under {$srcRoot}/lib/builtins — shared libs will lack __dso_handle");
            return;
        }
        $cflags = '-c -O2 -fPIC -fvisibility=hidden -DCRT_HAS_INITFINI_ARRAY';
        foreach ([[$beginSrc, $crtBegin], [$endSrc, $crtEnd]] as [$src, $dst]) {
            $cmd = escapeshellarg($zig) . ' cc ' . $cflags . ' -o ' . escapeshellarg($dst) . ' ' . escapeshellarg($src) . ' 2>&1';
            if (!$this->runZigCmd($cmd, $dst, "failed to compile {$src}")) {
                return;
            }
        }
        logger()->info('[zig] clang_rt.crtbegin.o + clang_rt.crtend.o installed (' . filesize($crtBegin) . ' + ' . filesize($crtEnd) . ' bytes)');
    }
    private function runZigCmd(string $cmd, string $dst, string $errPrefix): bool
    {
        exec($cmd, $out, $rc);
        if ($rc !== 0 || !is_file($dst)) {
            logger()->warning("[zig] {$errPrefix}: " . implode("\n", $out));
            return false;
        }
        return true;
    }
 }
--- a/src/Package/Extension/clickhouse.php
+++ b/src/Package/Extension/clickhouse.php
@@ -4,14 +4,29 @@ 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\PackageInstaller;
 use StaticPHP\Package\PhpExtensionPackage;
 use StaticPHP\Util\FileSystem;
 #[Extension('clickhouse')]
 class clickhouse extends PhpExtensionPackage
 {
    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-clickhouse')]
    #[PatchDescription('Replace THIS_DIR=`dirname $0` with PHP_EXT_SRCDIR() in config.m4 so include paths resolve to the ext source dir during PHP main configure (dirname $0 returns "." when run from php-src root).')]
    public function patchBeforeBuildconfUnix(): void
    {
        FileSystem::replaceFileRegex(
            "{$this->getSourceDir()}/config.m4",
            '/^(\s*)THIS_DIR=.*/m',
            '$1THIS_DIR=PHP_EXT_SRCDIR()',
        );
    }
    #[CustomPhpConfigureArg('Darwin')]
    #[CustomPhpConfigureArg('Linux')]
    public function getUnixConfigureArg(bool $shared, PackageInstaller $installer): string
--- a/src/Package/Extension/curl.php
+++ b/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'));
        }
    }
 }
--- a/src/Package/Extension/gmssl.php
+++ b/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;
    }
 }
--- a/src/Package/Extension/mongodb.php
+++ b/src/Package/Extension/mongodb.php
@@ -16,14 +16,6 @@ use StaticPHP\Util\FileSystem;
 #[Extension('mongodb')]
 class mongodb extends PhpExtensionPackage
 {
    #[BeforeStage('php', [php::class, 'configureForUnix'], 'ext-mongodb')]
    #[PatchDescription('Export PHP_VERSION_ID so mongo-php-driver >= 2.3.3 skips its php-config lookup (in-tree builds have no php-config).')]
    public function exportPhpVersionIdForUnix(): void
    {
        $id = php::getPHPVersionID();
        f_putenv("PHP_VERSION_ID={$id}");
    }
    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-mongodb')]
    #[PatchDescription('Add /utf-8 flag to CFLAGS_MONGODB for Windows build to fix compilation error on non-English Windows.')]
    public function patchBeforeBuild(): void
--- a/src/Package/Extension/password_argon2.php
+++ b/src/Package/Extension/password_argon2.php
@@ -27,7 +27,7 @@ class password_argon2 extends PhpExtensionPackage
    #[CustomPhpConfigureArg('Darwin')]
    public function getConfigureArg(PackageInstaller $installer, PackageBuilder $builder): string
    {
-        if ($installer->getPhpExtensionPackage('openssl')?->isBuildStatic()) {
+        if ($installer->getPhpExtensionPackage('openssl')?->isBuildStatic() || $this->isBuildShared()) {
            if (php::getPHPVersionID() >= 80500 || (php::getPHPVersionID() >= 80400 && !$builder->getOption('enable-zts'))) {
                return '--without-password-argon2'; // use --with-openssl-argon2 in openssl extension instead
            }
--- a/src/Package/Extension/pdo_sqlite.php
+++ b/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'
        );
    }
 }
--- a/src/Package/Extension/simdjson.php
+++ b/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'));
    }
 }
--- a/src/Package/Extension/swoole.php
+++ b/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.');
--- a/src/Package/Extension/xlswriter.php
+++ b/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;
    }
 }
--- a/src/Package/Library/bzip2.php
+++ b/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')]
--- a/src/Package/Library/fastlz.php
+++ b/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
--- a/src/Package/Library/gettext_win.php
+++ b/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
--- a/src/Package/Library/gmssl.php
+++ b/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);
    }
 }
--- a/src/Package/Library/icu.php
+++ b/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} " .
--- a/src/Package/Library/imagemagick.php
+++ b/src/Package/Library/imagemagick.php
@@ -42,9 +42,6 @@ class imagemagick
            ->addConfigureArgs(
                '--disable-openmp',
                '--without-x',
                // implicit --with-gcc-arch
                // bleeds host cpu features into built binaries
                '--without-gcc-arch',
            );
        // special: linux-static target needs `-static`
--- a/src/Package/Library/jbig.php
+++ b/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')]
--- a/src/Package/Library/krb5.php
+++ b/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'],
--- a/src/Package/Library/libde265.php
+++ b/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();
--- a/src/Package/Library/libffi_win.php
+++ b/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());
--- a/src/Package/Library/libiconv_win.php
+++ b/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");
--- a/src/Package/Library/liblz4.php
+++ b/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')]
--- a/src/Package/Library/libsodium.php
+++ b/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());
--- a/src/Package/Library/libssh2.php
+++ b/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'
            )
--- a/src/Package/Library/mpir.php
+++ b/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!"),
--- a/src/Package/Library/ncurses.php
+++ b/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
--- a/src/Package/Library/openssl.php
+++ b/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(
@@ -42,7 +42,7 @@ class openssl
        $perl = ApplicationContext::get('perl');
        $cmd = cmd()->cd($lib->getSourceDir())
            ->exec(
-                escapeshellarg($perl) . ' Configure zlib VC-WIN64A ' .
+                "{$perl} Configure zlib VC-WIN64A " .
                'no-shared ' .
                '--prefix=' . quote($lib->getBuildRootPath()) . ' ' .
                '--with-zlib-lib=' . quote($lib->getLibDir()) . ' ' .
@@ -111,6 +111,12 @@ 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 " .
@@ -121,7 +127,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}\"")
--- a/src/Package/Library/postgresql.php
+++ b/src/Package/Library/postgresql.php
@@ -58,7 +58,7 @@ class postgresql extends LibraryPackage
    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',
--- a/src/Package/Library/qdbm.php
+++ b/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']);
    }
--- a/src/Package/Library/sqlite.php
+++ b/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']);
    }
--- a/src/Package/Library/unixodbc.php
+++ b/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();
    }
--- a/src/Package/Target/curl.php
+++ b/src/Package/Target/curl.php
@@ -40,7 +40,7 @@ class curl
            ->optionalPackage('brotli', ...cmake_boolean_args('CURL_BROTLI'))
            ->addConfigureArgs(
                '-DBUILD_CURL_EXE=ON',
-                '-DZSTD_LIBRARY=' . BUILD_LIB_PATH . '/zstd_static.lib',
+                '-DZSTD_LIBRARY=zstd_static.lib',
                '-DBUILD_TESTING=OFF',
                '-DBUILD_EXAMPLES=OFF',
                '-DUSE_LIBIDN2=OFF',
@@ -93,9 +93,6 @@ class curl
        if (str_contains(FileSystem::readFile($pc_path), '-lgssapi_krb5')) {
            FileSystem::replaceFileRegex($pc_path, '/-lcom_err$/m', '-lcom_err -lkrb5support');
        }
        // FindThreads can put '-lpthread' into INTERFACE_LINK_LIBRARIES; curl's pc generator
        // prepends '-l' to each entry, producing '-l-lpthread'. Strip the extra '-l'.
        FileSystem::replaceFileRegex($pc_path, '/-l(-l\S+)/', '$1');
        shell()->cd("{$lib->getLibDir()}/cmake/CURL/")
            ->exec("sed -ie 's|\"/lib/libcurl.a\"|\"{$lib->getLibDir()}/libcurl.a\"|g' CURLTargets-release.cmake");
--- a/src/Package/Target/php.php
+++ b/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];
    }
--- a/src/Package/Target/php/frankenphp.php
+++ b/src/Package/Target/php/frankenphp.php
@@ -88,10 +88,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\' ' .
@@ -104,6 +107,7 @@ trait frankenphp
        InteractiveTerm::setMessage('Building frankenphp: ' . ConsoleColor::yellow('building with xcaddy'));
        shell()->cd(BUILD_LIB_PATH)
            ->setEnv($env)
            ->exec('go clean -cache') // fix stale include evaluation
            ->exec("xcaddy build --output frankenphp {$xcaddy_modules}");
        $builder->deployBinary(BUILD_LIB_PATH . '/frankenphp', BUILD_BIN_PATH . '/frankenphp');
--- a/src/Package/Target/php/pgo.php
+++ b/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}");
    }
 }
--- a/src/Package/Target/php/unix.php
+++ b/src/Package/Target/php/unix.php
@@ -20,6 +20,7 @@ use StaticPHP\Package\PhpExtensionPackage;
 use StaticPHP\Package\TargetPackage;
 use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Toolchain\Interface\ToolchainInterface;
 use StaticPHP\Toolchain\ToolchainManager;
 use StaticPHP\Toolchain\ZigToolchain;
 use StaticPHP\Util\DirDiff;
 use StaticPHP\Util\FileSystem;
@@ -59,7 +60,7 @@ trait unix
        }
        if (self::getPHPVersionID() >= 80300 && self::getPHPVersionID() < 80400) {
-            SourcePatcher::patchFile('spc_fix_avx512_cache_before_80400.patch', $this->getSourceDir());
+            SourcePatcher::patchFile('spc_fix_avx512_cache_before_80400.patch', SOURCE_PATH . '/php-src');
        }
    }
@@ -92,12 +93,10 @@ trait unix
        $args = [];
        $version_id = self::getPHPVersionID();
-        // disable undefined behavior sanitizer when opcache JIT is enabled (Linux only)
+        // disable undefined behavior sanitizer for zig, trips up on lua minijit and opcache-jit
-        if (SystemTarget::getTargetOS() === 'Linux' && !$package->getBuildOption('disable-opcache-jit', false)) {
+        if (SystemTarget::getTargetOS() === 'Linux' && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            if ($version_id >= 80500 || $installer->isPackageResolved('ext-opcache')) {
+            $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
-                $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+            GlobalEnvManager::putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
                GlobalEnvManager::putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
            }
        }
        // PHP JSON extension is built-in since PHP 8.0
        if ($version_id < 80000) {
@@ -141,7 +140,7 @@ trait unix
        $this->seekPhpSrcLogFileOnException(fn () => shell()->cd($package->getSourceDir())->setEnv([
            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
            'CPPFLAGS' => "-I{$package->getIncludeDir()}",
-            'LDFLAGS' => "-L{$package->getLibDir()} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
+            'LDFLAGS' => "-L{$package->getLibDir()}",
            'LIBS' => $vars['EXTRA_LIBS'] ?? '',
        ])->exec("{$cmd} {$args} {$static_extension_str}"), $package->getSourceDir());
    }
@@ -168,7 +167,7 @@ trait unix
    #[BeforeStage('php', [self::class, 'makeForUnix'], 'php')]
    #[PatchDescription('Patch Makefile to fix //lib path for Linux builds')]
-    #[PatchDescription('Patch BUILD_CC to use system cc instead of zig-cc (prevents minilua crash)')]
+    #[PatchDescription('Under CI: patch BUILD_CC to system cc — zig-cc-built minilua segfaults there for reasons we cannot reproduce locally')]
    public function tryPatchMakefileUnix(TargetPackage $package, ToolchainInterface $toolchain): void
    {
        if (SystemTarget::getTargetOS() !== 'Linux') {
@@ -178,7 +177,8 @@ trait unix
        // replace //lib with /lib in Makefile
        shell()->cd($package->getSourceDir())->exec('sed -i "s|//lib|/lib|g" Makefile');
-        if ($toolchain instanceof ZigToolchain) {
+        // CI escape hatch: in CI, zig-cc-built minilua segfaults
        if ($toolchain instanceof ZigToolchain && getenv('CI')) {
            $makefile = "{$package->getSourceDir()}/Makefile";
            FileSystem::replaceFileRegex($makefile, '/^BUILD_CC\s*=\s*zig-cc\s*$/m', 'BUILD_CC = cc');
        }
@@ -229,6 +229,7 @@ trait unix
    #[Stage]
    public function makeCliForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
    {
        $start = microtime(true);
        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make cli'));
        $concurrency = $builder->concurrency;
        $vars = $this->makeVars($installer);
@@ -239,11 +240,13 @@ trait unix
        $builder->deployBinary("{$package->getSourceDir()}/sapi/cli/php", BUILD_BIN_PATH . '/php');
        $package->setOutput('Binary path for cli SAPI', BUILD_BIN_PATH . '/php');
        InteractiveTerm::success('Built SAPI: ' . ConsoleColor::green('php-cli'), true, $start);
    }
    #[Stage]
    public function makeCgiForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
    {
        $start = microtime(true);
        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make cgi'));
        $concurrency = $builder->concurrency;
        $vars = $this->makeVars($installer);
@@ -254,11 +257,13 @@ trait unix
        $builder->deployBinary("{$package->getSourceDir()}/sapi/cgi/php-cgi", BUILD_BIN_PATH . '/php-cgi');
        $package->setOutput('Binary path for cgi SAPI', BUILD_BIN_PATH . '/php-cgi');
        InteractiveTerm::success('Built SAPI: ' . ConsoleColor::green('php-cgi'), true, $start);
    }
    #[Stage]
    public function makeFpmForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
    {
        $start = microtime(true);
        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make fpm'));
        $concurrency = $builder->concurrency;
        $vars = $this->makeVars($installer);
@@ -269,43 +274,58 @@ trait unix
        $builder->deployBinary("{$package->getSourceDir()}/sapi/fpm/php-fpm", BUILD_BIN_PATH . '/php-fpm');
        $package->setOutput('Binary path for fpm SAPI', BUILD_BIN_PATH . '/php-fpm');
        InteractiveTerm::success('Built SAPI: ' . ConsoleColor::green('php-fpm'), true, $start);
    }
    #[Stage]
    #[PatchDescription('Patch phar extension for micro SAPI to support compressed phar')]
    public function makeMicroForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
    {
-        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make micro'));
+        $start = microtime(true);
-        // apply --with-micro-fake-cli option
+        $phar_patched = false;
-        $vars = $this->makeVars($installer);
+        try {
-        $vars['EXTRA_CFLAGS'] .= $package->getBuildOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
+            if ($installer->isPackageResolved('ext-phar')) {
-        $makeArgs = $this->makeVarsToArgs($vars);
+                $phar_patched = true;
-        // build
+                SourcePatcher::patchMicroPhar(self::getPHPVersionID());
-        shell()->cd($package->getSourceDir())
+            }
-            ->setEnv($vars)
+            InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make micro'));
-            ->exec("make -j{$builder->concurrency} {$makeArgs} micro");
+            // apply --with-micro-fake-cli option
            $vars = $this->makeVars($installer);
            $vars['EXTRA_CFLAGS'] .= $package->getBuildOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
            $makeArgs = $this->makeVarsToArgs($vars);
            // build
            shell()->cd($package->getSourceDir())
                ->setEnv($vars)
                ->exec("make -j{$builder->concurrency} {$makeArgs} micro");
-        $dst = BUILD_BIN_PATH . '/micro.sfx';
+            $dst = BUILD_BIN_PATH . '/micro.sfx';
-        $builder->deployBinary($package->getSourceDir() . '/sapi/micro/micro.sfx', $dst);
+            $builder->deployBinary($package->getSourceDir() . '/sapi/micro/micro.sfx', $dst);
-        // patch after UPX-ed micro.sfx (Linux only)
+            // patch after UPX-ed micro.sfx (Linux only)
-        if (SystemTarget::getTargetOS() === 'Linux' && $builder->getOption('with-upx-pack')) {
+            if (SystemTarget::getTargetOS() === 'Linux' && $builder->getOption('with-upx-pack')) {
-            // cut binary with readelf to remove UPX extra segment
+                // cut binary with readelf to remove UPX extra segment
-            [$ret, $out] = shell()->execWithResult("readelf -l {$dst} | awk '/LOAD|GNU_STACK/ {getline; print \\$1, \\$2, \\$3, \\$4, \\$6, \\$7}'");
+                [$ret, $out] = shell()->execWithResult("readelf -l {$dst} | awk '/LOAD|GNU_STACK/ {getline; print \\$1, \\$2, \\$3, \\$4, \\$6, \\$7}'");
-            $out[1] = explode(' ', $out[1]);
+                $out[1] = explode(' ', $out[1]);
-            $offset = $out[1][0];
+                $offset = $out[1][0];
-            if ($ret !== 0 || !str_starts_with($offset, '0x')) {
+                if ($ret !== 0 || !str_starts_with($offset, '0x')) {
-                throw new PatchException('phpmicro UPX patcher', 'Cannot find offset in readelf output');
+                    throw new PatchException('phpmicro UPX patcher', 'Cannot find offset in readelf output');
                }
                $offset = hexdec($offset);
                // remove upx extra wastes
                file_put_contents($dst, substr(file_get_contents($dst), 0, $offset));
            }
            $package->setOutput('Binary path for micro SAPI', $dst);
            InteractiveTerm::success('Built SAPI: ' . ConsoleColor::green('php-micro'), true, $start);
        } finally {
            if ($phar_patched) {
                SourcePatcher::unpatchMicroPhar();
            }
            $offset = hexdec($offset);
            // remove upx extra wastes
            file_put_contents($dst, substr(file_get_contents($dst), 0, $offset));
        }
        $package->setOutput('Binary path for micro SAPI', $dst);
    }
    #[Stage]
    public function makeEmbedForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
    {
        $start = microtime(true);
        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make embed'));
        $shared_exts = array_filter(
            $installer->getResolvedPackages(),
@@ -319,22 +339,43 @@ trait unix
        $root = BUILD_ROOT_PATH;
        $sed_prefix = SystemTarget::getTargetOS() === 'Darwin' ? 'sed -i ""' : 'sed -i';
        $vars = $this->makeVars($installer);
        $makeArgs = $this->makeVarsToArgs($vars);
        shell()->cd($package->getSourceDir())
-            ->setEnv($this->makeVars($installer))
+            ->setEnv($vars)
            ->exec("{$sed_prefix} \"s|^EXTENSION_DIR = .*|EXTENSION_DIR = /" . basename(BUILD_MODULES_PATH) . '|" Makefile')
-            ->exec("make -j{$builder->concurrency} INSTALL_ROOT={$root} install-sapi {$install_modules} install-build install-headers install-programs");
+            ->exec("make -j{$builder->concurrency} {$makeArgs} INSTALL_ROOT={$root} install-sapi {$install_modules} install-build install-headers install-programs");
        // install-modules deref'd libtool's `$ext.so → $ext-X.so` symlink for each built-with-php ext; restore them.
        $release = null;
        if (preg_match('/-release\s+(\S+)/', (string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $m)) {
            $release = $m[1];
            foreach ($shared_exts as $ext) {
                $name = $ext->getExtensionName();
                $u = BUILD_MODULES_PATH . "/{$name}.so";
                $v = BUILD_MODULES_PATH . "/{$name}-{$release}.so";
                if (file_exists($v) && file_exists($u) && !is_link($u)) {
                    unlink($u);
                    symlink(basename($v), $u);
                }
            }
        }
        // ------------- SPC_CMD_VAR_PHP_EMBED_TYPE=shared -------------
-        // process libphp.so for shared embed
+        // INSTALL_IT for embed copies through libtool's symlink, leaving only unversioned libphp.{so,dylib} — rename and symlink back so shared exts can `-lphp`. (static libphp.a is never versioned, even with -release.)
        $suffix = SystemTarget::getTargetOS() === 'Darwin' ? 'dylib' : 'so';
        $libphp_so = "{$package->getLibDir()}/libphp.{$suffix}";
        if (file_exists($libphp_so)) {
-            // rename libphp.so if -release is set
+            if ($release !== null) {
-            if (SystemTarget::getTargetOS() === 'Linux') {
+                $versioned = "{$package->getLibDir()}/libphp-{$release}.{$suffix}";
-                $this->processLibphpSoFile($libphp_so, $installer);
+                if (file_exists($versioned)) {
                    @unlink($versioned);
                }
                rename($libphp_so, $versioned);
                symlink(basename($versioned), $libphp_so);
                $libphp_so = $versioned;
            }
            // deploy
            $builder->deployBinary($libphp_so, $libphp_so, false);
            $package->setOutput('Library path for embed SAPI', $libphp_so);
        }
@@ -343,6 +384,9 @@ trait unix
        $increment_files = $diff->getChangedFiles();
        $files = [];
        foreach ($increment_files as $increment_file) {
            if (is_link($increment_file) || !file_exists($increment_file)) {
                continue;
            }
            $builder->deployBinary($increment_file, $increment_file, false);
            $files[] = basename($increment_file);
        }
@@ -350,6 +394,11 @@ trait unix
            $package->setOutput('Built shared extensions', implode(', ', $files));
        }
        // phpize needs prefix patched whether libphp is .a or .so
        $package->runStage([$this, 'patchUnixEmbedScripts']);
        InteractiveTerm::success('Built SAPI: ' . ConsoleColor::green('php-embed'), true, $start);
        // ------------- SPC_CMD_VAR_PHP_EMBED_TYPE=static -------------
        // process libphp.a for static embed (only when present)
@@ -359,9 +408,6 @@ trait unix
            shell()->exec("{$ar} -t {$libphp_a} | grep '\\.a$' | xargs -n1 {$ar} d {$libphp_a}");
            UnixUtil::exportDynamicSymbols($libphp_a);
        }
        // deploy embed php scripts
        $package->runStage([$this, 'patchUnixEmbedScripts']);
    }
    #[Stage]
@@ -394,8 +440,15 @@ trait unix
        try {
            logger()->debug('Building shared extensions...');
            foreach ($shared_extensions as $extension) {
-                InteractiveTerm::setMessage('Building shared PHP extension: ' . ConsoleColor::yellow($extension->getName()));
+                $ext_start = microtime(true);
-                $extension->buildShared();
+                InteractiveTerm::setMessage('Building shared extension: ' . ConsoleColor::yellow($extension->getName()));
                try {
                    $extension->buildShared();
                } catch (\Throwable $e) {
                    InteractiveTerm::error('Building shared extension failed: ' . ConsoleColor::red($extension->getName()));
                    throw $e;
                }
                InteractiveTerm::success('Built shared extension: ' . ConsoleColor::green($extension->getName()), true, $ext_start);
            }
        } finally {
            // restore php-config
@@ -680,77 +733,6 @@ trait unix
        return $php;
    }
    /**
     * Rename libphp.so to libphp-<release>.so if -release is set in LDFLAGS.
     */
    private function processLibphpSoFile(string $libphpSo, PackageInstaller $installer): void
    {
        $ldflags = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') ?: '';
        $libDir = BUILD_LIB_PATH;
        $modulesDir = BUILD_MODULES_PATH;
        $realLibName = 'libphp.so';
        $cwd = getcwd();
        if (preg_match('/-release\s+(\S+)/', $ldflags, $matches)) {
            $release = $matches[1];
            $realLibName = "libphp-{$release}.so";
            $libphpRelease = "{$libDir}/{$realLibName}";
            if (!file_exists($libphpRelease) && file_exists($libphpSo)) {
                rename($libphpSo, $libphpRelease);
            }
            if (file_exists($libphpRelease)) {
                chdir($libDir);
                if (file_exists($libphpSo)) {
                    unlink($libphpSo);
                }
                symlink($realLibName, 'libphp.so');
                shell()->exec(sprintf(
                    'patchelf --set-soname %s %s',
                    escapeshellarg($realLibName),
                    escapeshellarg($libphpRelease)
                ));
            }
            if (is_dir($modulesDir)) {
                chdir($modulesDir);
                foreach ($installer->getResolvedPackages(PhpExtensionPackage::class) as $ext) {
                    if (!$ext->isBuildShared()) {
                        continue;
                    }
                    $name = $ext->getName();
                    $versioned = "{$name}-{$release}.so";
                    $unversioned = "{$name}.so";
                    $src = "{$modulesDir}/{$versioned}";
                    $dst = "{$modulesDir}/{$unversioned}";
                    if (is_file($src)) {
                        rename($src, $dst);
                        shell()->exec(sprintf(
                            'patchelf --set-soname %s %s',
                            escapeshellarg($unversioned),
                            escapeshellarg($dst)
                        ));
                    }
                }
            }
            chdir($cwd);
        }
        $target = "{$libDir}/{$realLibName}";
        if (file_exists($target)) {
            [, $output] = shell()->execWithResult('readelf -d ' . escapeshellarg($target));
            $output = implode("\n", $output);
            if (preg_match('/SONAME.*\[(.+)]/', $output, $sonameMatch)) {
                $currentSoname = $sonameMatch[1];
                if ($currentSoname !== basename($target)) {
                    shell()->exec(sprintf(
                        'patchelf --set-soname %s %s',
                        escapeshellarg(basename($target)),
                        escapeshellarg($target)
                    ));
                }
            }
        }
    }
    /**
     * Make environment variables for php make.
     * This will call SPCConfigUtil to generate proper LDFLAGS and LIBS for static linking.
@@ -760,16 +742,28 @@ trait unix
        $config = new SPCConfigUtil(['libs_only_deps' => true])->config($installer->getAvailableResolvedPackageNames());
        $static = ApplicationContext::get(ToolchainInterface::class)->isStatic() ? '-all-static' : '';
        $pie = SystemTarget::getTargetOS() === 'Linux' ? '-pie' : '';
        $lib = BUILD_LIB_PATH;
        // Append SPC_EXTRA_LIBS to libs for dynamic linking support (e.g., X11)
        $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
        $libs = trim($config['libs'] . ' ' . $extra_libs);
        // libtool input (libphp.la). `make EXTRA_LDFLAGS=…` cmdline overrides fully replace the Makefile value, so re-include $config['ldflags'] for -L paths.
        $extra_ldflags = clean_spaces($config['ldflags'] . ' ' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'));
        if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared'
            && !str_contains($extra_ldflags, '-avoid-version')
            && !preg_match('/-release\s+\S+/', $extra_ldflags)) {
            $extra_ldflags = trim($extra_ldflags . ' -avoid-version -module');
        }
        $extra_ldflags_program_env = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM') ?: '';
        $extra_ldflags_program = clean_spaces("-L{$lib} {$static} {$pie} {$extra_ldflags_program_env}");
        return array_filter([
            'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
            'EXTRA_CXXFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS'),
-            'EXTRA_LDFLAGS_PROGRAM' => deduplicate_flags(getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') . " {$config['ldflags']} {$static} {$pie}"),
+            'EXTRA_LDFLAGS' => $extra_ldflags,
-            'EXTRA_LDFLAGS' => $config['ldflags'],
+            'EXTRA_LDFLAGS_PROGRAM' => $extra_ldflags_program,
            'EXTRA_LIBS' => $libs,
        ]);
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
henderkes	4b19f4ec95	forward port #1138	2026-05-15 14:54:04 +07:00
henderkes	1707d21569	don't extract local sources	2026-05-15 14:30:58 +07:00
henderkes	70e717adb6	fix version reevaluating regression from v2	2026-05-15 14:05:33 +07:00
henderkes	a88e426623	clean cgo cache before rebuilding frankenphp (reports wrong version from cgo includes, even if they're updated)	2026-05-15 12:54:05 +07:00
henderkes	6fda358c90	--build-frankenphp didn't actually build frankenphp	2026-05-15 12:36:34 +07:00
henderkes	09de4c9c70	drop ldflags fron watcher-c	2026-05-15 11:05:22 +07:00
henderkes	db794bf27b	strange shit	2026-05-12 13:18:54 +07:00
henderkes	b880ef7003	allow * stage to subscribe to everything	2026-05-12 12:45:09 +07:00
henderkes	9addbe2c7d	oops	2026-05-12 11:41:25 +07:00
henderkes	445c0b36c9	don't add fno-sanitize=undefined for library builds	2026-05-12 11:30:46 +07:00
henderkes	4754faf43e	also build curl exe on windows	2026-05-12 11:24:55 +07:00
henderkes	2415b7db35	we don't need this anymore	2026-05-12 11:22:04 +07:00
henderkes	814014e122	array	2026-05-12 11:19:57 +07:00
henderkes	defd50f459	wrong exception type	2026-05-12 11:17:31 +07:00
henderkes	57ef0423d5	fix phpunit failure	2026-05-12 10:57:49 +07:00
henderkes	8453f69eea	fix BUILD_CC=cc workaround root cause (minijit trips zig default undefined behaviour sanitizer)	2026-05-12 10:52:23 +07:00
henderkes	c1c34d8c10	trust filesystem, not downloads	2026-05-12 10:38:33 +07:00
henderkes	270e2d6471	cant reset it because of the same reason x(	2026-05-12 10:07:21 +07:00
henderkes	4172508cb9	use {pkg_root_path} for packages, otherwise containers get confused with different pkg_root_path set	2026-05-12 09:54:29 +07:00
henderkes	a585359b28	reset registry	2026-05-11 21:36:17 +07:00
henderkes	bfaa7ebb3a	Merge remote-tracking branch 'origin/v3' into feat/pgo-v3	2026-05-11 21:05:54 +07:00
henderkes	7e6e9d869e	add pgo capabilities v3 style	2026-05-11 19:06:40 +07:00
henderkes	743934d1fe	use resolved dependency tree instead of asking for with_suggests everywhere	2026-05-11 11:35:15 +07:00
henderkes	efdd2a74a5	update libraries to honour user flags	2026-05-11 10:05:33 +07:00
henderkes	6e3267273b	better deduplicate_flags	2026-05-11 09:41:25 +07:00
henderkes	4f7694267b	toolchain fixes forward port from v2-pgo	2026-05-10 19:27:36 +07:00