fix(test): fix redundant terminal output during phpunit (#1194)

Build the CC/CXX/AR/LD/RANLIB map once and hand it to shell()->setEnv()
so the configure/make invocations don't have to repeat the same prefix
on every line. For the sudo make-install path the env still needs to
be on the command line (sudo strips the parent env), so the same map
is rendered into $envFlags and prepended there. Also adds RANLIB,
which the upstream Makefile honours.

.github/workflows/release-build.yml

@@ -38,6 +38,9 @@ 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"
@@ -105,6 +108,12 @@ 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

box.json

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

composer.json

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

config/env.ini

@@ -100,10 +100,9 @@ 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 -Wno-unused-command-line-argument"
+SPC_DEFAULT_CFLAGS="-fPIC -O3 -pipe -fno-plt -fno-semantic-interposition -fstack-clash-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections"
 SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}"
 SPC_DEFAULT_LDFLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -Wl,-z,noexecstack -Wl,--gc-sections"
 ; upx executable path
@@ -126,8 +125,6 @@ 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
@@ -143,7 +140,6 @@ 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"
@@ -167,7 +163,5 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -fvis
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS="-g -fstack-protector-strong -fno-ident -fpie -fvisibility=hidden -fvisibility-inlines-hidden -Werror=unknown-warning-option ${SPC_DEFAULT_CXXFLAGS}"
 ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.dylib
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
-; EXTRA_LDFLAGS_PROGRAM for `make` php; appended only to SAPI executable links (cli/fpm/cgi/micro/embed). Used by PGO to inject -fprofile-use= without polluting libphp.{a,dylib}.
-SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM=""
 ; minimum compatible macOS version (LLVM vars, availability not guaranteed)
 MACOSX_DEPLOYMENT_TARGET=12.0

config/pkg/ext/ext-amqp.yml

@@ -2,8 +2,8 @@ ext-amqp:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: php-amqp/php-amqp
+      type: pecl
+      name: amqp
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-apcu.yml

@@ -2,8 +2,8 @@ ext-apcu:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: apcu/apcu
+      type: pecl
+      name: APCu
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-ast.yml

@@ -2,8 +2,8 @@ ext-ast:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: nikic/php-ast
+      type: pecl
+      name: ast
     metadata:
       license-files: [LICENSE]
       license: BSD-3-Clause

config/pkg/ext/ext-brotli.yml

@@ -2,13 +2,12 @@ ext-brotli:
   type: php-extension
   artifact:
     source:
-      type: ghtagtar
-      repo: kjdev/php-ext-brotli
+      type: git
       extract: php-src/ext/brotli
+      rev: master
+      url: 'https://github.com/kjdev/php-ext-brotli'
     metadata:
       license-files: [LICENSE]
       license: MIT
   depends:
     - brotli
-  php-extension:
-    arg-type: '--enable-brotli@shared_suffix@ --with-libbrotli'

config/pkg/ext/ext-dio.yml

@@ -2,8 +2,8 @@ ext-dio:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: pecl/dio
+      type: pecl
+      name: dio
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-ev.yml

@@ -2,8 +2,8 @@ ext-ev:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: osmanov/pecl-ev
+      type: pecl
+      name: ev
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-excimer.yml

@@ -2,9 +2,8 @@ ext-excimer:
   type: php-extension
   artifact:
     source:
-      type: ghtagtar
-      repo: wikimedia/mediawiki-php-excimer
-      extract: php-src/ext/excimer
+      type: pecl
+      name: excimer
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-gearman.yml

@@ -2,9 +2,8 @@ ext-gearman:
   type: php-extension
   artifact:
     source:
-      type: ghtar
-      repo: php/pecl-networking-gearman
-      extract: php-src/ext/gearman
+      type: pecl
+      name: gearman
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-grpc.yml

@@ -2,8 +2,8 @@ ext-grpc:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: grpc/grpc-php-ext
+      type: pecl
+      name: grpc
     metadata:
       license-files: [LICENSE]
       license: Apache-2.0

config/pkg/ext/ext-igbinary.yml

@@ -2,10 +2,8 @@ ext-igbinary:
   type: php-extension
   artifact:
     source:
-      type: ghtagtar
-      repo: igbinary/igbinary
-      match: tags/\d+(\.\d+)+$
-      extract: php-src/ext/igbinary
+      type: pecl
+      name: igbinary
     metadata:
       license-files: [COPYING]
       license: BSD-3-Clause

config/pkg/ext/ext-imagick.yml

@@ -2,8 +2,8 @@ ext-imagick:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: imagick/imagick
+      type: pecl
+      name: imagick
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-imap.yml

@@ -2,9 +2,8 @@ ext-imap:
   type: php-extension
   artifact:
     source:
-      type: ghtagtar
-      repo: php/pecl-mail-imap
-      extract: php-src/ext/imap
+      type: pecl
+      name: imap
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-inotify.yml

@@ -2,8 +2,8 @@ ext-inotify:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: arnaud-lb/inotify
+      type: pecl
+      name: inotify
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-memcache.yml

@@ -2,9 +2,8 @@ ext-memcache:
   type: php-extension
   artifact:
     source:
-      type: ghtar
-      repo: websupport-sk/pecl-memcache
-      extract: php-src/ext/memcache
+      type: pecl
+      name: memcache
     metadata:
       license-files: [LICENSE]
       license: PHP-3.0

config/pkg/ext/ext-memcached.yml

@@ -2,8 +2,8 @@ ext-memcached:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: php-memcached/php-memcached
+      type: pecl
+      name: memcached
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-msgpack.yml

@@ -2,8 +2,8 @@ ext-msgpack:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: msgpack/msgpack-php
+      type: pecl
+      name: msgpack
     metadata:
       license-files: [LICENSE]
       license: BSD-3-Clause

config/pkg/ext/ext-mysqlnd_ed25519.yml

@@ -4,6 +4,7 @@ ext-mysqlnd_ed25519:
     source:
       type: pie
       repo: mariadb/mysqlnd_ed25519
+      extract: php-src/ext/mysqlnd_ed25519
     metadata:
       license-files: [LICENSE]
       license: BSD-3-Clause

config/pkg/ext/ext-mysqlnd_parsec.yml

@@ -4,6 +4,7 @@ ext-mysqlnd_parsec:
     source:
       type: pie
       repo: mariadb/mysqlnd_parsec
+      extract: php-src/ext/mysqlnd_parsec
     metadata:
       license-files: [LICENSE]
       license: BSD-3-Clause

config/pkg/ext/ext-opentelemetry.yml

@@ -2,8 +2,8 @@ ext-opentelemetry:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: open-telemetry/ext-opentelemetry
+      type: pecl
+      name: opentelemetry
     metadata:
       license-files: [LICENSE]
       license: Apache-2.0

config/pkg/ext/ext-parallel.yml

@@ -2,8 +2,8 @@ ext-parallel:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: pecl/parallel
+      type: pecl
+      name: parallel
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-pcov.yml

@@ -2,8 +2,8 @@ ext-pcov:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: pecl/pcov
+      type: pecl
+      name: pcov
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-redis.yml

@@ -2,8 +2,8 @@ ext-redis:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: phpredis/phpredis
+      type: pecl
+      name: redis
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-spx.yml

@@ -4,6 +4,7 @@ ext-spx:
     source:
       type: pie
       repo: noisebynorthwest/php-spx
+      extract: php-src/ext/spx
     metadata:
       license-files: [LICENSE]
       license: GPL-3.0-or-later

config/pkg/ext/ext-ssh2.yml

@@ -2,9 +2,8 @@ ext-ssh2:
   type: php-extension
   artifact:
     source:
-      type: ghtar
-      repo: php/pecl-networking-ssh2
-      extract: php-src/ext/ssh2
+      type: pecl
+      name: ssh2
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-trader.yml

@@ -2,9 +2,8 @@ ext-trader:
   type: php-extension
   artifact:
     source:
-      type: ghtagtar
-      repo: php/pecl-math-trader
-      extract: php-src/ext/trader
+      type: pecl
+      name: trader
     metadata:
       license-files: [LICENSE]
       license: BSD-2-Clause

config/pkg/ext/ext-uuid.yml

@@ -2,8 +2,8 @@ ext-uuid:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: pecl/uuid
+      type: pecl
+      name: uuid
     metadata:
       license-files: [LICENSE]
       license: LGPL-2.1-only

config/pkg/ext/ext-uv.yml

@@ -2,9 +2,9 @@ ext-uv:
   type: php-extension
   artifact:
     source:
-      type: ghtagtar
-      repo: amphp/ext-uv
-      extract: php-src/ext/uv
+      type: pecl
+      name: uv
+      prefer-stable: false
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-xhprof.yml

@@ -2,8 +2,8 @@ ext-xhprof:
   type: php-extension
   artifact:
     source:
-      type: ghtar
-      repo: longxinH/xhprof
+      type: pecl
+      name: xhprof
       extract: php-src/ext/xhprof-src
     metadata:
       license-files: [LICENSE]

config/pkg/ext/ext-xlswriter.yml

@@ -2,8 +2,8 @@ ext-xlswriter:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: viest/xlswriter
+      type: pecl
+      name: xlswriter
     metadata:
       license-files: [LICENSE]
       license: BSD-2-Clause

config/pkg/ext/ext-yac.yml

@@ -2,9 +2,8 @@ ext-yac:
   type: php-extension
   artifact:
     source:
-      type: ghtagtar
-      repo: laruence/yac
-      extract: php-src/ext/yac
+      type: pecl
+      name: yac
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-zip.yml

@@ -2,8 +2,9 @@ ext-zip:
   type: php-extension
   artifact:
     source:
-      type: pie
-      repo: pecl/zip
+      type: pecl
+      name: zip
+      extract: ext-zip
     metadata:
       license-files: [LICENSE]
       license: PHP-3.01

config/pkg/ext/ext-zstd.yml

@@ -2,8 +2,9 @@ ext-zstd:
   type: php-extension
   artifact:
     source:
-      type: ghtar
-      repo: kjdev/php-ext-zstd
+      type: git
+      url: 'https://github.com/kjdev/php-ext-zstd'
+      rev: master
       extract: php-src/ext/zstd
     metadata:
       license-files: [LICENSE]

config/pkg/lib/gmssl.yml

@@ -2,9 +2,8 @@ gmssl:
   type: library
   artifact:
     source:
-      type: git
-      url: 'https://github.com/guanzhi/GmSSL.git'
-      rev: master
+      type: ghtar
+      repo: guanzhi/GmSSL
     metadata:
       license-files: [LICENSE]
       license: Apache-2.0

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

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

config/pkg/target/llvm-tools.yml

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

phpstan.neon

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

src/Package/Artifact/gmssl.php

@@ -17,11 +17,4 @@ class gmssl
         FileSystem::replaceFileStr($target_path . '/src/hex.c', 'unsigned char *OPENSSL_hexstr2buf(const char *str, size_t *len)', 'unsigned char *GMSSL_hexstr2buf(const char *str, size_t *len)');
         FileSystem::replaceFileStr($target_path . '/src/hex.c', 'OPENSSL_hexchar2int', 'GMSSL_hexchar2int');
     }
-
-    #[AfterSourceExtract('ext-gmssl')]
-    #[PatchDescription('Rename pbkdf2_hmac_sm3_genkey() to sm3_pbkdf2() (renamed upstream in GmSSL 3.2+; identical signature)')]
-    public function patchExt(string $target_path): void
-    {
-        FileSystem::replaceFileStr($target_path . '/gmssl.c', 'pbkdf2_hmac_sm3_genkey(', 'sm3_pbkdf2(');
-    }
 }

src/Package/Artifact/go_xcaddy.php

@@ -25,6 +25,7 @@ class go_xcaddy
     ])]
     public function downBinary(ArtifactDownloader $downloader): DownloadResult
     {
+        $pkgroot = PKG_ROOT_PATH;
         $name = SystemTarget::getCurrentPlatformString();
         $arch = match (explode('-', $name)[1]) {
             'x86_64' => 'amd64',
@@ -63,7 +64,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: '{pkg_root_path}/go-xcaddy', verified: true, version: $version);
+        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: "{$pkgroot}/go-xcaddy", verified: true, version: $version);
     }
 
     #[CustomBinaryCheckUpdate('go-xcaddy', [
@@ -108,7 +109,7 @@ class go_xcaddy
             'GOROOT' => "{$target_path}",
             'GOBIN' => "{$target_path}/bin",
             'GOPATH' => "{$target_path}/go",
-        ])->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master');
+        ])->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
         GlobalEnvManager::addPathIfNotExists("{$target_path}/bin");
     }
 }

src/Package/Artifact/llvm_compiler_rt.php

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

src/Package/Artifact/llvm_tools.php

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

src/Package/Artifact/zig.php

@@ -15,23 +15,6 @@ use StaticPHP\Runtime\SystemTarget;
 
 class zig
 {
-    /** Directory zig extracts into. */
-    public static function path(): string
-    {
-        return PKG_ROOT_PATH . '/zig';
-    }
-
-    /** Path to a binary inside the zig install dir (zig, zig-cc, zig-c++, zig-ar, …). */
-    public static function binary(string $name = 'zig'): string
-    {
-        return self::path() . '/' . $name;
-    }
-
-    public static function isInstalled(): bool
-    {
-        return is_file(self::binary());
-    }
-
     #[CustomBinary('zig', [
         'linux-x86_64',
         'linux-aarch64',
@@ -78,7 +61,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', [
@@ -127,24 +110,26 @@ class zig
                 break;
             }
         }
-        if (!$all_exist) {
-            $script_path = ROOT_DIR . '/src/globals/scripts/zig-cc.sh';
-            $script_content = file_get_contents($script_path);
-
-            file_put_contents("{$target_path}/zig-cc", $script_content);
-            chmod("{$target_path}/zig-cc", 0755);
-
-            $script_content = str_replace('zig cc', 'zig c++', $script_content);
-            file_put_contents("{$target_path}/zig-c++", $script_content);
-            file_put_contents("{$target_path}/zig-ar", "#!/usr/bin/env bash\nexec zig ar $@");
-            file_put_contents("{$target_path}/zig-ld.lld", "#!/usr/bin/env bash\nexec zig ld.lld $@");
-            file_put_contents("{$target_path}/zig-ranlib", "#!/usr/bin/env bash\nexec zig ranlib $@");
-            file_put_contents("{$target_path}/zig-objcopy", "#!/usr/bin/env bash\nexec zig objcopy $@");
-            chmod("{$target_path}/zig-c++", 0755);
-            chmod("{$target_path}/zig-ar", 0755);
-            chmod("{$target_path}/zig-ld.lld", 0755);
-            chmod("{$target_path}/zig-ranlib", 0755);
-            chmod("{$target_path}/zig-objcopy", 0755);
+        if ($all_exist) {
+            return;
         }
+
+        $script_path = ROOT_DIR . '/src/globals/scripts/zig-cc.sh';
+        $script_content = file_get_contents($script_path);
+
+        file_put_contents("{$target_path}/zig-cc", $script_content);
+        chmod("{$target_path}/zig-cc", 0755);
+
+        $script_content = str_replace('zig cc', 'zig c++', $script_content);
+        file_put_contents("{$target_path}/zig-c++", $script_content);
+        file_put_contents("{$target_path}/zig-ar", "#!/usr/bin/env bash\nexec zig ar $@");
+        file_put_contents("{$target_path}/zig-ld.lld", "#!/usr/bin/env bash\nexec zig ld.lld $@");
+        file_put_contents("{$target_path}/zig-ranlib", "#!/usr/bin/env bash\nexec zig ranlib $@");
+        file_put_contents("{$target_path}/zig-objcopy", "#!/usr/bin/env bash\nexec zig objcopy $@");
+        chmod("{$target_path}/zig-c++", 0755);
+        chmod("{$target_path}/zig-ar", 0755);
+        chmod("{$target_path}/zig-ld.lld", 0755);
+        chmod("{$target_path}/zig-ranlib", 0755);
+        chmod("{$target_path}/zig-objcopy", 0755);
     }
 }

src/Package/Extension/event.php

@@ -35,37 +35,12 @@ class event extends PhpExtensionPackage
 
     #[BeforeStage('php', [php::class, 'makeForUnix'], 'ext-event')]
     #[PatchDescription('Prevent event extension compile error on macOS')]
-    #[PatchDescription('Patch libevent http_connection.c to use a const peer address')]
     public function patchBeforeMake(PackageInstaller $installer): void
     {
-        $php_src = $installer->getTargetPackage('php')->getSourceDir();
         // Prevent event extension compile error on macOS
         if (SystemTarget::getTargetOS() === 'Darwin') {
+            $php_src = $installer->getTargetPackage('php')->getSourceDir();
             FileSystem::replaceFileRegex("{$php_src}/main/php_config.h", '/^#define HAVE_OPENPTY 1$/m', '');
         }
-        $this->patchLibeventConstPeer("{$php_src}/ext/event");
-    }
-
-    #[BeforeStage('ext-event', [PhpExtensionPackage::class, 'makeForUnix'])]
-    #[PatchDescription('Patch libevent http_connection.c to use a const peer address')]
-    public function patchBeforeSharedMake(PhpExtensionPackage $pkg): void
-    {
-        $this->patchLibeventConstPeer($pkg->getSourceDir());
-    }
-
-    private function patchLibeventConstPeer(string $event_source_dir): bool
-    {
-        $file = "{$event_source_dir}/php8/classes/http_connection.c";
-        if (!is_file($file)) {
-            return false;
-        }
-        // libevent >= 2.2 changed evhttp_connection_get_peer()'s
-        // address arg to `const char **`
-        $header = $this->getBuilder()->getBuildRootPath() . '/include/event2/http.h';
-        $isConst = is_file($header)
-            && preg_match('/evhttp_connection_get_peer\s*\([^;]*\bconst\s+char\s*\*\*\s*address/s', file_get_contents($header)) === 1;
-        return (bool) ($isConst
-            ? FileSystem::replaceFileRegex($file, '/^\tchar \*address;$/m', "\tconst char *address;")
-            : FileSystem::replaceFileRegex($file, '/^\tconst char \*address;$/m', "\tchar *address;"));
     }
 }

src/Package/Extension/gmssl.php

@@ -0,0 +1,45 @@
+<?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, 'buildconfForWindows'], 'ext-gmssl')]
+    #[PatchDescription('Add CHECK_LIB to config.w32 for static Windows builds')]
+    public function patchBeforeBuildconfWin(): bool
+    {
+        $configW32 = "{$this->getSourceDir()}/config.w32";
+        if (str_contains(FileSystem::readFile($configW32), 'CHECK_LIB(')) {
+            return false;
+        }
+        FileSystem::replaceFileStr(
+            $configW32,
+            'AC_DEFINE(',
+            'CHECK_LIB("gmssl.lib", "gmssl", PHP_GMSSL);' . PHP_EOL . 'AC_DEFINE('
+        );
+        return true;
+    }
+}

src/Package/Extension/swoole.php

@@ -62,23 +62,6 @@ class swoole extends PhpExtensionPackage
         }
     }
 
-    #[BeforeStage('php', [php::class, 'makeForUnix'], 'ext-swoole')]
-    #[PatchDescription('Initialise SWOOLE_G(cli) to false in the module globals ctor (upstream bug: it is left uninitialised, so under a threaded SAPI like frankenphp its garbage value passes the CLI-only guard in RINIT and segfaults on the first request)')]
-    public function patchBeforeMake3(): void
-    {
-        // php_swoole_init_globals() sets every other global explicitly but never assigns
-        // `cli`, relying on zero-initialisation. That holds for CLI/embed but not for
-        // frankenphp's per-thread ZTS globals, where `cli` reads garbage-nonzero. Since
-        // sapi_module.name is always "frankenphp" there, the `cli = true` conditional never
-        // fires — so the fix is simply to default `cli` to false at the source of the gate.
-        // Reported upstream; drop this patch once swoole ships the initialiser.
-        FileSystem::replaceFileStr(
-            $this->getSourceDir() . '/ext-src/php_swoole.cc',
-            "    swoole_globals->leak_detection = false;\n\n    if (strcmp(\"cli\", sapi_module.name) == 0",
-            "    swoole_globals->leak_detection = false;\n    swoole_globals->cli = false;\n\n    if (strcmp(\"cli\", sapi_module.name) == 0",
-        );
-    }
-
     #[CustomPhpConfigureArg('Darwin')]
     #[CustomPhpConfigureArg('Linux')]
     public function getUnixConfigureArg(bool $shared, PackageBuilder $builder, PackageInstaller $installer): string

src/Package/Extension/xlswriter.php

@@ -11,7 +11,6 @@ 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')]
@@ -21,20 +20,14 @@ class xlswriter extends PhpExtensionPackage
     #[CustomPhpConfigureArg('Linux')]
     public function getUnixConfigureArg(bool $shared, PackageInstaller $installer): string
     {
-        $arg = '--with-xlswriter --enable-reader';
+        $shared = $shared ? '=shared' : '';
+        $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
@@ -47,11 +40,4 @@ class xlswriter extends PhpExtensionPackage
             file_put_contents($this->getSourceDir() . '/library/libxlsxwriter/src/theme.c', $bom . $content);
         }
     }
-
-    public function getSharedExtensionEnv(): array
-    {
-        $parent = parent::getSharedExtensionEnv();
-        $parent['CFLAGS'] .= ' -std=gnu17';
-        return $parent;
-    }
 }

src/Package/Library/bzip2.php

@@ -17,9 +17,7 @@ class bzip2
     #[PatchBeforeBuild]
     public function patchBeforeBuild(LibraryPackage $lib): void
     {
-        // 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}");
+        FileSystem::replaceFileStr($lib->getSourceDir() . '/Makefile', 'CFLAGS=-Wall', 'CFLAGS=-fPIC -Wall');
     }
 
     #[BuildFor('Windows')]

src/Package/Library/fastlz.php

@@ -18,11 +18,9 @@ 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 {$extra} fastlz.c -o fastlz.o")
+            ->exec("{$cc} -c -O3 -fPIC fastlz.c -o fastlz.o")
             ->exec("{$ar} rcs libfastlz.a fastlz.o");
 
         // Copy header file

src/Package/Library/gettext_win.php

@@ -22,6 +22,7 @@ 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!"),
@@ -44,7 +45,9 @@ class gettext_win
     {
         $vs_ver_dir = ApplicationContext::get('gettext_win_vs_ver_dir');
         cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}\\libintl_static")
-            ->exec('msbuild libintl_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0');
+            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
+            ->exec('msbuild libintl_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0 /p:WholeProgramOptimization=false');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
         // libintl_a.lib is the static library output; copy as libintl.lib for linker compatibility

src/Package/Library/gmssl.php

@@ -18,7 +18,9 @@ class gmssl
     #[BuildFor('Darwin')]
     public function build(LibraryPackage $lib): void
     {
-        UnixCMakeExecutor::create($lib)->build();
+        UnixCMakeExecutor::create($lib)
+            ->addConfigureArgs('-DENABLE_SM2_PRIVATE_KEY_EXPORT=ON')
+            ->build();
     }
 
     #[BuildFor('Windows')]
@@ -33,6 +35,7 @@ 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"',

src/Package/Library/icu.php

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

src/Package/Library/jbig.php

@@ -17,9 +17,7 @@ class jbig
     #[PatchBeforeBuild]
     public function patchBeforeBuild(LibraryPackage $lib): void
     {
-        $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}");
+        FileSystem::replaceFileStr($lib->getSourceDir() . '/Makefile', 'CFLAGS = -O2 -W -Wno-unused-result', 'CFLAGS = -O2 -W -Wno-unused-result -fPIC');
     }
 
     #[BuildFor('Darwin')]

src/Package/Library/krb5.php

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

src/Package/Library/libaom.php

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

src/Package/Library/libffi.php

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

src/Package/Library/libffi_win.php

@@ -21,6 +21,7 @@ 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!"),
@@ -33,7 +34,9 @@ class libffi_win
     {
         $vs_ver_dir = ApplicationContext::get('libffi_win_vs_ver_dir');
         cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}")
-            ->exec('msbuild libffi-msvc.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64');
+            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
+            ->exec('msbuild libffi-msvc.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WholeProgramOptimization=false');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
 

src/Package/Library/libheif.php

@@ -24,17 +24,6 @@ class libheif
                 'list(APPEND REQUIRES_PRIVATE "libbrotlidec")' . "\n" . '        list(APPEND REQUIRES_PRIVATE "libbrotlienc")'
             );
         }
-        // libheif 1.22+ ships a C-incompatible header: `struct heif_bad_pixel`
-        $heif_properties = $lib->getSourceDir() . '/libheif/api/libheif/heif_properties.h';
-        if (file_exists($heif_properties)
-            && str_contains(file_get_contents($heif_properties), 'struct heif_bad_pixel { uint32_t row; uint32_t column; };')
-        ) {
-            FileSystem::replaceFileStr(
-                $heif_properties,
-                'struct heif_bad_pixel { uint32_t row; uint32_t column; };',
-                'typedef struct heif_bad_pixel { uint32_t row; uint32_t column; } heif_bad_pixel;'
-            );
-        }
     }
 
     #[BuildFor('Darwin')]

src/Package/Library/libiconv_win.php

@@ -21,6 +21,7 @@ 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!"),
@@ -33,7 +34,9 @@ class libiconv_win
     {
         $vs_ver_dir = ApplicationContext::get('vs_ver_dir');
         cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}")
-            ->exec('msbuild libiconv.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64');
+            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
+            ->exec('msbuild libiconv.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WholeProgramOptimization=false');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
         FileSystem::copy("{$lib->getSourceDir()}{$vs_ver_dir}\\x64\\lib\\libiconv.lib", "{$lib->getLibDir()}\\libiconv.lib");

src/Package/Library/liblz4.php

@@ -17,17 +17,10 @@ use StaticPHP\Util\FileSystem;
 class liblz4
 {
     #[PatchBeforeBuild]
-    #[PatchDescription('Compile lib sources individually so -flto -c with multiple inputs works under zig-cc/clang')]
+    #[PatchDescription('Fix Makefile install target for static liblz4')]
     public function patchBeforeBuild(LibraryPackage $lib): void
     {
-        // `-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"
-        );
+        FileSystem::replaceFileStr($lib->getSourceDir() . '/programs/Makefile', 'install: lz4', "install: lz4\n\ninstallewfwef: lz4");
     }
 
     #[BuildFor('Windows')]

src/Package/Library/libpng.php

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

src/Package/Library/libsodium.php

@@ -42,13 +42,16 @@ 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}")
-            ->exec('msbuild libsodium.sln /t:Rebuild /p:Configuration=StaticRelease /p:Platform=x64 /p:PreprocessorDefinitions="SODIUM_STATIC=1"');
+            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
+            ->exec('msbuild libsodium.sln /t:Rebuild /p:Configuration=StaticRelease /p:Platform=x64 /p:WholeProgramOptimization=false /p:PreprocessorDefinitions="SODIUM_STATIC=1"');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
 

src/Package/Library/mpir.php

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

src/Package/Library/ncurses.php

@@ -6,8 +6,6 @@ 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;
@@ -18,24 +16,6 @@ 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
@@ -65,7 +45,6 @@ class ncurses
             '--without-tests',
             '--without-dlsym',
             '--without-debug',
-            '--disable-stripping',
             '--enable-symlinks',
             "--with-terminfo-dirs={$terminfo_dirs}",
             "--bindir={$package->getBinDir()}",

src/Package/Library/openssl.php

@@ -76,7 +76,7 @@ class openssl
     public function buildForDarwin(LibraryPackage $pkg): void
     {
         $zlib_libs = $pkg->getInstaller()->getLibraryPackage('zlib')->getStaticLibFiles();
-        $arch = SystemTarget::getTargetArch();
+        $arch = getenv('SPC_ARCH');
 
         shell()->cd($pkg->getSourceDir())->initializeEnv($pkg)
             ->exec(
@@ -95,7 +95,12 @@ class openssl
     #[BuildFor('Linux')]
     public function build(LibraryPackage $lib): void
     {
-        $arch = SystemTarget::getTargetArch();
+        $arch = getenv('SPC_ARCH');
+
+        $env = "CC='" . getenv('CC') . ' -idirafter ' . BUILD_INCLUDE_PATH .
+            ' -idirafter /usr/include/ ' .
+            ' -idirafter /usr/include/' . getenv('SPC_ARCH') . '-linux-gnu/ ' .
+            "' ";
 
         $ex_lib = trim($lib->getInstaller()->getLibraryPackage('zlib')->getStaticLibFiles()) . ' -ldl -pthread';
         $zlib_extra =
@@ -106,15 +111,9 @@ 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(
-                './Configure no-shared zlib ' .
+                "{$env} ./Configure no-shared zlib " .
                 "--prefix={$lib->getBuildRootPath()} " .
                 "--libdir={$lib->getLibDir()} " .
                 "--openssldir={$openssl_dir} " .
@@ -122,8 +121,7 @@ class openssl
                 'enable-pie ' .
                 'no-legacy ' .
                 'no-tests ' .
-                "linux-{$arch} " .
-                $userExtra
+                "linux-{$arch}"
             )
             ->exec('make clean')
             ->exec("make -j{$lib->getBuilder()->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")

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()));
+        $config = $spc_config->getPackageDepsConfig('postgresql', array_keys($installer->getResolvedPackages()), include_suggests: $builder->getOption('with-suggests', false));
 
         $env_vars = [
             'CFLAGS' => $config['cflags'] . ' -std=c17',

src/Package/Library/qdbm.php

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

src/Package/Library/unixodbc.php

@@ -20,27 +20,14 @@ class unixodbc extends LibraryPackage
     {
         $sysconf_selector = match ($os = SystemTarget::getTargetOS()) {
             'Darwin' => match (SystemTarget::getTargetArch()) {
-                'x86_64' => '/usr/local/etc',
-                'aarch64' => '/opt/homebrew/etc',
+                'x86_64' => is_dir('/usr/local/etc') ? '/usr/local/etc' : '/opt/local/etc',
+                'aarch64' => is_dir('/opt/homebrew/etc') ? '/opt/homebrew/etc' : '/opt/local/etc',
                 default => throw new WrongUsageException('Unsupported architecture: ' . GNU_ARCH),
             },
             'Linux' => '/etc',
             default => throw new WrongUsageException("Unsupported OS: {$os}"),
         };
-
-        // 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,
-            ])
+        UnixAutoconfExecutor::create($this)
             ->configure(
                 '--disable-debug',
                 '--disable-dependency-tracking',
@@ -48,15 +35,8 @@ class unixodbc extends LibraryPackage
                 '--with-included-ltdl',
                 "--sysconfdir={$sysconf_selector}",
                 '--enable-gui=no',
-            );
-
-        // 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();
+            )
+            ->make();
         $this->patchPkgconfPrefix(['odbc.pc', 'odbccr.pc', 'odbcinst.pc']);
         $this->patchLaDependencyPrefix();
     }

src/Package/Target/php.php

@@ -5,7 +5,6 @@ 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;
@@ -49,7 +48,6 @@ 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'];
@@ -143,7 +141,6 @@ class php extends TargetPackage
         $package->addBuildOption('disable-opcache-jit', null, null, 'Disable opcache jit');
         $package->addBuildOption('with-config-file-path', null, InputOption::VALUE_REQUIRED, 'Set the path in which to look for php.ini', PHP_OS_FAMILY === 'Windows' ? null : '/usr/local/etc/php');
         $package->addBuildOption('with-config-file-scan-dir', null, InputOption::VALUE_REQUIRED, 'Set the directory to scan for .ini files after reading php.ini', PHP_OS_FAMILY === 'Windows' ? null : '/usr/local/etc/php/conf.d');
-        $package->addBuildOption('with-sysconfdir', null, InputOption::VALUE_REQUIRED, 'Set the sysconfdir (e.g. /etc/php-zts) used by configure (not available on Windows)');
         $package->addBuildOption('with-hardcoded-ini', 'I', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Patch PHP source code, inject hardcoded INI');
         $package->addBuildOption('enable-zts', null, null, 'Enable thread safe support');
         $package->addBuildOption('no-smoke-test', null, InputOption::VALUE_OPTIONAL, 'Disable smoke test for specific SAPIs, or all if no value provided', false);
@@ -271,14 +268,12 @@ class php extends TargetPackage
             }
         }
         // linux does not support loading shared libraries when target is pure static
-        if ($package->getName() === 'php-embed') {
-            $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
-            if (SystemTarget::getTargetOS() === 'Linux' && ApplicationContext::get(ToolchainInterface::class)->isStatic() && $embed_type === 'shared') {
-                throw new WrongUsageException(
-                    'Linux does not support loading shared libraries when linking libc statically. ' .
-                    'Change SPC_CMD_VAR_PHP_EMBED_TYPE to static.'
-                );
-            }
+        $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
+        if (SystemTarget::getTargetOS() === 'Linux' && ApplicationContext::get(ToolchainInterface::class)->isStatic() && $embed_type === 'shared') {
+            throw new WrongUsageException(
+                'Linux does not support loading shared libraries when linking libc statically. ' .
+                'Change SPC_CMD_VAR_PHP_EMBED_TYPE to static.'
+            );
         }
     }
 
@@ -337,7 +332,7 @@ class php extends TargetPackage
             logger()->info("Adding hardcoded INI [{$source_name} = {$ini_value}]");
         }
         if (!empty($custom_ini)) {
-            ApplicationContext::invoke([SourcePatcher::class, 'patchHardcodedINI'], ['php_source_dir' => $package->getSourceDir(), 'ini' => $custom_ini]);
+            ApplicationContext::invoke([SourcePatcher::class, 'patchHardcodedINI'], [$package->getSourceDir(), $custom_ini]);
         }
 
         // Patch StaticPHP version

src/Package/Target/php/frankenphp.php

@@ -73,7 +73,10 @@ trait frankenphp
             $staticFlags = '';
         }
 
-        $config = new SPCConfigUtil()->config(['frankenphp']);
+        $resolved = array_keys($installer->getResolvedPackages());
+        // remove self from deps
+        $resolved = array_filter($resolved, fn ($pkg_name) => $pkg_name !== $package->getName());
+        $config = new SPCConfigUtil()->config($resolved);
         $cflags = "{$package->getLibExtraCFlags()} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . " -DFRANKENPHP_VERSION={$frankenphp_version}";
         $libs = $config['libs'];
 
@@ -85,13 +88,10 @@ 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' => 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-.*',
+            'CGO_LDFLAGS' => "{$package->getLibExtraLdFlags()} {$staticFlags} {$config['ldflags']} {$libs}",
             'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
                 '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' .
                 '-X \'github.com/caddyserver/caddy/v2/modules/caddyhttp.ServerHeader=FrankenPHP Caddy\' ' .
@@ -101,12 +101,10 @@ trait frankenphp
                 "-tags={$muslTags}nobadger,nomysql,nopgx{$no_brotli}{$no_watcher}",
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ];
-        $pgo = file_exists("{$source_dir}/caddy/frankenphp/default.pgo") ? "--pgo {$source_dir}/caddy/frankenphp/default.pgo " : '';
         InteractiveTerm::setMessage('Building frankenphp: ' . ConsoleColor::yellow('building with xcaddy'));
         shell()->cd(BUILD_LIB_PATH)
             ->setEnv($env)
-            ->exec('go clean -cache') // fix stale include evaluation
-            ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddy_modules}");
+            ->exec("xcaddy build --output frankenphp {$xcaddy_modules}");
 
         $builder->deployBinary(BUILD_LIB_PATH . '/frankenphp', BUILD_BIN_PATH . '/frankenphp');
         $package->setOutput('Binary path for FrankenPHP SAPI', BUILD_BIN_PATH . '/frankenphp');

src/Package/Target/php/pgo.php

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

src/Package/Target/php/unix.php

@@ -20,7 +20,6 @@ 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;
@@ -42,15 +41,6 @@ trait unix
         // php-src patches from micro (reads SPC_MICRO_PATCHES env var)
         SourcePatcher::patchPhpSrc();
 
-        $microFileinfo = "{$package->getSourceDir()}/sapi/micro/php_micro_fileinfo.c";
-        if (is_file($microFileinfo) && !str_contains((string) file_get_contents($microFileinfo), 'Elf32_Shdr')) {
-            FileSystem::replaceFileStr(
-                $microFileinfo,
-                'typedef Elf32_Ehdr Elf_Ehdr;',
-                'typedef Elf32_Ehdr Elf_Ehdr; typedef Elf32_Shdr Elf_Shdr;',
-            );
-        }
-
         // patch configure.ac for musl and musl-toolchain
         $musl = SystemTarget::getTargetOS() === 'Linux' && SystemTarget::getLibc() === 'musl';
         FileSystem::backupFile(SOURCE_PATH . '/php-src/configure.ac');
@@ -69,13 +59,12 @@ trait unix
         }
 
         if (self::getPHPVersionID() >= 80300 && self::getPHPVersionID() < 80400) {
-            SourcePatcher::patchFile('spc_fix_avx512_cache_before_80400.patch', SOURCE_PATH . '/php-src');
+            SourcePatcher::patchFile('spc_fix_avx512_cache_before_80400.patch', $this->getSourceDir());
         }
     }
 
     #[BeforeStage('php', [self::class, 'configureForUnix'], 'php')]
     #[PatchDescription('Patch configure to use -std=gnu17 instead of -std=gnu23 for PHP <= 8.2')]
-    #[PatchDescription('Strip build-time env vars from phpinfo\'s "Configure Command"')]
     public function patchBeforeConfigure(TargetPackage $package): void
     {
         if (SystemTarget::isUnix() && self::getPHPVersionID() < 80300) {
@@ -85,22 +74,6 @@ trait unix
                 "for ac_arg in '' -std=gnu17",
             );
         }
-
-        // strip our build-time env vars from phpinfo's "Configure Command" ('|' delimiter: PHP_BUILD_PROVIDER may contain '#')
-        if (SystemTarget::isUnix()) {
-            FileSystem::replaceFileStr(
-                "{$package->getSourceDir()}/configure",
-                'for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS EXTRA_LDFLAGS_PROGRAM LIBS CC CXX; do',
-                'for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS EXTRA_LDFLAGS_PROGRAM LIBS CC CXX '
-                . 'PKG_CONFIG PKG_CONFIG_PATH EXTENSION_DIR OPENSSL_LIBS '
-                . 'PHP_BUILD_SYSTEM PHP_BUILD_PROVIDER PHP_BUILD_COMPILER PHP_BUILD_ARCH; do',
-            );
-            FileSystem::replaceFileStr(
-                "{$package->getSourceDir()}/configure",
-                'clean_configure_args=$(echo $clean_configure_args | $SED -e "s#\'$var=$val\'##")',
-                'clean_configure_args=$(echo $clean_configure_args | $SED -e "s|\'$var=$val\'||")',
-            );
-        }
     }
 
     #[Stage]
@@ -119,10 +92,12 @@ trait unix
         $args = [];
         $version_id = self::getPHPVersionID();
 
-        // disable undefined behavior sanitizer for zig, trips up on lua minijit and opcache-jit
-        if (SystemTarget::getTargetOS() === 'Linux' && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
-            GlobalEnvManager::putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
+        // disable undefined behavior sanitizer when opcache JIT is enabled (Linux only)
+        if (SystemTarget::getTargetOS() === 'Linux' && !$package->getBuildOption('disable-opcache-jit', false)) {
+            if ($version_id >= 80500 || $installer->isPackageResolved('ext-opcache')) {
+                $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+                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) {
@@ -142,9 +117,6 @@ trait unix
         if ($option = $package->getBuildOption('with-config-file-scan-dir', false)) {
             $args[] = "--with-config-file-scan-dir={$option}";
         }
-        if ($option = $package->getBuildOption('with-sysconfdir', false)) {
-            $args[] = "--sysconfdir={$option}";
-        }
         // perform enable cli options
         $args[] = $installer->isPackageResolved('php-cli') ? '--enable-cli' : '--disable-cli';
         $args[] = $installer->isPackageResolved('php-fpm')
@@ -157,10 +129,6 @@ trait unix
         $args[] = $installer->isPackageResolved('php-cgi') ? '--enable-cgi' : '--disable-cgi';
         $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
         $args[] = $installer->isPackageResolved('php-embed') ? "--enable-embed={$embed_type}" : '--disable-embed';
-        // Cross-compile: pass --host so configure picks the correct fiber asm file and host_cpu logic
-        if ($host_triple = SystemTarget::getAutoconfHostTriple()) {
-            $args[] = "--host={$host_triple}";
-        }
         $args[] = getenv('SPC_EXTRA_PHP_VARS') ?: null;
         $args = implode(' ', array_filter($args));
 
@@ -173,7 +141,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()}",
+            'LDFLAGS' => "-L{$package->getLibDir()} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
             'LIBS' => $vars['EXTRA_LIBS'] ?? '',
         ])->exec("{$cmd} {$args} {$static_extension_str}"), $package->getSourceDir());
     }
@@ -200,7 +168,7 @@ trait unix
 
     #[BeforeStage('php', [self::class, 'makeForUnix'], 'php')]
     #[PatchDescription('Patch Makefile to fix //lib path for Linux builds')]
-    #[PatchDescription('Under CI: patch BUILD_CC to system cc — zig-cc-built minilua segfaults there for reasons we cannot reproduce locally')]
+    #[PatchDescription('Patch BUILD_CC to use system cc instead of zig-cc (prevents minilua crash)')]
     public function tryPatchMakefileUnix(TargetPackage $package, ToolchainInterface $toolchain): void
     {
         if (SystemTarget::getTargetOS() !== 'Linux') {
@@ -210,8 +178,7 @@ trait unix
         // replace //lib with /lib in Makefile
         shell()->cd($package->getSourceDir())->exec('sed -i "s|//lib|/lib|g" Makefile');
 
-        // CI escape hatch: in CI, zig-cc-built minilua segfaults
-        if ($toolchain instanceof ZigToolchain && getenv('CI')) {
+        if ($toolchain instanceof ZigToolchain) {
             $makefile = "{$package->getSourceDir()}/Makefile";
             FileSystem::replaceFileRegex($makefile, '/^BUILD_CC\s*=\s*zig-cc\s*$/m', 'BUILD_CC = cc');
         }
@@ -262,7 +229,6 @@ 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);
@@ -273,13 +239,11 @@ 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);
@@ -290,13 +254,11 @@ 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);
@@ -307,58 +269,43 @@ 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
     {
-        $start = microtime(true);
-        $phar_patched = false;
-        try {
-            if ($installer->isPackageResolved('ext-phar')) {
-                $phar_patched = true;
-                SourcePatcher::patchMicroPhar(self::getPHPVersionID());
-            }
-            InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make 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");
+        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make 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';
-            $builder->deployBinary($package->getSourceDir() . '/sapi/micro/micro.sfx', $dst);
-            // patch after UPX-ed micro.sfx (Linux only)
-            if (SystemTarget::getTargetOS() === 'Linux' && $builder->getOption('with-upx-pack')) {
-                // 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}'");
-                $out[1] = explode(' ', $out[1]);
-                $offset = $out[1][0];
-                if ($ret !== 0 || !str_starts_with($offset, '0x')) {
-                    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();
+        $dst = BUILD_BIN_PATH . '/micro.sfx';
+        $builder->deployBinary($package->getSourceDir() . '/sapi/micro/micro.sfx', $dst);
+        // patch after UPX-ed micro.sfx (Linux only)
+        if (SystemTarget::getTargetOS() === 'Linux' && $builder->getOption('with-upx-pack')) {
+            // 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}'");
+            $out[1] = explode(' ', $out[1]);
+            $offset = $out[1][0];
+            if ($ret !== 0 || !str_starts_with($offset, '0x')) {
+                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);
     }
 
     #[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(),
@@ -372,43 +319,22 @@ 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($vars)
+            ->setEnv($this->makeVars($installer))
             ->exec("{$sed_prefix} \"s|^EXTENSION_DIR = .*|EXTENSION_DIR = /" . basename(BUILD_MODULES_PATH) . '|" Makefile')
-            ->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);
-                }
-            }
-        }
+            ->exec("make -j{$builder->concurrency} INSTALL_ROOT={$root} install-sapi {$install_modules} install-build install-headers install-programs");
 
         // ------------- SPC_CMD_VAR_PHP_EMBED_TYPE=shared -------------
 
-        // 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.)
+        // process libphp.so for shared embed
         $suffix = SystemTarget::getTargetOS() === 'Darwin' ? 'dylib' : 'so';
         $libphp_so = "{$package->getLibDir()}/libphp.{$suffix}";
         if (file_exists($libphp_so)) {
-            if ($release !== null) {
-                $versioned = "{$package->getLibDir()}/libphp-{$release}.{$suffix}";
-                if (file_exists($versioned)) {
-                    @unlink($versioned);
-                }
-                rename($libphp_so, $versioned);
-                symlink(basename($versioned), $libphp_so);
-                $libphp_so = $versioned;
+            // rename libphp.so if -release is set
+            if (SystemTarget::getTargetOS() === 'Linux') {
+                $this->processLibphpSoFile($libphp_so, $installer);
             }
+            // deploy
             $builder->deployBinary($libphp_so, $libphp_so, false);
             $package->setOutput('Library path for embed SAPI', $libphp_so);
         }
@@ -417,9 +343,6 @@ 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);
         }
@@ -427,11 +350,6 @@ 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)
@@ -441,6 +359,9 @@ 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]
@@ -473,15 +394,8 @@ trait unix
         try {
             logger()->debug('Building shared extensions...');
             foreach ($shared_extensions as $extension) {
-                $ext_start = microtime(true);
-                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);
+                InteractiveTerm::setMessage('Building shared PHP extension: ' . ConsoleColor::yellow($extension->getName()));
+                $extension->buildShared();
             }
         } finally {
             // restore php-config
@@ -573,8 +487,6 @@ trait unix
             $package->runStage([$this, 'makeForUnix']);
         }
 
-        // shared extensions build before frankenphp so their undefined references are
-        // collected into libphp's exported dynamic-symbol list.
         $package->runStage([$this, 'unixBuildSharedExt']);
     }
 
@@ -687,7 +599,7 @@ trait unix
         copy(ROOT_DIR . '/src/globals/common-tests/embed.c', $sample_file_path . '/embed.c');
         copy(ROOT_DIR . '/src/globals/common-tests/embed.php', $sample_file_path . '/embed.php');
 
-        $config = new SPCConfigUtil()->config(['php']);
+        $config = new SPCConfigUtil()->config($installer->getAvailableResolvedPackageNames());
         $lens = "{$config['cflags']} {$config['ldflags']} {$config['libs']}";
         if ($toolchain->isStatic()) {
             $lens .= ' -static';
@@ -768,37 +680,96 @@ 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.
      */
     private function makeVars(PackageInstaller $installer): array
     {
-        $config = new SPCConfigUtil(['libs_only_deps' => true])->config(['php']);
+        $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' => $extra_ldflags,
-            'EXTRA_LDFLAGS_PROGRAM' => $extra_ldflags_program,
+            'EXTRA_LDFLAGS_PROGRAM' => deduplicate_flags(getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') . " {$config['ldflags']} {$static} {$pie}"),
+            'EXTRA_LDFLAGS' => $config['ldflags'],
             'EXTRA_LIBS' => $libs,
         ]);
     }

src/Package/Target/php/windows.php

@@ -512,6 +512,7 @@ HEADER;
             $vc_matches = ['unknown', 'unknown'];
         } else {
             $vc_matches = match ($vc['major_version']) {
+                '18', // VS 2026 shares the VS2022 (v143) runtime conventions, so it reports as VS17.
                 '17' => ['VS17', 'Visual C++ 2022'],
                 '16' => ['VS16', 'Visual C++ 2019'],
                 default => ['unknown', 'unknown'],

src/StaticPHP/Artifact/Artifact.php

@@ -27,18 +27,12 @@ class Artifact
     /** @var null|callable Bind custom source fetcher callback */
     protected mixed $custom_source_callback = null;
 
-    /** @var null|string Display label describing where the custom source callback came from */
-    protected ?string $custom_source_callback_origin = null;
-
     /** @var null|callable Bind custom source check-update callback */
     protected mixed $custom_source_check_update_callback = null;
 
     /** @var array<string, callable> Bind custom binary fetcher callbacks */
     protected mixed $custom_binary_callbacks = [];
 
-    /** @var array<string, string> Display label per platform describing where the custom binary callback came from */
-    protected array $custom_binary_callback_origins = [];
-
     /** @var array<string, callable> Bind custom binary check-update callbacks */
     protected array $custom_binary_check_update_callbacks = [];
 
@@ -291,19 +285,15 @@ class Artifact
      * Get source extraction directory.
      *
      * Rules:
-     * 1. If cache_type is 'local': use the absolute dirname recorded at download time (no symlink/copy).
-     * 2. If extract is not specified: SOURCE_PATH/{artifact_name}
-     * 3. If extract is relative path: SOURCE_PATH/{value}
-     * 4. If extract is absolute path: {value}
-     * 5. If extract is array (dict): handled by extractor (selective extraction)
+     * 1. If extract is not specified: SOURCE_PATH/{artifact_name}
+     * 2. If extract is relative path: SOURCE_PATH/{value}
+     * 3. If extract is absolute path: {value}
+     * 4. If extract is array (dict): handled by extractor (selective extraction)
      */
     public function getSourceDir(): string
     {
         // Prefer cache extract path, fall back to config
         $cache_info = ApplicationContext::get(ArtifactCache::class)->getSourceInfo($this->name);
-        if (($cache_info['cache_type'] ?? null) === 'local' && isset($cache_info['dirname'])) {
-            return FileSystem::convertPath($cache_info['dirname']);
-        }
         $extract = is_string($cache_info['extract'] ?? null)
             ? $cache_info['extract']
             : ($this->config['source']['extract'] ?? null);
@@ -417,13 +407,10 @@ class Artifact
 
     /**
      * Set custom source fetcher callback.
-     *
-     * @param string $origin Short label shown in progress output (e.g. 'package downloader', 'custom url')
      */
-    public function setCustomSourceCallback(callable $callback, string $origin = 'package downloader'): void
+    public function setCustomSourceCallback(callable $callback): void
     {
         $this->custom_source_callback = $callback;
-        $this->custom_source_callback_origin = $origin;
     }
 
     public function getCustomSourceCallback(): ?callable
@@ -431,11 +418,6 @@ class Artifact
         return $this->custom_source_callback ?? null;
     }
 
-    public function getCustomSourceCallbackOrigin(): ?string
-    {
-        return $this->custom_source_callback_origin;
-    }
-
     /**
      * Set custom source check-update callback.
      */
@@ -470,19 +452,11 @@ class Artifact
      *
      * @param string   $target_os Target OS platform string (e.g. linux-x86_64)
      * @param callable $callback  Custom binary fetcher callback
-     * @param string   $origin    Short label shown in progress output (e.g. 'package downloader')
      */
-    public function setCustomBinaryCallback(string $target_os, callable $callback, string $origin = 'package downloader'): void
+    public function setCustomBinaryCallback(string $target_os, callable $callback): void
     {
         ConfigValidator::validatePlatformString($target_os);
         $this->custom_binary_callbacks[$target_os] = $callback;
-        $this->custom_binary_callback_origins[$target_os] = $origin;
-    }
-
-    public function getCustomBinaryCallbackOrigin(): ?string
-    {
-        $current_platform = SystemTarget::getCurrentPlatformString();
-        return $this->custom_binary_callback_origins[$current_platform] ?? null;
     }
 
     /**

src/StaticPHP/Artifact/ArtifactDownloader.php

@@ -317,10 +317,7 @@ class ArtifactDownloader
             if (!is_dir(DOWNLOAD_PATH)) {
                 FileSystem::createDir(DOWNLOAD_PATH);
             }
-            $pending = array_values(array_filter($this->artifacts, fn ($a) => $this->generateQueue($a) !== []));
-            if ($pending !== []) {
-                logger()->info('Downloading' . implode(', ', array_map(fn ($x) => " '{$x->getName()}'", $pending)) . " with concurrency {$this->parallel} ...");
-            }
+            logger()->info('Downloading' . implode(', ', array_map(fn ($x) => " '{$x->getName()}'", $this->artifacts)) . " with concurrency {$this->parallel} ...");
             // Download artifacts parallelly
             if ($this->parallel > 1) {
                 $this->downloadWithConcurrency();
@@ -554,8 +551,8 @@ class ArtifactDownloader
                 $instance = null;
                 $call = $this->downloaders[$item['config']['type']] ?? null;
                 $type_display_name = match (true) {
-                    $item['lock'] === 'source' && $artifact->getCustomSourceCallback() !== null => $artifact->getCustomSourceCallbackOrigin() ?? 'source package downloader',
-                    $item['lock'] === 'binary' && $artifact->getCustomBinaryCallback() !== null => $artifact->getCustomBinaryCallbackOrigin() ?? 'binary package downloader',
+                    $item['lock'] === 'source' && ($callback = $artifact->getCustomSourceCallback()) !== null => 'user defined source downloader',
+                    $item['lock'] === 'binary' && ($callback = $artifact->getCustomBinaryCallback()) !== null => 'user defined binary downloader',
                     default => SPC_DOWNLOAD_TYPE_DISPLAY_NAME[$item['config']['type']] ?? $item['config']['type'],
                 };
                 $try_h = $try ? 'Try downloading' : 'Downloading';
@@ -734,16 +731,6 @@ class ArtifactDownloader
         $binary_downloaded = $artifact->isBinaryDownloaded(compare_hash: true);
         $source_downloaded = $artifact->isSourceDownloaded(compare_hash: true);
 
-        if ($source_downloaded && $artifact->getName() === 'php-src' && ($requested = $this->getOption('with-php'))) {
-            $info = ApplicationContext::get(ArtifactCache::class)->getSourceInfo('php-src');
-            $cv = $info['version'] ?? null;
-            $ct = $info['cache_type'] ?? null;
-            $matches = $requested === 'git' ? $ct === 'git' : ($cv !== null && $ct !== 'git' && ($cv === $requested || str_starts_with($cv, $requested . '.')));
-            if (!$matches) {
-                $source_downloaded = false;
-            }
-        }
-
         $item_source = ['display' => 'source', 'lock' => 'source', 'config' => $artifact->getDownloadConfig('source')];
         $item_source_mirror = ['display' => 'source (mirror)', 'lock' => 'source', 'config' => $artifact->getDownloadConfig('source-mirror')];
 
@@ -838,21 +825,21 @@ class ArtifactDownloader
             if (isset($this->artifacts[$artifact_name])) {
                 $this->artifacts[$artifact_name]->setCustomSourceCallback(function (ArtifactDownloader $downloader) use ($artifact_name, $custom_url) {
                     return (new Url())->download($artifact_name, ['url' => $custom_url], $downloader);
-                }, 'custom url');
+                });
             }
         }
         foreach ($this->custom_gits as $artifact_name => [$branch, $git_url]) {
             if (isset($this->artifacts[$artifact_name])) {
                 $this->artifacts[$artifact_name]->setCustomSourceCallback(function (ArtifactDownloader $downloader) use ($artifact_name, $branch, $git_url) {
                     return (new Git())->download($artifact_name, ['rev' => $branch, 'url' => $git_url], $downloader);
-                }, 'custom git');
+                });
             }
         }
         foreach ($this->custom_locals as $artifact_name => $local_path) {
             if (isset($this->artifacts[$artifact_name])) {
                 $this->artifacts[$artifact_name]->setCustomSourceCallback(function (ArtifactDownloader $downloader) use ($artifact_name, $local_path) {
                     return (new LocalDir())->download($artifact_name, ['dirname' => $local_path], $downloader);
-                }, 'custom local dir');
+                });
             }
         }
     }

src/StaticPHP/Artifact/ArtifactExtractor.php

@@ -136,12 +136,6 @@ class ArtifactExtractor
             throw new WrongUsageException("Artifact source [{$name}] not downloaded, please download it first!");
         }
 
-        // Local (--custom-local): source lives in place at $cache_info['dirname'].
-        if (($cache_info['cache_type'] ?? null) === 'local') {
-            $artifact->emitAfterSourceExtract($artifact->getSourceDir());
-            return SPC_STATUS_ALREADY_EXTRACTED;
-        }
-
         $source_file = $this->cache->getCacheFullPath($cache_info);
         $target_path = $artifact->getSourceDir();
 
@@ -177,12 +171,8 @@ class ArtifactExtractor
             return SPC_STATUS_ALREADY_EXTRACTED;
         }
 
-        // Remove old directory if hash mismatch.
-        // Guard: a symlink at $target_path (left over from older local-source handling) must be
-        // unlinked directly — never recurse into the link target, that would wipe the user's tree.
-        if (is_link($target_path)) {
-            @unlink($target_path);
-        } elseif (is_dir($target_path)) {
+        // Remove old directory if hash mismatch
+        if (is_dir($target_path)) {
             logger()->notice("Source [{$name}] hash mismatch, re-extracting...");
             FileSystem::removeDir($target_path);
         }

src/StaticPHP/Artifact/Downloader/Type/FileList.php

@@ -45,7 +45,11 @@ class FileList implements DownloadTypeInterface, CheckUpdateInterface
             throw new DownloaderException("Failed to get {$name} file list from {$config['url']}");
         }
         $versions = [];
-        logger()->debug('Matched ' . count($matches['version']) . " versions for {$name}");
+        $cnt = count($matches['version']);
+        if ($cnt === 0) {
+            throw new DownloaderException("Failed to get {$name} file list from {$config['url']}: no version parsed");
+        }
+        logger()->debug("Matched {$cnt} versions for {$name}");
         foreach ($matches['version'] as $i => $version) {
             $lower = strtolower($version);
             foreach (['alpha', 'beta', 'rc', 'pre', 'nightly', 'snapshot', 'dev'] as $beta) {

src/StaticPHP/Artifact/Downloader/Type/GitHubRelease.php

@@ -57,16 +57,6 @@ class GitHubRelease implements DownloadTypeInterface, ValidatorInterface, CheckU
         if (!is_array($data)) {
             throw new DownloaderException("Failed to get GitHub release API info for {$repo} from {$url}");
         }
-        // GitHub's /releases list is ordered by publish date, so a newer-tagged prerelease
-        // (e.g. 2.2.x-alpha) can precede the latest stable (2.1.x-stable). /releases/latest
-        // returns the semantically latest stable release regardless of order; check it first.
-        if ($prefer_stable) {
-            $latest_url = str_replace('{repo}', $repo, self::API_URL) . '/latest';
-            $latest = json_decode(default_shell()->executeCurl($latest_url, headers: $headers, retries: $retries) ?: '', true);
-            if (is_array($latest) && isset($latest['assets'])) {
-                array_unshift($data, $latest);
-            }
-        }
         foreach ($data as $release) {
             if ($prefer_stable && $release['prerelease'] === true) {
                 continue;

src/StaticPHP/Artifact/Downloader/Type/GitHubTokenSetupTrait.php

@@ -14,18 +14,17 @@ trait GitHubTokenSetupTrait
     public static function getGitHubTokenHeadersStatic(): array
     {
         // GITHUB_TOKEN support
-        $token = getenv('GITHUB_TOKEN');
-        if ($token === false || $token === '') {
-            return [];
-        }
-        if (($user = getenv('GITHUB_USER')) !== false && $user !== '') {
+        if (($token = getenv('GITHUB_TOKEN')) !== false && ($user = getenv('GITHUB_USER')) !== false) {
             logger()->debug("Using 'GITHUB_TOKEN' with user {$user} for authentication");
             $encoded = base64_encode("{$user}:{$token}");
             spc_add_log_filter([$user, $token, $encoded]);
             return ["Authorization: Basic {$encoded}"];
         }
-        logger()->debug("Using 'GITHUB_TOKEN' for authentication");
-        spc_add_log_filter($token);
-        return ["Authorization: Bearer {$token}"];
+        if (($token = getenv('GITHUB_TOKEN')) !== false) {
+            logger()->debug("Using 'GITHUB_TOKEN' for authentication");
+            spc_add_log_filter($token);
+            return ["Authorization: Bearer {$token}"];
+        }
+        return [];
     }
 }

src/StaticPHP/Artifact/Downloader/Type/PIE.php

@@ -22,13 +22,12 @@ class PIE implements DownloadTypeInterface, CheckUpdateInterface
         if (!$dist_url || !$dist_type) {
             throw new DownloaderException("failed to find {$name} dist info from packagist");
         }
-        $extract = $config['extract'] ?? ('php-src/ext/' . strtolower(preg_replace('/^ext-/i', '', $name)));
         $name = str_replace('/', '_', $config['repo']);
         $version = $first['version'] ?? 'unknown';
         $filename = "{$name}-{$version}." . ($dist_type === 'zip' ? 'zip' : 'tar.gz');
         $path = DOWNLOAD_PATH . DIRECTORY_SEPARATOR . $filename;
         default_shell()->executeCurlDownload($dist_url, $path, retries: $downloader->getRetry());
-        return DownloadResult::archive($filename, $config, $extract, version: $version, downloader: static::class);
+        return DownloadResult::archive($filename, $config, $config['extract'] ?? null, version: $version, downloader: static::class);
     }
 
     public function checkUpdate(string $name, array $config, ?string $old_version, ArtifactDownloader $downloader): CheckUpdateResult
@@ -57,23 +56,7 @@ class PIE implements DownloadTypeInterface, CheckUpdateInterface
         if (!isset($data['packages'][$config['repo']]) || !is_array($data['packages'][$config['repo']])) {
             throw new DownloaderException("failed to find {$name} repo info from packagist");
         }
-        // p2 metadata is minified: each entry only carries fields changed vs the previous one, '__unset' removes a field
-        $releases = [];
-        $current = [];
-        foreach ($data['packages'][$config['repo']] as $release) {
-            $current = array_merge($current, $release);
-            $current = array_filter($current, static fn ($v) => $v !== '__unset');
-            $releases[] = $current;
-        }
-        // packagist lists newest first including RC/beta/alpha — pick the newest stable release
-        $first = null;
-        foreach ($releases as $release) {
-            if (!preg_match('/[._-]?(?:alpha|a|beta|b|rc)[._-]?\d*$/i', $release['version'] ?? '')) {
-                $first = $release;
-                break;
-            }
-        }
-        $first ??= $releases[0] ?? [];
+        $first = $data['packages'][$config['repo']][0] ?? [];
         if (!isset($first['php-ext'])) {
             throw new DownloaderException("failed to find {$name} php-ext info from packagist, maybe not a php extension package");
         }

src/StaticPHP/Command/BaseCommand.php

@@ -54,6 +54,10 @@ abstract class BaseCommand extends Command
         }
 
         set_error_handler(static function ($error_no, $error_msg, $error_file, $error_line) {
+            // Respect the @ suppression operator (error_reporting() returns 0 when @ is used)
+            if (error_reporting() === 0) {
+                return true;
+            }
             $tips = [
                 E_WARNING => ['PHP Warning: ', 'warning'],
                 E_NOTICE => ['PHP Notice: ', 'notice'],

src/StaticPHP/Command/CraftCommand.php

@@ -4,18 +4,12 @@ declare(strict_types=1);
 
 namespace StaticPHP\Command;
 
-use StaticPHP\Config\PackageConfig;
 use StaticPHP\DI\ApplicationContext;
 use StaticPHP\Doctor\Doctor;
 use StaticPHP\Exception\ValidationException;
 use StaticPHP\Package\PackageBuilder;
 use StaticPHP\Package\PackageInstaller;
-use StaticPHP\Registry\PackageLoader;
-use StaticPHP\Toolchain\ToolchainManager;
-use StaticPHP\Util\DependencyResolver;
 use StaticPHP\Util\FileSystem;
-use StaticPHP\Util\GlobalEnvManager;
-use StaticPHP\Util\Pgo\PgoContext;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Yaml\Exception\ParseException;
@@ -27,8 +21,6 @@ class CraftCommand extends BaseCommand
     public function configure(): void
     {
         $this->addArgument('craft', null, 'Path to craft.yml file', WORKING_DIR . '/craft.yml');
-        $this->addOption('libs-only', null, null, 'Build only the libraries needed by the configured extensions (skip PHP and SAPI build).');
-        PgoContext::registerOptions($this);
     }
 
     public function handle(): int
@@ -47,13 +39,6 @@ class CraftCommand extends BaseCommand
         // apply env
         array_walk($craft['extra-env'], fn ($v, $k) => f_putenv("{$k}={$v}"));
 
-        // re-substitute env.ini's CC=${SPC_DEFAULT_CC} bindings.
-        ToolchainManager::initToolchain();
-        GlobalEnvManager::reapplyOsIni();
-
-        // stash craft for doctor checks that depend on what's being built (e.g. frankenphp → go-xcaddy)
-        ApplicationContext::set('craft', $craft);
-
         // run doctor
         if ($craft['craft-options']['doctor']) {
             $doctor = new Doctor($this->output, FIX_POLICY_AUTOFIX);
@@ -98,84 +83,23 @@ class CraftCommand extends BaseCommand
             FileSystem::resetDir(SOURCE_PATH);
         }
 
-        $pgo = $this->getOption('libs-only') ? null : PgoContext::tryFromInput($this->input, $craft['sapi'], $build_options);
-
         $starttime = microtime(true);
         // run installer
         $installer = new PackageInstaller($build_options);
         ApplicationContext::get(PackageBuilder::class)->setArgument('extensions', implode(',', $craft['extensions']));
-
-        if ($this->getOption('libs-only')) {
-            $with_suggests = (bool) ($craft['build-options']['with-suggests'] ?? false);
-            $libs = $this->resolveLibsForExtensions($craft, $with_suggests);
-            if ($libs === []) {
-                $this->output->writeln('<comment>No libraries needed for the configured extensions; nothing to do.</comment>');
-                return static::SUCCESS;
-            }
-            foreach ($libs as $lib) {
-                $installer->addBuildPackage($lib);
-            }
-        } else {
-            $installer->addBuildPackage('php');
-        }
+        $installer->addBuildPackage('php');
         $installer->run(true);
 
         $usedtime = round(microtime(true) - $starttime, 1);
-        $tag = $pgo !== null ? " (PGO {$pgo->mode})" : '';
         $this->output->writeln("\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
-        $this->output->writeln("<info>✔ BUILD SUCCESSFUL{$tag} ({$usedtime} s)</info>");
+        $this->output->writeln("<info>✔ BUILD SUCCESSFUL ({$usedtime} s)</info>");
         $this->output->writeln("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n");
 
-        if ($pgo !== null && $pgo->isInstrument()) {
-            $this->output->writeln("<comment>Next: exercise the instrumented binary, then re-run craft with --pgo to consume {$pgo->profileRoot}.</comment>");
-        }
-
         $installer->printBuildPackageOutputs();
 
         return static::SUCCESS;
     }
 
-    /** @return list<string> library package names transitively required by the configured extensions and SAPIs */
-    private function resolveLibsForExtensions(array $craft, bool $include_suggests): array
-    {
-        $exts = array_merge($craft['extensions'], $craft['shared-extensions'] ?? []);
-        $ext_pkgs = array_map(fn ($x) => "ext-{$x}", $exts);
-        $extra = $craft['packages'] ?? [];
-
-        // SAPI targets contribute their own lib deps/suggests (frankenphp → brotli/watcher,
-        // php-fpm → libacl); resolve them too so the buildroot contains everything the
-        // full build will need. Sapi names map to packages either directly or as php-<name>.
-        $sapi_pkgs = [];
-        foreach ($craft['sapi'] ?? [] as $sapi) {
-            foreach ([$sapi, "php-{$sapi}"] as $candidate) {
-                if (PackageLoader::hasPackage($candidate)) {
-                    $sapi_pkgs[] = $candidate;
-                    break;
-                }
-            }
-        }
-
-        $resolved = DependencyResolver::resolve(
-            array_merge($ext_pkgs, $extra, $sapi_pkgs),
-            include_suggests: $include_suggests,
-        );
-
-        $libs = [];
-        foreach ($resolved as $pkg_name) {
-            if (str_starts_with($pkg_name, 'ext-') || !PackageLoader::hasPackage($pkg_name)) {
-                continue;
-            }
-            $type = PackageLoader::getPackage($pkg_name)->getType();
-            // Pure libraries, plus library-producing targets (curl ships libcurl.a): both
-            // must land in the buildroot, or the full build rebuilds them on every run.
-            if ($type === 'library'
-                || ($type === 'target' && PackageConfig::get($pkg_name, 'static-libs', []) !== [])) {
-                $libs[] = $pkg_name;
-            }
-        }
-        return $libs;
-    }
-
     /**
      * Validate and parse craft.yml file to array.
      *
@@ -186,7 +110,7 @@ class CraftCommand extends BaseCommand
      *     shared-extensions: array<string>,
      *     packages: array<string>,
      *     sapi: array<string>,
-     *     verbosity: int,
+     *     verbosity: 128|16|256|32|64|8,
      *     debug: bool,
      *     clean-build: bool,
      *     build-options: array<string, mixed>,
@@ -247,11 +171,16 @@ class CraftCommand extends BaseCommand
         }
 
         // verbosity
-        $verbosity_level = $craft['verbosity'] ?? OutputInterface::VERBOSITY_NORMAL;
         $debug = $craft['debug'] ?? false;
-        if ($debug) {
-            $verbosity_level = OutputInterface::VERBOSITY_DEBUG;
-        }
+        $verbosity_level = $debug
+            ? OutputInterface::VERBOSITY_DEBUG
+            : match ((int) ($craft['verbosity'] ?? 0)) {
+                OutputInterface::VERBOSITY_QUIET => OutputInterface::VERBOSITY_QUIET,
+                OutputInterface::VERBOSITY_VERBOSE => OutputInterface::VERBOSITY_VERBOSE,
+                OutputInterface::VERBOSITY_VERY_VERBOSE => OutputInterface::VERBOSITY_VERY_VERBOSE,
+                OutputInterface::VERBOSITY_DEBUG => OutputInterface::VERBOSITY_DEBUG,
+                default => OutputInterface::VERBOSITY_NORMAL,
+            };
         $craft['verbosity'] = $verbosity_level;
 
         // clean-build (if true, reset before all builds)

src/StaticPHP/Command/Dev/GenExtTestMatrixCommand.php

@@ -16,7 +16,7 @@ class GenExtTestMatrixCommand extends BaseCommand
 
     private const array OS_RUNNERS = [
         'linux' => ['arch' => 'x86_64', 'runner' => 'ubuntu-latest', 'os_key' => 'Linux'],
-        'windows' => ['arch' => 'x86_64', 'runner' => 'windows-latest', 'os_key' => 'Windows'],
+        'windows' => ['arch' => 'x86_64', 'runner' => 'windows-2025', 'os_key' => 'Windows'],
         'macos' => ['arch' => 'aarch64', 'runner' => 'macos-15', 'os_key' => 'Darwin'],
     ];
 
@@ -60,6 +60,8 @@ class GenExtTestMatrixCommand extends BaseCommand
         'glfw',
         'imagick',
         'intl',
+        'mongodb',
+        'gmssl',
     ];
 
     /**

src/StaticPHP/Command/Dev/TestBotCommand.php

@@ -154,7 +154,7 @@ class TestBotCommand extends BaseCommand
             'targets' => array_values($targets),
             'gen_matrix_args' => $gen_matrix_args,
             'gen_matrix_args_tier2' => $gen_matrix_args_tier2,
-            'php_versions' => array_values($php_versions),
+            'php_versions' => $php_versions,
             'tier2' => $tier2,
             'comment_body' => $comment_body,
         ];

src/StaticPHP/Command/ExtractCommand.php

@@ -10,7 +10,6 @@ use StaticPHP\DI\ApplicationContext;
 use StaticPHP\Registry\ArtifactLoader;
 use StaticPHP\Registry\PackageLoader;
 use StaticPHP\Util\DependencyResolver;
-use StaticPHP\Util\GlobalEnvManager;
 use StaticPHP\Util\InteractiveTerm;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
@@ -35,7 +34,6 @@ class ExtractCommand extends BaseCommand
 
     public function handle(): int
     {
-        GlobalEnvManager::afterInit();
         $cache = ApplicationContext::get(ArtifactCache::class);
         $extractor = new ArtifactExtractor($cache);
         $force_source = (bool) $this->getOption('source-only');

src/StaticPHP/Command/ResetCommand.php

@@ -4,13 +4,14 @@ declare(strict_types=1);
 
 namespace StaticPHP\Command;
 
+use StaticPHP\Exception\SPCInternalException;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\InteractiveTerm;
 use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputOption;
-
-use function Laravel\Prompts\confirm;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 #[AsCommand('reset')]
 class ResetCommand extends BaseCommand
@@ -46,7 +47,11 @@ class ResetCommand extends BaseCommand
 
         // Confirm with user unless --yes is specified
         if (!$this->input->getOption('yes')) {
-            if (!confirm('Are you sure you want to continue?', false)) {
+            $helper = $this->getHelper('question');
+            if (!$helper instanceof QuestionHelper) {
+                throw new SPCInternalException('Question helper not provided');
+            }
+            if (!$helper->ask($this->input, $this->output, new ConfirmationQuestion('Are you sure you want to continue? [y/N] ', false))) {
                 InteractiveTerm::error(message: 'Reset operation cancelled.');
                 return static::SUCCESS;
             }

src/StaticPHP/Command/SPCConfigCommand.php

@@ -44,7 +44,7 @@ class SPCConfigCommand extends BaseCommand
             'absolute_libs' => (bool) $this->getOption('absolute-libs'),
         ]);
         $packages = array_merge(array_map(fn ($x) => "ext-{$x}", $extensions), $libraries);
-        $config = $util->config($packages);
+        $config = $util->config($packages, $include_suggests);
 
         $this->output->writeln(match (true) {
             $this->getOption('includes') => $config['cflags'],

src/StaticPHP/Config/ArtifactConfig.php

@@ -38,7 +38,7 @@ class ArtifactConfig
      */
     public static function loadFromFile(string $file, string $registry_name): string
     {
-        $content = file_get_contents($file);
+        $content = @file_get_contents($file);
         if ($content === false) {
             throw new WrongUsageException("Failed to read artifact config file: {$file}");
         }

src/StaticPHP/Config/PackageConfig.php

@@ -46,7 +46,7 @@ class PackageConfig
      */
     public static function loadFromFile(string $file, string $registry_name): string
     {
-        $content = file_get_contents($file);
+        $content = @file_get_contents($file);
         if ($content === false) {
             throw new WrongUsageException("Failed to read package config file: {$file}");
         }

src/StaticPHP/DI/ApplicationContext.php

@@ -79,11 +79,11 @@ class ApplicationContext
     /**
      * Get a service from the container.
      *
-     * @template T
+     * @template T of object
      *
-     * @param class-string<T> $id Service identifier
+     * @param class-string<T>|string $id Service identifier
      *
-     * @return null|T
+     * @return ($id is class-string<T> ? T : mixed)
      */
     public static function get(string $id): mixed
     {
@@ -98,25 +98,6 @@ class ApplicationContext
         return self::getContainer()->has($id);
     }
 
-    /**
-     * Resolve $id, returning null if it can't be constructed.
-     * PHP-DI's has() returns true for any autowirable class even when get()
-     * would throw on missing scalar args — for "is this resolvable right now"
-     * semantics use this.
-     *
-     * @template T
-     * @param  class-string<T> $id
-     * @return null|T
-     */
-    public static function tryGet(string $id): mixed
-    {
-        try {
-            return self::getContainer()->get($id);
-        } catch (\Throwable) {
-            return null;
-        }
-    }
-
     /**
      * Set a service in the container.
      * Use sparingly - prefer configuration-based definitions.

src/StaticPHP/Doctor/Doctor.php

@@ -11,11 +11,14 @@ use StaticPHP\Registry\DoctorLoader;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Util\InteractiveTerm;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
 use ZM\Logger\ConsoleColor;
 
-use function Laravel\Prompts\confirm;
-
 readonly class Doctor
 {
     public function __construct(private ?OutputInterface $output = null, private int $auto_fix = FIX_POLICY_PROMPT, public readonly bool $interactive = true)
@@ -125,9 +128,14 @@ readonly class Doctor
             return false;
         }
         // prompt for fix
-        if ($this->auto_fix === FIX_POLICY_PROMPT && !confirm('Do you want to try to fix this issue now?')) {
-            $this->output?->writeln('<comment>You canceled fix.</comment>');
-            return false;
+        if ($this->auto_fix === FIX_POLICY_PROMPT) {
+            $helper = new QuestionHelper();
+            $input = ApplicationContext::has(InputInterface::class) ? ApplicationContext::get(InputInterface::class) : new ArrayInput([]);
+            $output = ApplicationContext::has(OutputInterface::class) ? ApplicationContext::get(OutputInterface::class) : $this->output ?? new ConsoleOutput();
+            if (!$helper->ask($input, $output, new ConfirmationQuestion('Do you want to try to fix this issue now? [Y/n] ', true))) {
+                $this->output?->writeln('<comment>You canceled fix.</comment>');
+                return false;
+            }
         }
         // perform fix
         InteractiveTerm::indicateProgress("Fixing {$result->getFixItem()} ... ");

src/StaticPHP/Doctor/Item/GoXcaddyCheck.php

@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StaticPHP\Doctor\Item;
-
-use StaticPHP\Attribute\Doctor\CheckItem;
-use StaticPHP\Attribute\Doctor\FixItem;
-use StaticPHP\Attribute\Doctor\OptionalCheck;
-use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Doctor\CheckResult;
-use StaticPHP\Package\PackageInstaller;
-
-#[OptionalCheck([self::class, 'optionalCheck'])]
-class GoXcaddyCheck
-{
-    public static function optionalCheck(): bool
-    {
-        if (!ApplicationContext::has('craft')) {
-            return false;
-        }
-        /** @var null|array $craft */
-        $craft = ApplicationContext::get('craft');
-        return in_array('frankenphp', $craft['sapi'] ?? [], true);
-    }
-
-    #[CheckItem('if go-xcaddy is installed', level: 800)]
-    public function check(): CheckResult
-    {
-        if (!new PackageInstaller()->addInstallPackage('go-xcaddy')->isPackageInstalled('go-xcaddy')) {
-            return CheckResult::fail('go-xcaddy is not installed', 'install-go-xcaddy');
-        }
-        return CheckResult::ok(PKG_ROOT_PATH . '/go-xcaddy/bin/xcaddy');
-    }
-
-    #[FixItem('install-go-xcaddy')]
-    public function installGoXcaddy(): bool
-    {
-        $installer = new PackageInstaller(interactive: false);
-        $installer->addInstallPackage('go-xcaddy');
-        $installer->run(true);
-        return $installer->isPackageInstalled('go-xcaddy');
-    }
-}

src/StaticPHP/Doctor/Item/LlvmCompilerRtCheck.php

@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StaticPHP\Doctor\Item;
-
-use Package\Artifact\llvm_compiler_rt;
-use Package\Artifact\zig;
-use StaticPHP\Attribute\Doctor\CheckItem;
-use StaticPHP\Attribute\Doctor\FixItem;
-use StaticPHP\Attribute\Doctor\OptionalCheck;
-use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Doctor\CheckResult;
-use StaticPHP\Package\PackageInstaller;
-use StaticPHP\Runtime\SystemTarget;
-use StaticPHP\Toolchain\Interface\ToolchainInterface;
-use StaticPHP\Toolchain\ZigToolchain;
-
-#[OptionalCheck([self::class, 'optionalCheck'])]
-class LlvmCompilerRtCheck
-{
-    public static function optionalCheck(): bool
-    {
-        return ApplicationContext::get(ToolchainInterface::class) instanceof ZigToolchain;
-    }
-
-    /** @noinspection PhpUnused */
-    #[CheckItem('if llvm-compiler-rt is built for current target', level: 799)]
-    public function checkLlvmCompilerRt(): CheckResult
-    {
-        $libDir = zig::path() . '/lib/' . SystemTarget::getCanonicalTriple();
-        if (new llvm_compiler_rt()->isBuilt($libDir)) {
-            return CheckResult::ok($libDir);
-        }
-        return CheckResult::fail('llvm-compiler-rt is not built for ' . SystemTarget::getCanonicalTriple(), 'build-llvm-compiler-rt');
-    }
-
-    #[FixItem('build-llvm-compiler-rt')]
-    public function fixLlvmCompilerRt(): bool
-    {
-        $installer = new PackageInstaller(interactive: false);
-        $installer->addInstallPackage('llvm-compiler-rt');
-        $installer->run(true);
-        new llvm_compiler_rt()->buildForTriple();
-        $libDir = zig::path() . '/lib/' . SystemTarget::getCanonicalTriple();
-        return new llvm_compiler_rt()->isBuilt($libDir);
-    }
-}

src/StaticPHP/Doctor/Item/LlvmToolsCheck.php

@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StaticPHP\Doctor\Item;
-
-use Package\Artifact\llvm_tools;
-use StaticPHP\Attribute\Doctor\CheckItem;
-use StaticPHP\Attribute\Doctor\FixItem;
-use StaticPHP\Attribute\Doctor\OptionalCheck;
-use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Doctor\CheckResult;
-use StaticPHP\Package\PackageInstaller;
-use StaticPHP\Toolchain\Interface\ToolchainInterface;
-use StaticPHP\Toolchain\ZigToolchain;
-
-#[OptionalCheck([self::class, 'optionalCheck'])]
-class LlvmToolsCheck
-{
-    public static function optionalCheck(): bool
-    {
-        return ApplicationContext::get(ToolchainInterface::class) instanceof ZigToolchain;
-    }
-
-    /** @noinspection PhpUnused */
-    #[CheckItem('if llvm-tools (objcopy/strip/profdata) are built', level: 798)]
-    public function checkLlvmTools(): CheckResult
-    {
-        $binDir = PKG_ROOT_PATH . '/llvm-tools/bin';
-        if (new llvm_tools()->allBuilt($binDir)) {
-            return CheckResult::ok($binDir);
-        }
-        return CheckResult::fail('llvm-tools are not built', 'build-llvm-tools');
-    }
-
-    #[FixItem('build-llvm-tools')]
-    public function fixLlvmTools(): bool
-    {
-        $installer = new PackageInstaller(interactive: false);
-        $installer->addInstallPackage('llvm-tools');
-        $installer->run(true);
-        new llvm_tools()->buildForHost();
-        return new llvm_tools()->allBuilt(PKG_ROOT_PATH . '/llvm-tools/bin');
-    }
-}

src/StaticPHP/Doctor/Item/MacOSToolCheck.php

@@ -33,15 +33,20 @@ class MacOSToolCheck
         'glibtoolize',
     ];
 
-    #[CheckItem('if homebrew has installed', limit_os: 'Darwin', level: 998)]
-    public function checkBrew(): ?CheckResult
+    #[CheckItem('if homebrew or macports has installed', limit_os: 'Darwin', level: 998)]
+    public function checkBrewOrPorts(): ?CheckResult
     {
-        if (($path = MacOSUtil::findCommand('brew')) === null) {
-            return CheckResult::fail('Homebrew is not installed', 'brew');
-        }
-        if ($path !== '/opt/homebrew/bin/brew' && getenv('GNU_ARCH') === 'aarch64') {
+        $brewPath = MacOSUtil::findCommand('brew');
+        $portPath = MacOSUtil::findCommand('port');
+
+        if ($brewPath && $brewPath !== '/opt/homebrew/bin/brew' && getenv('GNU_ARCH') === 'aarch64') {
             return CheckResult::fail('Current homebrew (/usr/local/bin/homebrew) is not installed for M1 Mac, please re-install homebrew in /opt/homebrew/ !');
         }
+
+        if ($brewPath === null && $portPath === null) {
+            return CheckResult::fail('Homebrew is not installed', 'brew');
+        }
+
         return CheckResult::ok();
     }
 
@@ -60,8 +65,8 @@ class MacOSToolCheck
         return CheckResult::ok();
     }
 
-    #[CheckItem('if homebrew llvm are installed', limit_os: 'Darwin')]
-    public function checkBrewLLVM(): ?CheckResult
+    #[CheckItem('if homebrew or macports llvm are installed', limit_os: 'Darwin')]
+    public function checkBrewOrPortsLLVM(): ?CheckResult
     {
         if (getenv('SPC_USE_LLVM') === 'brew') {
             $homebrew_prefix = getenv('HOMEBREW_PREFIX') ?: (SystemTarget::getTargetArch() === 'aarch64' ? '/opt/homebrew' : '/usr/local/homebrew');
@@ -71,6 +76,16 @@ class MacOSToolCheck
             }
             return CheckResult::ok($path);
         }
+
+        if (getenv('SPC_USE_LLVM') === 'port') {
+            $macportsPrefix = '/opt/local';
+
+            if (($path = MacOSUtil::findCommand('clang', ["{$macportsPrefix}/bin"])) === null) {
+                return CheckResult::fail('MacPorts llvm is not installed', 'build-tools', ['missing' => ['llvm']]);
+            }
+            return CheckResult::ok($path);
+        }
+
         return null;
     }
 
@@ -91,7 +106,7 @@ class MacOSToolCheck
                 if ($command_path !== []) {
                     return CheckResult::fail("Current {$bison} version is too old: " . $matches[0]);
                 }
-                return $this->checkBisonVersion(['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin']);
+                return $this->checkBisonVersion(['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin', '/opt/local/bin']);
             }
             return CheckResult::ok($matches[0]);
         }
@@ -108,6 +123,9 @@ class MacOSToolCheck
     #[FixItem('build-tools')]
     public function fixBuildTools(array $missing): bool
     {
+        $brewPath = MacOSUtil::findCommand('brew');
+        $portPath = MacOSUtil::findCommand('port');
+
         $replacement = [
             'glibtoolize' => 'libtool',
         ];
@@ -115,7 +133,18 @@ class MacOSToolCheck
             if (isset($replacement[$cmd])) {
                 $cmd = $replacement[$cmd];
             }
-            shell()->exec('brew install --formula ' . escapeshellarg($cmd));
+
+            if ($brewPath !== null) {
+                shell()->exec('brew install --formula ' . escapeshellarg($cmd));
+                continue;
+            }
+
+            if ($portPath !== null) {
+                shell()->exec('port install ' . escapeshellarg($cmd));
+                continue;
+            }
+
+            return false;
         }
         return true;
     }

src/StaticPHP/Doctor/Item/ZigCheck.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace StaticPHP\Doctor\Item;
 
-use Package\Artifact\zig;
 use StaticPHP\Attribute\Doctor\CheckItem;
 use StaticPHP\Attribute\Doctor\FixItem;
 use StaticPHP\Attribute\Doctor\OptionalCheck;
@@ -27,7 +26,7 @@ class ZigCheck
     public function checkZig(): CheckResult
     {
         if (new PackageInstaller()->addInstallPackage('zig')->isPackageInstalled('zig')) {
-            return CheckResult::ok(zig::binary());
+            return CheckResult::ok();
         }
         return CheckResult::fail('zig is not installed', 'install-zig');
     }

src/StaticPHP/Package/PackageBuilder.php

@@ -11,8 +11,6 @@ use StaticPHP\Exception\SPCInternalException;
 use StaticPHP\Exception\WrongUsageException;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Runtime\SystemTarget;
-use StaticPHP\Toolchain\Interface\ToolchainInterface;
-use StaticPHP\Toolchain\ZigToolchain;
 use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\GlobalPathTrait;
 use StaticPHP\Util\InteractiveTerm;
@@ -180,15 +178,14 @@ class PackageBuilder
         if (SystemTarget::getTargetOS() === 'Darwin') {
             shell()->exec("dsymutil -f {$binary_path} -o {$debug_file}");
         } elseif (SystemTarget::getTargetOS() === 'Linux') {
-            $objcopy = getenv('OBJCOPY') ?: 'objcopy';
             if ($eu_strip = LinuxUtil::findCommand('eu-strip')) {
                 shell()
                     ->exec("{$eu_strip} -f {$debug_file} {$binary_path}")
-                    ->exec("{$objcopy} --add-gnu-debuglink={$debug_file} {$binary_path}");
+                    ->exec("objcopy --add-gnu-debuglink={$debug_file} {$binary_path}");
             } else {
                 shell()
-                    ->exec("{$objcopy} --only-keep-debug {$binary_path} {$debug_file}")
-                    ->exec("{$objcopy} --add-gnu-debuglink={$debug_file} {$binary_path}");
+                    ->exec("objcopy --only-keep-debug {$binary_path} {$debug_file}")
+                    ->exec("objcopy --add-gnu-debuglink={$debug_file} {$binary_path}");
             }
         } else {
             logger()->debug('extractDebugInfo is only supported on Linux and macOS');
@@ -202,12 +199,9 @@ class PackageBuilder
      */
     public function stripBinary(string $binary_path): void
     {
-        $strip = ApplicationContext::tryGet(ToolchainInterface::class) instanceof ZigToolchain
-            ? PKG_ROOT_PATH . '/llvm-tools/bin/llvm-strip'
-            : 'strip';
         shell()->exec(match (SystemTarget::getTargetOS()) {
-            'Darwin' => "{$strip} -S {$binary_path}",
-            'Linux' => "{$strip} --strip-unneeded {$binary_path}",
+            'Darwin' => "strip -S {$binary_path}",
+            'Linux' => "strip --strip-unneeded {$binary_path}",
             'Windows' => 'echo "Skip strip on Windows"', // Windows strip is not available for now
             default => throw new SPCInternalException('stripBinary is only supported on Linux and macOS'),
         });