Merge branch 'main' into feature/shared-exts

.github/workflows/build-unix.yml

@@ -136,12 +136,12 @@ jobs:
             macos-x86_64)
               DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download"
               BUILD_CMD="./bin/spc build"
-              RUNS_ON="macos-15-intel"
+              RUNS_ON="macos-13"
               ;;
             macos-aarch64)
               DOWN_CMD="composer update --no-dev --classmap-authoritative && ./bin/spc doctor --auto-fix && ./bin/spc download"
               BUILD_CMD="./bin/spc build"
-              RUNS_ON="macos-15"
+              RUNS_ON="macos-14"
               ;;
           esac
           DOWN_CMD="$DOWN_CMD --with-php=${{ inputs.php-version }} --for-extensions=${{ inputs.extensions }} --ignore-cache-sources=php-src"

.github/workflows/ext-matrix-tests.yml

@@ -85,9 +85,9 @@ jobs:
           - "8.4"
         operating-system:
           - "ubuntu-latest"
-          #- "macos-15-intel"
+          #- "macos-13"
           #- "debian-arm64-self-hosted"
-          - "macos-15"
+          - "macos-14"
 
     steps:
       - name: "Checkout"
@@ -99,11 +99,11 @@ jobs:
           OS=""
           if [ "${{ matrix.operating-system }}" = "ubuntu-latest" ]; then
               OS="linux-x86_64"
-          elif [ "${{ matrix.operating-system }}" = "macos-15-intel" ]; then
+          elif [ "${{ matrix.operating-system }}" = "macos-13" ]; then
               OS="macos-x86_64"
           elif [ "${{ matrix.operating-system }}" = "debian-arm64-self-hosted" ]; then
               OS="linux-aarch64"
-          elif [ "${{ matrix.operating-system }}" = "macos-15" ]; then
+          elif [ "${{ matrix.operating-system }}" = "macos-14" ]; then
               OS="macos-aarch64"
           fi
           echo "OS=$OS" >> $GITHUB_ENV

.github/workflows/release-build.yml

@@ -27,7 +27,7 @@ jobs:
             os: "ubuntu-latest"
             filename: "spc-linux-x86_64.tar.gz"
           - name: "macos-x86_64"
-            os: "macos-15-intel"
+            os: "macos-13"
             filename: "spc-macos-x86_64.tar.gz"
           - name: "linux-aarch64"
             os: "ubuntu-latest"
@@ -147,11 +147,11 @@ jobs:
           - name: "linux-x86_64"
             os: "ubuntu-latest"
           - name: "macos-x86_64"
-            os: "macos-15-intel"
+            os: "macos-13"
           - name: "linux-aarch64"
             os: "ubuntu-24.04-arm"
           - name: "macos-aarch64"
-            os: "macos-15"
+            os: "macos-latest"
           - name: "windows-x64"
             os: "windows-latest"
     steps:

.github/workflows/tests.yml

@@ -1,9 +1,13 @@
 name: Tests
 
 on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'src/globals/test-extensions.php'
   pull_request:
-    branches: [ "main", "v3" ]
-    types: [ opened, synchronize, reopened ]
+    branches: [ "main" ]
     paths:
       - 'src/**'
       - 'config/**'
@@ -175,7 +179,7 @@ jobs:
           key: php-dependencies-${{ matrix.os }}
 
       - name: "Install Dependencies"
-        run: composer update -vvv --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-plugins
+        run: composer update -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
       - name: "Run Build Tests (doctor)"
         run: php src/globals/test-extensions.php doctor_cmd ${{ matrix.os }} ${{ matrix.php }}

.gitignore

@@ -1,8 +1,8 @@
 .idea
-/runtime/
-/docker/libraries/
-/docker/extensions/
-/docker/source/
+runtime/
+docker/libraries/
+docker/extensions/
+docker/source/
 
 # Vendor files
 /vendor/**
@@ -22,9 +22,6 @@
 # default package root directory
 /pkgroot/**
 
-# Windows PHP SDK binary tools
-/php-sdk-binary-tools/**
-
 # default pack:lib and release directory
 /dist/**
 packlib_files.txt

.php-cs-fixer.php

@@ -69,6 +69,6 @@ return (new PhpCsFixer\Config())
         'php_unit_data_provider_method_order' => false,
     ])
     ->setFinder(
-        PhpCsFixer\Finder::create()->in([__DIR__ . '/src', __DIR__ . '/tests/StaticPHP'])
+        PhpCsFixer\Finder::create()->in([__DIR__ . '/src', __DIR__ . '/tests/SPC'])
     )
     ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());

README.md

@@ -19,7 +19,7 @@ with popular extensions.
 - :wrench: Configurable source code patching
 - :books: Intelligent dependency management
 - 📦 Self-contained `spc` executable (built with [box](https://github.com/box-project/box))
-- :fire: Support 100+ popular [extensions](https://static-php.dev/en/guide/extensions.html)
+- :fire: Support 75+ popular [extensions](https://static-php.dev/en/guide/extensions.html)
 - :floppy_disk: UPX compression support (reduces binary size by 30-50%)
 
 **Single-file standalone php-cli:**

bin/spc

@@ -1,9 +1,13 @@
 #!/usr/bin/env php
 <?php
 
-use StaticPHP\ConsoleApplication;
-use StaticPHP\Exception\ExceptionHandler;
-use StaticPHP\Exception\SPCException;
+use SPC\ConsoleApplication;
+use SPC\exception\ExceptionHandler;
+
+// Load custom php if exists
+if (PHP_OS_FAMILY !== 'Windows' && PHP_BINARY !== (__DIR__ . '/php') && file_exists(__DIR__ . '/php') && is_executable(__DIR__ . '/php')) {
+    pcntl_exec(__DIR__ . '/php', $argv);
+}
 
 if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
     // Current: ./bin (git/project mode)
@@ -13,6 +17,11 @@ if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
     require_once dirname(__DIR__, 3) . '/autoload.php';
 }
 
+// 防止 Micro 打包状态下不支持中文的显示（虽然这个项目目前好像没输出过中文？）
+if (PHP_OS_FAMILY === 'Windows' && Phar::running()) {
+    exec('CHCP 65001');
+}
+
 // Print deprecation notice on PHP < 8.4, use red and highlight background
 if (PHP_VERSION_ID < 80400) {
     echo "\e[43mDeprecation Notice: PHP < 8.4 is deprecated, please upgrade your PHP version.\e[0m\n";
@@ -20,11 +29,7 @@ if (PHP_VERSION_ID < 80400) {
 
 try {
     (new ConsoleApplication())->run();
-} catch (SPCException $e) {
-    ExceptionHandler::handleSPCException($e);
-    exit(1);
-} catch (\Throwable $e) {
-    ExceptionHandler::handleDefaultException($e);
+} catch (Exception $e) {
+    ExceptionHandler::getInstance()->handle($e);
     exit(1);
 }
-

bin/spc-alpine-docker

@@ -3,7 +3,7 @@
 set -e
 
 # This file is using docker to run commands
-SPC_DOCKER_VERSION=v7
+SPC_DOCKER_VERSION=v6
 
 # Detect docker can run
 if ! which docker >/dev/null; then
@@ -123,7 +123,6 @@ COPY ./composer.* /app/
 ADD ./bin /app/bin
 RUN composer install --no-dev
 ADD ./config /app/config
-ADD ./spc.registry.json /app/spc.registry.json
 RUN bin/spc doctor --auto-fix
 RUN bin/spc install-pkg upx
 
@@ -151,7 +150,6 @@ MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/source:/app/source"
 MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/dist:/app/dist"
 MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/downloads:/app/downloads"
 MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/pkgroot:/app/pkgroot"
-MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/log:/app/log"
 if [ -f "$(pwd)/craft.yml" ]; then
     MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/craft.yml:/app/craft.yml"
 fi
@@ -163,47 +161,6 @@ if [ ! -z "$GITHUB_TOKEN" ]; then
     ENV_LIST="$ENV_LIST -e GITHUB_TOKEN=$GITHUB_TOKEN"
 fi
 
-# Intercept and rewrite --with-frankenphp-app option, and mount host path to /app/app
-FRANKENPHP_APP_PATH=""
-NEW_ARGS=()
-while [ $# -gt 0 ]; do
-    case "$1" in
-        --with-frankenphp-app=*)
-            FRANKENPHP_APP_PATH="${1#*=}"
-            NEW_ARGS+=("--with-frankenphp-app=/app/app")
-            shift
-            ;;
-        --with-frankenphp-app)
-            if [ -n "${2:-}" ]; then
-                FRANKENPHP_APP_PATH="$2"
-                NEW_ARGS+=("--with-frankenphp-app=/app/app")
-                shift 2
-            else
-                NEW_ARGS+=("$1")
-                shift
-            fi
-            ;;
-        *)
-            NEW_ARGS+=("$1")
-            shift
-            ;;
-    esac
-done
-
-# Normalize the path and add mount if provided
-if [ -n "$FRANKENPHP_APP_PATH" ]; then
-    # expand ~ to $HOME
-    if [ "${FRANKENPHP_APP_PATH#~}" != "$FRANKENPHP_APP_PATH" ]; then
-        FRANKENPHP_APP_PATH="$HOME${FRANKENPHP_APP_PATH#~}"
-    fi
-    # make absolute if relative
-    case "$FRANKENPHP_APP_PATH" in
-        /*) ABS_APP_PATH="$FRANKENPHP_APP_PATH" ;;
-        *) ABS_APP_PATH="$(pwd)/$FRANKENPHP_APP_PATH" ;;
-    esac
-    MOUNT_LIST="$MOUNT_LIST -v $ABS_APP_PATH:/app/app"
-fi
-
 # Run docker
 # shellcheck disable=SC2068
 # shellcheck disable=SC2086
@@ -225,5 +182,5 @@ if [ "$SPC_DOCKER_DEBUG" = "yes" ]; then
     set -ex
     $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION /bin/bash
 else
-    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc "${NEW_ARGS[@]}"
+    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc $@
 fi

bin/spc-debug

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# This script runs the 'spc' command with Xdebug enabled for debugging purposes.
-php -d xdebug.mode=debug -d xdebug.client_host=127.0.0.1 -d xdebug.client_port=9003 -d xdebug.start_with_request=yes "$(dirname "$0")/../bin/spc" "$@"

bin/spc-gnu-docker

@@ -158,7 +158,6 @@ MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/source:/app/source"
 MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/dist:/app/dist"
 MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/downloads:/app/downloads"
 MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/pkgroot:/app/pkgroot"
-MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/log:/app/log"
 if [ -f "$(pwd)/craft.yml" ]; then
     MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/craft.yml:/app/craft.yml"
 fi
@@ -174,47 +173,6 @@ if [ ! -z "$GITHUB_TOKEN" ]; then
     ENV_LIST="$ENV_LIST -e GITHUB_TOKEN=$GITHUB_TOKEN"
 fi
 
-# Intercept and rewrite --with-frankenphp-app option, and mount host path to /app/app
-FRANKENPHP_APP_PATH=""
-NEW_ARGS=()
-while [ $# -gt 0 ]; do
-    case "$1" in
-        --with-frankenphp-app=*)
-            FRANKENPHP_APP_PATH="${1#*=}"
-            NEW_ARGS+=("--with-frankenphp-app=/app/app")
-            shift
-            ;;
-        --with-frankenphp-app)
-            if [ -n "${2:-}" ]; then
-                FRANKENPHP_APP_PATH="$2"
-                NEW_ARGS+=("--with-frankenphp-app=/app/app")
-                shift 2
-            else
-                NEW_ARGS+=("$1")
-                shift
-            fi
-            ;;
-        *)
-            NEW_ARGS+=("$1")
-            shift
-            ;;
-    esac
-done
-
-# Normalize the path and add mount if provided
-if [ -n "$FRANKENPHP_APP_PATH" ]; then
-    # expand ~ to $HOME
-    if [ "${FRANKENPHP_APP_PATH#~}" != "$FRANKENPHP_APP_PATH" ]; then
-        FRANKENPHP_APP_PATH="$HOME${FRANKENPHP_APP_PATH#~}"
-    fi
-    # make absolute if relative
-    case "$FRANKENPHP_APP_PATH" in
-        /*) ABS_APP_PATH="$FRANKENPHP_APP_PATH" ;;
-        *) ABS_APP_PATH="$(pwd)/$FRANKENPHP_APP_PATH" ;;
-    esac
-    MOUNT_LIST="$MOUNT_LIST -v $ABS_APP_PATH:/app/app"
-fi
-
 # Run docker
 # shellcheck disable=SC2068
 # shellcheck disable=SC2086
@@ -237,5 +195,5 @@ if [ "$SPC_DOCKER_DEBUG" = "yes" ]; then
     set -ex
     $DOCKER_EXECUTABLE run $PLATFORM_ARG --privileged --rm -it $INTERACT $ENV_LIST --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH-$SPC_DOCKER_VERSION /bin/bash
 else
-    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc "${NEW_ARGS[@]}"
+    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc $@
 fi

composer.json

@@ -9,16 +9,14 @@
         }
     ],
     "require": {
-        "php": ">=8.4",
+        "php": ">= 8.3",
         "ext-mbstring": "*",
         "ext-zlib": "*",
-        "laravel/prompts": "~0.1",
-        "nette/php-generator": "^4.2",
-        "php-di/php-di": "^7.1",
+        "laravel/prompts": "^0.1.12",
         "symfony/console": "^5.4 || ^6 || ^7",
         "symfony/process": "^7.2",
         "symfony/yaml": "^7.2",
-        "zhamao/logger": "^1.1.4"
+        "zhamao/logger": "^1.1.3"
     },
     "require-dev": {
         "captainhook/captainhook-phar": "^5.23",
@@ -30,9 +28,7 @@
     },
     "autoload": {
         "psr-4": {
-            "SPC\\": "src/SPC",
-            "StaticPHP\\": "src/StaticPHP",
-            "Package\\": "src/Package"
+            "SPC\\": "src/SPC"
         },
         "files": [
             "src/globals/defines.php",
@@ -41,7 +37,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\StaticPHP\\": "tests/StaticPHP"
+            "SPC\\Tests\\": "tests/SPC"
         }
     },
     "bin": [

config/env.ini

@@ -1,42 +1,39 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; static-php-cli (spc) env configuration
 ;
 ; This file is used to set default env vars for static-php-cli build.
 ; As dynamic build process, some of these vars can be overwritten by CLI options.
 ; And you can also overwrite these vars by setting them in your shell environment.
-; The value should be changed only if you know what you are doing. Otherwise, please leave them as default.
 ;
 ; We need to use some pre-defined internal env vars, like `BUILD_ROOT_PATH`, `DOWNLOAD_PATH`, etc.
-; Please note that these vars cannot be defined in this file, they should only be defined before static-php-cli running.
+; Please note that these vars cannot be defined in this file, they are only be defined before static-php-cli running.
 ;
-; Here's a list of env vars, these variables will be defined if not defined:
+; Here's a list of env vars, these value cannot be changed anywhere:
 ;
+;   SPC_VERSION:        the version of static-php-cli.
+;   WORKING_DIR:        the working directory of the build process. (default: `$(pwd)`)
+;   ROOT_DIR:           the root directory of static-php-cli. (default: `/path/to/static-php-cli`, when running in phar or micro mode: `phar://path/to/spc.phar`)
 ;   BUILD_ROOT_PATH:    the root path of the build process. (default: `$(pwd)/buildroot`)
 ;   BUILD_INCLUDE_PATH: the path of the include files. (default: `$BUILD_ROOT_PATH/include`)
 ;   BUILD_LIB_PATH:     the path of the lib files. (default: `$BUILD_ROOT_PATH/lib`)
 ;   BUILD_BIN_PATH:     the path of the bin files. (default: `$BUILD_ROOT_PATH/bin`)
-;   BUILD_MODULES_PATH: the path of the php modules (shared extensions) files. (default: `$BUILD_ROOT_PATH/modules`)
-;   PKG_ROOT_PATH:      the root path of the package files. (default: `$(pwd)/pkgroot/$GNU_ARCH-{darwin|linux|windows}`)
+;   PKG_ROOT_PATH:      the root path of the package files. (default: `$(pwd)/pkgroot`)
 ;   SOURCE_PATH:        the path of the source files. (default: `$(pwd)/source`)
 ;   DOWNLOAD_PATH:      the path of the download files. (default: `$(pwd)/downloads`)
-;   PATH:               (*nix only) static-php-cli will add `$BUILD_BIN_PATH` to PATH.
-;   PKG_CONFIG_PATH:    (*nix only) static-php-cli will set `$BUILD_LIB_PATH/pkgconfig` to PKG_CONFIG_PATH.
+;   CPU_COUNT:          the count of the CPU cores. (default: `$(nproc)`)
+;   SPC_ARCH:           the arch of the current system, for some libraries needed `--host=XXX` args. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`, `arm64`)
+;   GNU_ARCH:           the GNU arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`)
+;   MAC_ARCH:           the MAC arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `arm64`)
 ;
-; Here's a list of env vars, these variables is defined in SPC and cannot be changed anywhere:
+;   * These vars are only be defined in Unix (macOS, Linux, FreeBSD)Builder and cannot be changed anywhere:
+;   PATH:                               static-php-cli will add `$BUILD_BIN_PATH` to PATH.
+;   PKG_CONFIG:                         static-php-cli will set `$BUILD_BIN_PATH/pkg-config` to PKG_CONFIG.
+;   PKG_CONFIG_PATH:                    static-php-cli will set `$BUILD_LIB_PATH/pkgconfig` to PKG_CONFIG_PATH.
 ;
-;   SPC_VERSION:            the version of static-php-cli.
-;   WORKING_DIR:            the working directory of the build process. (default: `$(pwd)`)
-;   ROOT_DIR:               the root directory of static-php-cli. (default: `/path/to/static-php-cli`, when running in phar or micro mode: `phar://path/to/spc.phar`)
-;   CPU_COUNT:              the count of the CPU cores. (default: `$(nproc)`)
-;   SPC_ARCH:               the arch of the current system, for some libraries needed `--host=XXX` args. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`, `arm64`)
-;   GNU_ARCH:               the GNU arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`)
-;   MAC_ARCH:               the MAC arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `arm64`)
-;   PKG_CONFIG:             (*nix only) static-php-cli will set `$BUILD_BIN_PATH/pkg-config` to PKG_CONFIG.
-;   SPC_DEFAULT_CC:         (*nix only) the default compiler for selected toolchain.
-;   SPC_DEFAULT_CXX:        (*nix only) the default c++ compiler selected toolchain.
-;   SPC_DEFAULT_AR:         (*nix only) the default archiver for selected toolchain.
-;   SPC_DEFAULT_LD:         (*nix only) the default linker for selected toolchain.
-;   SPC_EXTRA_PHP_VARS:     (linux only) the extra vars for building php, used in `configure` and `make` command.
+;   * These vars are only be defined in LinuxBuilder and cannot be changed anywhere:
+;   SPC_LINUX_DEFAULT_CC:                   the default compiler for linux. (For alpine linux: `gcc`, default: `$GNU_ARCH-linux-musl-gcc`)
+;   SPC_LINUX_DEFAULT_CXX:                  the default c++ compiler for linux. (For alpine linux: `g++`, default: `$GNU_ARCH-linux-musl-g++`)
+;   SPC_LINUX_DEFAULT_AR:                   the default archiver for linux. (For alpine linux: `ar`, default: `$GNU_ARCH-linux-musl-ar`)
 
 [global]
 ; Build concurrency for make -jN, default is CPU_COUNT, this value are used in every libs.
@@ -46,15 +43,9 @@ SPC_SKIP_PHP_VERSION_CHECK="no"
 ; Ignore some check item for bin/spc doctor command, comma separated (e.g. SPC_SKIP_DOCTOR_CHECK_ITEMS="if homebrew has installed")
 SPC_SKIP_DOCTOR_CHECK_ITEMS=""
 ; extra modules that xcaddy will include in the FrankenPHP build
-SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES="--with github.com/dunglas/mercure/caddy --with github.com/dunglas/vulcain/caddy --with github.com/dunglas/caddy-cbrotli"
+SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES="--with github.com/dunglas/frankenphp/caddy --with github.com/dunglas/mercure/caddy --with github.com/dunglas/vulcain/caddy --with github.com/dunglas/caddy-cbrotli"
 ; The display message for php version output (PHP >= 8.4 available)
 PHP_BUILD_PROVIDER="static-php-cli ${SPC_VERSION}"
-; Whether to enable log file (if you are using vendor mode)
-SPC_ENABLE_LOG_FILE="yes"
-; The LOG DIR for spc logs
-SPC_LOGS_DIR="${WORKING_DIR}/log"
-; Preserve old logs when running new builds
-SPC_PRESERVE_LOGS="no"
 
 ; EXTENSION_DIR where the built php will look for extension when a .ini instructs to load them
 ; only useful for builds targeting not pure-static linking
@@ -73,7 +64,7 @@ PHP_SDK_PATH="${WORKING_DIR}\php-sdk-binary-tools"
 ; upx executable path
 UPX_EXEC="${PKG_ROOT_PATH}\bin\upx.exe"
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
-SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream,cli_static,win32_api
+SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream,cli_static
 
 [linux]
 ; Linux can use different build toolchains.
@@ -113,11 +104,15 @@ SPC_MICRO_PATCHES=cli_checks,disable_huge_page
 SPC_CMD_PREFIX_PHP_BUILDCONF="./buildconf --force"
 ; configure command
 SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --disable-shared --enable-static --disable-all --disable-phpdbg --with-pic"
+; make command
+SPC_CMD_PREFIX_PHP_MAKE="make -j${SPC_CONCURRENCY}"
 
 ; *** default build vars for building php ***
 ; embed type for php, static (libphp.a) or shared (libphp.so)
 SPC_CMD_VAR_PHP_EMBED_TYPE="static"
-; EXTRA_CFLAGS for `configure` and `make` php
+; CFLAGS for configuring php
+SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -fPIE"
+; EXTRA_CFLAGS for `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE ${SPC_DEFAULT_C_FLAGS}"
 ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
@@ -127,12 +122,11 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
 ; Currently we do not support universal and cross-compilation for macOS.
 SPC_TARGET=native-macos
 ; compiler environments
-CC=${SPC_LINUX_DEFAULT_CC}
-CXX=${SPC_LINUX_DEFAULT_CXX}
-AR=${SPC_LINUX_DEFAULT_AR}
-LD=${SPC_LINUX_DEFAULT_LD}
+CC=clang
+CXX=clang++
+AR=ar
+LD=ld
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
-; this will be added to all CFLAGS and CXXFLAGS for the library builds
 SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
 SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
 SPC_DEFAULT_LD_FLAGS=""
@@ -144,9 +138,18 @@ SPC_MICRO_PATCHES=cli_checks,macos_iconv
 SPC_CMD_PREFIX_PHP_BUILDCONF="./buildconf --force"
 ; configure command
 SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-phpdbg"
+; make command
+SPC_CMD_PREFIX_PHP_MAKE="make -j${SPC_CONCURRENCY}"
 
 ; *** default build vars for building php ***
 ; embed type for php, static (libphp.a) or shared (libphp.dylib)
 SPC_CMD_VAR_PHP_EMBED_TYPE="static"
-; EXTRA_CFLAGS for `configure` and `make` php
-SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -Werror=unknown-warning-option ${SPC_DEFAULT_C_FLAGS}"
+; CFLAGS for configuring php
+SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -Werror=unknown-warning-option"
+; EXTRA_CFLAGS for `make` php
+SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie ${SPC_DEFAULT_C_FLAGS}"
+
+[freebsd]
+; compiler environments
+CC=clang
+CXX=clang++

config/ext.json

@@ -341,7 +341,6 @@
         "ext-depends": [
             "xml"
         ],
-        "build-with-php": true,
         "target": [
             "static"
         ]
@@ -358,18 +357,6 @@
             "liblz4"
         ]
     },
-    "maxminddb": {
-        "support": {
-            "BSD": "wip",
-            "Windows": "wip"
-        },
-        "type": "external",
-        "source": "ext-maxminddb",
-        "arg-type": "with",
-        "lib-depends": [
-            "libmaxminddb"
-        ]
-    },
     "mbregex": {
         "type": "builtin",
         "arg-type": "custom",
@@ -466,7 +453,7 @@
         "type": "external",
         "source": "msgpack",
         "arg-type-unix": "with",
-        "arg-type-windows": "enable",
+        "arg-type-win": "enable",
         "ext-depends": [
             "session"
         ]
@@ -474,7 +461,6 @@
     "mysqli": {
         "type": "builtin",
         "arg-type": "with",
-        "build-with-php": true,
         "ext-depends": [
             "mysqlnd"
         ]
@@ -482,7 +468,6 @@
     "mysqlnd": {
         "type": "builtin",
         "arg-type-windows": "with",
-        "build-with-php": true,
         "lib-depends": [
             "zlib"
         ]
@@ -567,13 +552,6 @@
         "type": "builtin",
         "unix-only": true
     },
-    "pcov": {
-        "type": "external",
-        "source": "pcov",
-        "target": [
-            "shared"
-        ]
-    },
     "pdo": {
         "type": "builtin"
     },
@@ -709,7 +687,7 @@
         "type": "builtin",
         "arg-type": "with-path",
         "lib-depends": [
-            "libedit"
+            "readline"
         ],
         "target": [
             "static"
@@ -775,27 +753,17 @@
             "apcu"
         ]
     },
-    "snmp": {
-        "support": {
-            "Windows": "wip",
-            "BSD": "wip"
-        },
-        "type": "builtin",
-        "arg-type-unix": "with",
-        "arg-type-windows": "with",
-        "lib-depends": [
-            "net-snmp"
-        ]
-    },
     "soap": {
         "support": {
             "BSD": "wip"
         },
         "type": "builtin",
         "arg-type": "custom",
-        "ext-depends": [
-            "libxml",
-            "session"
+        "lib-depends": [
+            "libxml2"
+        ],
+        "ext-depends-windows": [
+            "xml"
         ]
     },
     "sockets": {
@@ -831,7 +799,6 @@
         "type": "builtin",
         "arg-type": "with-path",
         "arg-type-windows": "with",
-        "build-with-php": true,
         "lib-depends": [
             "sqlite"
         ]
@@ -920,22 +887,6 @@
             "mysqli"
         ]
     },
-    "swoole-hook-odbc": {
-        "support": {
-            "Windows": "no",
-            "BSD": "wip"
-        },
-        "notes": true,
-        "type": "addon",
-        "arg-type": "none",
-        "ext-depends": [
-            "pdo",
-            "swoole"
-        ],
-        "lib-depends": [
-            "unixodbc"
-        ]
-    },
     "swoole-hook-pgsql": {
         "support": {
             "Windows": "no",
@@ -965,6 +916,22 @@
             "swoole"
         ]
     },
+    "swoole-hook-odbc": {
+        "support": {
+            "Windows": "no",
+            "BSD": "wip"
+        },
+        "notes": true,
+        "type": "addon",
+        "arg-type": "none",
+        "ext-depends": [
+            "pdo",
+            "swoole"
+        ],
+        "lib-depends": [
+            "unixodbc"
+        ]
+    },
     "swow": {
         "support": {
             "BSD": "wip"
@@ -1019,14 +986,6 @@
         "type": "builtin",
         "build-with-php": true
     },
-    "trader": {
-        "support": {
-            "BSD": "wip",
-            "Windows": "wip"
-        },
-        "type": "external",
-        "source": "ext-trader"
-    },
     "uuid": {
         "support": {
             "Windows": "wip",
@@ -1192,13 +1151,33 @@
         ]
     },
     "zip": {
+        "support": {
+            "BSD": "wip"
+        },
+        "type": "builtin",
+        "arg-type": "with-path",
+        "arg-type-windows": "enable",
+        "lib-depends-unix": [
+            "libzip"
+        ],
+        "ext-depends-windows": [
+            "zlib",
+            "bz2"
+        ],
+        "lib-depends-windows": [
+            "libzip",
+            "zlib",
+            "bzip2",
+            "xz"
+        ]
+    },
+    "zip-shared": {
         "support": {
             "BSD": "wip"
         },
         "type": "external",
         "source": "ext-zip",
-        "arg-type": "custom",
-        "arg-type-windows": "enable",
+        "arg-type": "enable",
         "lib-depends-unix": [
             "libzip"
         ],
@@ -1220,7 +1199,6 @@
         "lib-depends": [
             "zlib"
         ],
-        "build-with-php": true,
         "target": [
             "static"
         ]

config/lib.json

@@ -7,14 +7,12 @@
         "source": "php-src",
         "lib-depends": [
             "lib-base",
-            "micro",
-            "frankenphp"
+            "micro"
         ],
         "lib-depends-macos": [
             "lib-base",
             "micro",
-            "libxml2",
-            "frankenphp"
+            "libxml2"
         ],
         "lib-suggests-linux": [
             "libacl",
@@ -26,10 +24,6 @@
             "watcher"
         ]
     },
-    "frankenphp": {
-        "source": "frankenphp",
-        "type": "target"
-    },
     "micro": {
         "type": "target",
         "source": "micro"
@@ -104,9 +98,7 @@
             "ngtcp2",
             "zstd",
             "libcares",
-            "ldap",
-            "idn2",
-            "krb5"
+            "ldap"
         ],
         "lib-suggests-windows": [
             "brotli",
@@ -210,7 +202,7 @@
             "openssl",
             "libcares"
         ],
-        "cpp-library": true,
+        "provide-pre-built": true,
         "frameworks": [
             "CoreFoundation"
         ]
@@ -236,27 +228,8 @@
             "unicode"
         ]
     },
-    "idn2": {
-        "source": "libidn2",
-        "pkg-configs": [
-            "libidn2"
-        ],
-        "headers": [
-            "idn2.h"
-        ],
-        "lib-suggests-unix": [
-            "libiconv",
-            "gettext",
-            "libunistring"
-        ],
-        "lib-depends-macos": [
-            "libiconv",
-            "gettext"
-        ]
-    },
     "imagemagick": {
         "source": "imagemagick",
-        "cpp-library": true,
         "pkg-configs": [
             "Magick++-7.Q16HDRI",
             "MagickCore-7.Q16HDRI",
@@ -301,26 +274,6 @@
             "jbig_ar.h"
         ]
     },
-    "krb5": {
-        "source": "krb5",
-        "pkg-configs": [
-            "krb5-gssapi"
-        ],
-        "headers": [
-            "krb5.h",
-            "gssapi/gssapi.h"
-        ],
-        "lib-depends": [
-            "openssl"
-        ],
-        "lib-suggests": [
-            "ldap",
-            "libedit"
-        ],
-        "frameworks": [
-            "Kerberos"
-        ]
-    },
     "ldap": {
         "source": "ldap",
         "pkg-configs": [
@@ -390,15 +343,6 @@
         ],
         "cpp-library": true
     },
-    "libedit": {
-        "source": "libedit",
-        "static-libs-unix": [
-            "libedit.a"
-        ],
-        "lib-depends": [
-            "ncurses"
-        ]
-    },
     "libevent": {
         "source": "libevent",
         "static-libs-unix": [
@@ -506,16 +450,6 @@
             "liblz4.a"
         ]
     },
-    "libmaxminddb": {
-        "source": "libmaxminddb",
-        "static-libs-unix": [
-            "libmaxminddb.a"
-        ],
-        "headers": [
-            "maxminddb.h",
-            "maxminddb_config.h"
-        ]
-    },
     "libmemcached": {
         "source": "libmemcached",
         "cpp-library": true,
@@ -562,16 +496,13 @@
     },
     "librdkafka": {
         "source": "librdkafka",
-        "pkg-configs": [
-            "rdkafka++-static",
-            "rdkafka-static"
+        "static-libs-unix": [
+            "librdkafka.a",
+            "librdkafka++.a",
+            "librdkafka-static.a"
         ],
         "cpp-library": true,
         "lib-suggests": [
-            "curl",
-            "liblz4",
-            "openssl",
-            "zlib",
             "zstd"
         ]
     },
@@ -618,31 +549,6 @@
             "zstd"
         ]
     },
-    "libunistring": {
-        "source": "libunistring",
-        "static-libs-unix": [
-            "libunistring.a"
-        ],
-        "headers": [
-            "unistr.h",
-            "unistring/"
-        ]
-    },
-    "liburing": {
-        "source": "liburing",
-        "pkg-configs": [
-            "liburing",
-            "liburing-ffi"
-        ],
-        "static-libs-linux": [
-            "liburing.a",
-            "liburing-ffi.a"
-        ],
-        "headers-linux": [
-            "liburing/",
-            "liburing.h"
-        ]
-    },
     "libuuid": {
         "source": "libuuid",
         "static-libs-unix": [
@@ -676,8 +582,8 @@
     },
     "libxml2": {
         "source": "libxml2",
-        "pkg-configs": [
-            "libxml-2.0"
+        "static-libs-unix": [
+            "libxml2.a"
         ],
         "static-libs-windows": [
             "libxml2s.lib",
@@ -766,17 +672,6 @@
             "libncurses.a"
         ]
     },
-    "net-snmp": {
-        "source": "net-snmp",
-        "pkg-configs": [
-            "netsnmp",
-            "netsnmp-agent"
-        ],
-        "lib-depends": [
-            "openssl",
-            "zlib"
-        ]
-    },
     "nghttp2": {
         "source": "nghttp2",
         "static-libs-unix": [
@@ -875,7 +770,7 @@
             "libxml2",
             "openssl",
             "zlib",
-            "libedit"
+            "readline"
         ],
         "lib-suggests": [
             "icu",
@@ -927,7 +822,6 @@
     },
     "snappy": {
         "source": "snappy",
-        "cpp-library": true,
         "static-libs-unix": [
             "libsnappy.a"
         ],
@@ -973,7 +867,6 @@
     },
     "watcher": {
         "source": "watcher",
-        "cpp-library": true,
         "static-libs-unix": [
             "libwatcher-c.a"
         ],
@@ -1034,5 +927,20 @@
             "zstd.h",
             "zstd_errors.h"
         ]
+    },
+    "liburing": {
+        "source": "liburing",
+        "pkg-configs": [
+            "liburing",
+            "liburing-ffi"
+        ],
+        "static-libs-linux": [
+            "liburing.a",
+            "liburing-ffi.a"
+        ],
+        "headers-linux": [
+            "liburing/",
+            "liburing.h"
+        ]
     }
 }

config/pkg.json

@@ -0,0 +1,105 @@
+{
+    "go-xcaddy-aarch64-linux": {
+        "type": "custom"
+    },
+    "go-xcaddy-aarch64-macos": {
+        "type": "custom"
+    },
+    "go-xcaddy-x86_64-linux": {
+        "type": "custom"
+    },
+    "go-xcaddy-x86_64-macos": {
+        "type": "custom"
+    },
+    "musl-toolchain-aarch64-linux": {
+        "type": "url",
+        "url": "https://dl.static-php.dev/static-php-cli/deps/musl-toolchain/aarch64-musl-toolchain.tgz"
+    },
+    "musl-toolchain-x86_64-linux": {
+        "type": "url",
+        "url": "https://dl.static-php.dev/static-php-cli/deps/musl-toolchain/x86_64-musl-toolchain.tgz"
+    },
+    "nasm-x86_64-win": {
+        "type": "url",
+        "url": "https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip",
+        "extract-files": {
+            "nasm-2.16.01/nasm.exe": "{php_sdk_path}/bin/nasm.exe",
+            "nasm-2.16.01/ndisasm.exe": "{php_sdk_path}/bin/ndisasm.exe"
+        }
+    },
+    "pkg-config-aarch64-linux": {
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-aarch64-linux-musl-1.2.5.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
+    },
+    "pkg-config-aarch64-macos": {
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-aarch64-darwin.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
+    },
+    "pkg-config-x86_64-linux": {
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-x86_64-linux-musl-1.2.5.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
+    },
+    "pkg-config-x86_64-macos": {
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-x86_64-darwin.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
+    },
+    "strawberry-perl-x86_64-win": {
+        "type": "url",
+        "url": "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip"
+    },
+    "upx-aarch64-linux": {
+        "type": "ghrel",
+        "repo": "upx/upx",
+        "match": "upx.+-arm64_linux\\.tar\\.xz",
+        "extract-files": {
+            "upx": "{pkg_root_path}/bin/upx"
+        }
+    },
+    "upx-x86_64-linux": {
+        "type": "ghrel",
+        "repo": "upx/upx",
+        "match": "upx.+-amd64_linux\\.tar\\.xz",
+        "extract-files": {
+            "upx": "{pkg_root_path}/bin/upx"
+        }
+    },
+    "upx-x86_64-win": {
+        "type": "ghrel",
+        "repo": "upx/upx",
+        "match": "upx.+-win64\\.zip",
+        "extract-files": {
+            "upx-*-win64/upx.exe": "{pkg_root_path}/bin/upx.exe"
+        }
+    },
+    "zig-aarch64-linux": {
+        "type": "custom"
+    },
+    "zig-aarch64-macos": {
+        "type": "custom"
+    },
+    "zig-x86_64-linux": {
+        "type": "custom"
+    },
+    "zig-x86_64-macos": {
+        "type": "custom"
+    },
+    "zig-x86_64-win": {
+        "type": "custom"
+    }
+}

config/pkg.lib.json

@@ -1,992 +0,0 @@
-{
-    "attr": {
-        "type": "library",
-        "artifact": "attr",
-        "license": {
-            "type": "file",
-            "path": "doc/COPYING.LGPL"
-        }
-    },
-    "brotli": {
-        "type": "library",
-        "headers": [
-            "brotli"
-        ],
-        "pkg-configs": [
-            "libbrotlicommon",
-            "libbrotlidec",
-            "libbrotlienc"
-        ],
-        "artifact": "brotli",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "bzip2": {
-        "type": "library",
-        "headers": [
-            "bzlib.h"
-        ],
-        "artifact": "bzip2",
-        "license": {
-            "type": "text",
-            "text": "This program, \"bzip2\", the associated library \"libbzip2\", and all documentation, are copyright (C) 1996-2010 Julian R Seward. All rights reserved. \n\nRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n    2. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n    3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n    4. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\nJulian Seward, jseward@bzip.org bzip2/libbzip2 version 1.0.6 of 6 September 2010\n\nPATENTS: To the best of my knowledge, bzip2 and libbzip2 do not use any patented algorithms. However, I do not have the resources to carry out a patent search. Therefore I cannot give any guarantee of the above statement."
-        }
-    },
-    "curl": {
-        "type": "library",
-        "depends@windows": [
-            "zlib",
-            "libssh2",
-            "nghttp2"
-        ],
-        "depends": [
-            "openssl",
-            "zlib"
-        ],
-        "suggests@windows": [
-            "brotli",
-            "zstd"
-        ],
-        "suggests": [
-            "libssh2",
-            "brotli",
-            "nghttp2",
-            "nghttp3",
-            "ngtcp2",
-            "zstd",
-            "libcares",
-            "ldap"
-        ],
-        "headers": [
-            "curl"
-        ],
-        "frameworks": [
-            "CoreFoundation",
-            "CoreServices",
-            "SystemConfiguration"
-        ],
-        "artifact": "curl",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "fastlz": {
-        "type": "library",
-        "headers": [
-            "fastlz/fastlz.h"
-        ],
-        "artifact": "fastlz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE.MIT"
-        }
-    },
-    "freetype": {
-        "type": "library",
-        "depends": [
-            "zlib"
-        ],
-        "suggests": [
-            "libpng",
-            "bzip2",
-            "brotli"
-        ],
-        "headers": [
-            "freetype2/freetype/freetype.h",
-            "freetype2/ft2build.h"
-        ],
-        "artifact": "freetype",
-        "license": {
-            "type": "file",
-            "path": "LICENSE.TXT"
-        }
-    },
-    "gettext": {
-        "type": "library",
-        "depends": [
-            "libiconv"
-        ],
-        "suggests": [
-            "ncurses",
-            "libxml2"
-        ],
-        "frameworks": [
-            "CoreFoundation"
-        ],
-        "artifact": "gettext",
-        "license": {
-            "type": "file",
-            "path": "gettext-runtime/intl/COPYING.LIB"
-        }
-    },
-    "glfw": {
-        "type": "library",
-        "frameworks": [
-            "CoreVideo",
-            "OpenGL",
-            "Cocoa",
-            "IOKit"
-        ],
-        "artifact": "ext-glfw",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "gmp": {
-        "type": "library",
-        "headers": [
-            "gmp.h"
-        ],
-        "artifact": "gmp",
-        "license": {
-            "type": "text",
-            "text": "Since version 6, GMP is distributed under the dual licenses, GNU LGPL v3 and GNU GPL v2. These licenses make the library free to use, share, and improve, and allow you to pass on the result. The GNU licenses give freedoms, but also set firm restrictions on the use with non-free programs."
-        }
-    },
-    "gmssl": {
-        "type": "library",
-        "frameworks": [
-            "Security"
-        ],
-        "artifact": "gmssl",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "grpc": {
-        "type": "library",
-        "depends": [
-            "zlib",
-            "openssl",
-            "libcares"
-        ],
-        "pkg-configs": [
-            "grpc"
-        ],
-        "frameworks": [
-            "CoreFoundation"
-        ],
-        "artifact": "grpc",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "icu": {
-        "type": "library",
-        "pkg-configs": [
-            "icu-uc",
-            "icu-i18n",
-            "icu-io"
-        ],
-        "artifact": "icu",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "icu-static-win": {
-        "type": "library",
-        "headers@windows": [
-            "unicode"
-        ],
-        "artifact": "icu-static-win",
-        "license": {
-            "type": "text",
-            "text": "none"
-        }
-    },
-    "imagemagick": {
-        "type": "library",
-        "depends": [
-            "zlib",
-            "libjpeg",
-            "libjxl",
-            "libpng",
-            "libwebp",
-            "freetype",
-            "libtiff",
-            "libheif",
-            "bzip2"
-        ],
-        "suggests": [
-            "zstd",
-            "xz",
-            "libzip",
-            "libxml2"
-        ],
-        "pkg-configs": [
-            "Magick++-7.Q16HDRI",
-            "MagickCore-7.Q16HDRI",
-            "MagickWand-7.Q16HDRI"
-        ],
-        "artifact": "imagemagick",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "imap": {
-        "type": "library",
-        "suggests": [
-            "openssl"
-        ],
-        "artifact": "imap",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "jbig": {
-        "type": "library",
-        "headers": [
-            "jbig.h",
-            "jbig85.h",
-            "jbig_ar.h"
-        ],
-        "artifact": "jbig",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "ldap": {
-        "type": "library",
-        "depends": [
-            "openssl",
-            "zlib",
-            "gmp",
-            "libsodium"
-        ],
-        "pkg-configs": [
-            "ldap",
-            "lber"
-        ],
-        "artifact": "ldap",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "lerc": {
-        "type": "library",
-        "artifact": "lerc",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libacl": {
-        "type": "library",
-        "depends": [
-            "attr"
-        ],
-        "artifact": "libacl",
-        "license": {
-            "type": "file",
-            "path": "doc/COPYING.LGPL"
-        }
-    },
-    "libaom": {
-        "type": "library",
-        "artifact": "libaom",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libargon2": {
-        "type": "library",
-        "artifact": "libargon2",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libavif": {
-        "type": "library",
-        "artifact": "libavif",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libcares": {
-        "type": "library",
-        "headers": [
-            "ares.h",
-            "ares_dns.h",
-            "ares_nameser.h"
-        ],
-        "artifact": "libcares",
-        "license": {
-            "type": "file",
-            "path": "LICENSE.md"
-        }
-    },
-    "libde265": {
-        "type": "library",
-        "artifact": "libde265",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "libedit": {
-        "type": "library",
-        "depends": [
-            "ncurses"
-        ],
-        "artifact": "libedit",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "libevent": {
-        "type": "library",
-        "depends": [
-            "openssl"
-        ],
-        "artifact": "libevent",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libffi": {
-        "type": "library",
-        "headers@windows": [
-            "ffi.h",
-            "fficonfig.h",
-            "ffitarget.h"
-        ],
-        "headers": [
-            "ffi.h",
-            "ffitarget.h"
-        ],
-        "artifact": "libffi",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libffi-win": {
-        "type": "library",
-        "headers@windows": [
-            "ffi.h",
-            "ffitarget.h",
-            "fficonfig.h"
-        ],
-        "artifact": "libffi-win",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libheif": {
-        "type": "library",
-        "depends": [
-            "libde265",
-            "libwebp",
-            "libaom",
-            "zlib",
-            "brotli"
-        ],
-        "artifact": "libheif",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "libiconv": {
-        "type": "library",
-        "headers": [
-            "iconv.h",
-            "libcharset.h",
-            "localcharset.h"
-        ],
-        "artifact": "libiconv",
-        "license": {
-            "type": "file",
-            "path": "COPYING.LIB"
-        }
-    },
-    "libiconv-win": {
-        "type": "library",
-        "artifact": "libiconv-win",
-        "license": {
-            "type": "file",
-            "path": "source/COPYING"
-        }
-    },
-    "libjpeg": {
-        "type": "library",
-        "suggests@windows": [
-            "zlib"
-        ],
-        "artifact": "libjpeg",
-        "license": {
-            "type": "file",
-            "path": "LICENSE.md"
-        }
-    },
-    "libjxl": {
-        "type": "library",
-        "depends": [
-            "brotli",
-            "libjpeg",
-            "libpng",
-            "libwebp"
-        ],
-        "pkg-configs": [
-            "libjxl",
-            "libjxl_cms",
-            "libjxl_threads",
-            "libhwy"
-        ],
-        "artifact": "libjxl",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "liblz4": {
-        "type": "library",
-        "artifact": "liblz4",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libmemcached": {
-        "type": "library",
-        "artifact": "libmemcached",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libpng": {
-        "type": "library",
-        "depends": [
-            "zlib"
-        ],
-        "headers@windows": [
-            "png.h",
-            "pngconf.h"
-        ],
-        "headers": [
-            "png.h",
-            "pngconf.h",
-            "pnglibconf.h"
-        ],
-        "artifact": "libpng",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "librabbitmq": {
-        "type": "library",
-        "depends": [
-            "openssl"
-        ],
-        "artifact": "librabbitmq",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "librdkafka": {
-        "type": "library",
-        "suggests": [
-            "curl",
-            "liblz4",
-            "openssl",
-            "zlib",
-            "zstd"
-        ],
-        "pkg-configs": [
-            "rdkafka++-static",
-            "rdkafka-static"
-        ],
-        "artifact": "librdkafka",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libsodium": {
-        "type": "library",
-        "artifact": "libsodium",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libssh2": {
-        "type": "library",
-        "depends": [
-            "openssl"
-        ],
-        "headers": [
-            "libssh2.h",
-            "libssh2_publickey.h",
-            "libssh2_sftp.h"
-        ],
-        "artifact": "libssh2",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "libtiff": {
-        "type": "library",
-        "depends": [
-            "zlib",
-            "libjpeg"
-        ],
-        "suggests": [
-            "lerc",
-            "libwebp",
-            "jbig",
-            "xz",
-            "zstd"
-        ],
-        "artifact": "libtiff",
-        "license": {
-            "type": "file",
-            "path": "LICENSE.md"
-        }
-    },
-    "liburing": {
-        "type": "library",
-        "headers@linux": [
-            "liburing/",
-            "liburing.h"
-        ],
-        "pkg-configs": [
-            "liburing",
-            "liburing-ffi"
-        ],
-        "artifact": "liburing",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "libuuid": {
-        "type": "library",
-        "headers": [
-            "uuid/uuid.h"
-        ],
-        "artifact": "libuuid",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "libuv": {
-        "type": "library",
-        "artifact": "libuv",
-        "license": [
-            {
-                "type": "file",
-                "path": "LICENSE"
-            },
-            {
-                "type": "file",
-                "path": "LICENSE-extra"
-            }
-        ]
-    },
-    "libwebp": {
-        "type": "library",
-        "pkg-configs": [
-            "libwebp",
-            "libwebpdecoder",
-            "libwebpdemux",
-            "libwebpmux",
-            "libsharpyuv"
-        ],
-        "artifact": "libwebp",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "libxml2": {
-        "type": "library",
-        "depends@windows": [
-            "libiconv-win"
-        ],
-        "depends": [
-            "libiconv"
-        ],
-        "suggests@windows": [
-            "zlib"
-        ],
-        "suggests": [
-            "xz",
-            "zlib"
-        ],
-        "headers": [
-            "libxml2"
-        ],
-        "pkg-configs": [
-            "libxml-2.0"
-        ],
-        "artifact": "libxml2",
-        "license": {
-            "type": "file",
-            "path": "Copyright"
-        }
-    },
-    "libxslt": {
-        "type": "library",
-        "depends": [
-            "libxml2"
-        ],
-        "artifact": "libxslt",
-        "license": {
-            "type": "file",
-            "path": "Copyright"
-        }
-    },
-    "libyaml": {
-        "type": "library",
-        "headers": [
-            "yaml.h"
-        ],
-        "artifact": "libyaml",
-        "license": {
-            "type": "file",
-            "path": "License"
-        }
-    },
-    "libzip": {
-        "type": "library",
-        "depends@windows": [
-            "zlib",
-            "bzip2",
-            "xz"
-        ],
-        "depends": [
-            "zlib"
-        ],
-        "suggests@windows": [
-            "zstd",
-            "openssl"
-        ],
-        "suggests": [
-            "bzip2",
-            "xz",
-            "zstd",
-            "openssl"
-        ],
-        "headers": [
-            "zip.h",
-            "zipconf.h"
-        ],
-        "artifact": "libzip",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "mimalloc": {
-        "type": "library",
-        "artifact": "mimalloc",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "ncurses": {
-        "type": "library",
-        "artifact": "ncurses",
-        "static-libs@unix": [
-            "libncurses.a"
-        ],
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "net-snmp": {
-        "type": "library",
-        "depends": [
-            "openssl",
-            "zlib"
-        ],
-        "pkg-configs": [
-            "netsnmp",
-            "netsnmp-agent"
-        ],
-        "artifact": "net-snmp",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "nghttp2": {
-        "type": "library",
-        "depends": [
-            "zlib",
-            "openssl"
-        ],
-        "suggests": [
-            "libxml2",
-            "nghttp3",
-            "ngtcp2"
-        ],
-        "headers": [
-            "nghttp2"
-        ],
-        "artifact": "nghttp2",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "nghttp3": {
-        "type": "library",
-        "depends": [
-            "openssl"
-        ],
-        "headers": [
-            "nghttp3"
-        ],
-        "artifact": "nghttp3",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "ngtcp2": {
-        "type": "library",
-        "depends": [
-            "openssl"
-        ],
-        "suggests": [
-            "nghttp3",
-            "brotli"
-        ],
-        "headers": [
-            "ngtcp2"
-        ],
-        "artifact": "ngtcp2",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "onig": {
-        "type": "library",
-        "headers": [
-            "oniggnu.h",
-            "oniguruma.h"
-        ],
-        "artifact": "onig",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "openssl": {
-        "type": "library",
-        "depends": [
-            "zlib"
-        ],
-        "headers": [
-            "openssl"
-        ],
-        "artifact": "openssl",
-        "license": {
-            "type": "file",
-            "path": "LICENSE.txt"
-        }
-    },
-    "postgresql": {
-        "type": "library",
-        "depends": [
-            "libiconv",
-            "libxml2",
-            "openssl",
-            "zlib",
-            "libedit"
-        ],
-        "suggests": [
-            "icu",
-            "libxslt",
-            "ldap",
-            "zstd"
-        ],
-        "pkg-configs": [
-            "libpq"
-        ],
-        "artifact": "postgresql",
-        "license": {
-            "type": "file",
-            "path": "COPYRIGHT"
-        }
-    },
-    "postgresql-win": {
-        "type": "library",
-        "artifact": "postgresql-win",
-        "license": {
-            "type": "text",
-            "text": "PostgreSQL Database Management System\n(also known as Postgres, formerly as Postgres95)\n\nPortions Copyright (c) 1996-2025, The PostgreSQL Global Development Group\n\nPortions Copyright (c) 1994, The Regents of the University of California\n\nPermission to use, copy, modify, and distribute this software and its\ndocumentation for any purpose, without fee, and without a written\nagreement is hereby granted, provided that the above copyright notice\nand this paragraph and the following two paragraphs appear in all\ncopies.\n\nIN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,\nINCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS\nDOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF\nTHE POSSIBILITY OF SUCH DAMAGE.\n\nTHE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY\nAND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS\nON AN \"AS IS\" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS\nTO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
-        }
-    },
-    "pthreads4w": {
-        "type": "library",
-        "artifact": "pthreads4w",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "qdbm": {
-        "type": "library",
-        "headers@windows": [
-            "depot.h"
-        ],
-        "artifact": "qdbm",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "re2c": {
-        "type": "library",
-        "artifact": "re2c",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "readline": {
-        "type": "library",
-        "depends": [
-            "ncurses"
-        ],
-        "artifact": "readline",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "snappy": {
-        "type": "library",
-        "depends": [
-            "zlib"
-        ],
-        "headers": [
-            "snappy.h",
-            "snappy-c.h",
-            "snappy-sinksource.h",
-            "snappy-stubs-public.h"
-        ],
-        "artifact": "snappy",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "sqlite": {
-        "type": "library",
-        "headers": [
-            "sqlite3.h",
-            "sqlite3ext.h"
-        ],
-        "artifact": "sqlite",
-        "license": {
-            "type": "text",
-            "text": "The author disclaims copyright to this source code.  In place of\na legal notice, here is a blessing:\n\n  *   May you do good and not evil.\n  *   May you find forgiveness for yourself and forgive others.\n  *   May you share freely, never taking more than you give."
-        }
-    },
-    "tidy": {
-        "type": "library",
-        "artifact": "tidy",
-        "license": {
-            "type": "file",
-            "path": "README/LICENSE.md"
-        }
-    },
-    "unixodbc": {
-        "type": "library",
-        "depends": [
-            "libiconv"
-        ],
-        "artifact": "unixodbc",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "watcher": {
-        "type": "library",
-        "headers": [
-            "wtr/watcher-c.h"
-        ],
-        "artifact": "watcher",
-        "license": {
-            "type": "file",
-            "path": "license"
-        }
-    },
-    "xz": {
-        "type": "library",
-        "depends": [
-            "libiconv"
-        ],
-        "headers@windows": [
-            "lzma",
-            "lzma.h"
-        ],
-        "headers": [
-            "lzma"
-        ],
-        "artifact": "xz",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "zlib": {
-        "type": "library",
-        "headers": [
-            "zlib.h",
-            "zconf.h"
-        ],
-        "artifact": "zlib",
-        "license": {
-            "type": "text",
-            "text": "(C) 1995-2022 Jean-loup Gailly and Mark Adler\n\nThis software is provided 'as-is', without any express or implied\nwarranty.  In no event will the authors be held liable for any damages\narising from the use of this software.\n\nPermission is granted to anyone to use this software for any purpose,\nincluding commercial applications, and to alter it and redistribute it\nfreely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you must not\n claim that you wrote the original software. If you use this software\n in a product, an acknowledgment in the product documentation would be\n appreciated but is not required.\n2. Altered source versions must be plainly marked as such, and must not be\n misrepresented as being the original software.\n3. This notice may not be removed or altered from any source distribution.\n\nJean-loup Gailly        Mark Adler\njloup@gzip.org          madler@alumni.caltech.edu"
-        }
-    },
-    "zstd": {
-        "type": "library",
-        "headers@windows": [
-            "zstd.h",
-            "zstd_errors.h"
-        ],
-        "headers": [
-            "zdict.h",
-            "zstd.h",
-            "zstd_errors.h"
-        ],
-        "artifact": "zstd",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    }
-}

config/pkg.target.json

@@ -1,95 +0,0 @@
-{
-    "vswhere": {
-        "type": "target",
-        "artifact": "vswhere"
-    },
-    "pkg-config": {
-        "type": "target",
-        "static-bins": [
-            "pkg-config"
-        ],
-        "artifact": "pkg-config"
-    },
-    "php": {
-        "type": "target",
-        "artifact": "php-src",
-        "depends@macos": [
-            "libxml2"
-        ]
-    },
-    "php-cli": {
-        "type": "virtual-target",
-        "depends": [
-            "php"
-        ]
-    },
-    "php-micro": {
-        "type": "virtual-target",
-        "artifact": "micro",
-        "depends": [
-            "php"
-        ]
-    },
-    "php-cgi": {
-        "type": "virtual-target",
-        "depends": [
-            "php"
-        ]
-    },
-    "php-fpm": {
-        "type": "virtual-target",
-        "depends": [
-            "php"
-        ]
-    },
-    "php-embed": {
-        "type": "virtual-target",
-        "depends": [
-            "php"
-        ]
-    },
-    "frankenphp": {
-        "type": "virtual-target",
-        "artifact": "frankenphp",
-        "depends": [
-            "php-embed",
-            "go-xcaddy"
-        ],
-        "depends@macos": [
-            "php-embed",
-            "go-xcaddy",
-            "libxml2"
-        ]
-    },
-    "go-xcaddy": {
-        "type": "target",
-        "artifact": "go-xcaddy",
-        "static-bins": [
-            "xcaddy"
-        ]
-    },
-    "musl-toolchain": {
-        "type": "target",
-        "artifact": "musl-toolchain"
-    },
-    "strawberry-perl": {
-        "type": "target",
-        "artifact": "strawberry-perl"
-    },
-    "upx": {
-        "type": "target",
-        "artifact": "upx"
-    },
-    "zig": {
-        "type": "target",
-        "artifact": "zig"
-    },
-    "nasm": {
-        "type": "target",
-        "artifact": "nasm"
-    },
-    "php-sdk-binary-tools": {
-        "type": "target",
-        "artifact": "php-sdk-binary-tools"
-    }
-}

config/source.json

@@ -47,7 +47,7 @@
         "provide-pre-built": true,
         "license": {
             "type": "file",
-            "path": "doc/COPYING.LGPL"
+            "path": "doc/COPYING"
         }
     },
     "brotli": {
@@ -184,15 +184,6 @@
             ]
         }
     },
-    "ext-maxminddb": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/maxminddb",
-        "filename": "ext-maxminddb.tgz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "ext-memcache": {
         "type": "url",
         "url": "https://pecl.php.net/get/memcache",
@@ -242,16 +233,6 @@
             "path": "LICENSE"
         }
     },
-    "ext-trader": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/trader",
-        "path": "php-src/ext/trader",
-        "filename": "trader.tgz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "ext-uuid": {
         "type": "url",
         "url": "https://pecl.php.net/get/uuid",
@@ -285,6 +266,7 @@
     "ext-zip": {
         "type": "url",
         "url": "https://pecl.php.net/get/zip",
+        "path": "php-src/ext/zip-shared",
         "filename": "ext-zip.tgz",
         "license": {
             "type": "file",
@@ -310,19 +292,10 @@
             "path": "LICENSE.MIT"
         }
     },
-    "frankenphp": {
-        "type": "ghtar",
-        "repo": "php/frankenphp",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "freetype": {
-        "type": "ghtagtar",
-        "repo": "freetype/freetype",
-        "match": "VER-2-\\d+-\\d+",
+        "type": "git",
+        "rev": "VER-2-13-2",
+        "url": "https://github.com/freetype/freetype",
         "license": {
             "type": "file",
             "path": "LICENSE.TXT"
@@ -334,17 +307,16 @@
         "regex": "/href=\"(?<file>gettext-(?<version>[^\"]+)\\.tar\\.xz)\"/",
         "license": {
             "type": "file",
-            "path": "gettext-runtime/intl/COPYING.LIB"
+            "path": "COPYING"
         }
     },
     "gmp": {
-        "type": "filelist",
-        "url": "https://gmplib.org/download/gmp/",
-        "regex": "/href=\"(?<file>gmp-(?<version>[^\"]+)\\.tar\\.xz)\"/",
+        "type": "url",
+        "url": "https://dl.static-php.dev/static-php-cli/deps/gmp/gmp-6.3.0.tar.xz",
         "provide-pre-built": true,
         "alt": {
-            "type": "url",
-            "url": "https://dl.static-php.dev/static-php-cli/deps/gmp/gmp-6.3.0.tar.xz"
+            "type": "ghtagtar",
+            "repo": "alisw/GMP"
         },
         "license": {
             "type": "text",
@@ -362,7 +334,7 @@
     },
     "grpc": {
         "type": "git",
-        "rev": "v1.75.x",
+        "rev": "v1.68.x",
         "url": "https://github.com/grpc/grpc.git",
         "provide-pre-built": true,
         "license": {
@@ -439,16 +411,6 @@
             "path": "COPYING"
         }
     },
-    "krb5": {
-        "type": "ghtagtar",
-        "repo": "krb5/krb5",
-        "match": "krb5.+-final",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "NOTICE"
-        }
-    },
     "ldap": {
         "type": "filelist",
         "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/",
@@ -478,7 +440,7 @@
         "provide-pre-built": true,
         "license": {
             "type": "file",
-            "path": "doc/COPYING.LGPL"
+            "path": "doc/COPYING"
         }
     },
     "libaom": {
@@ -537,16 +499,6 @@
             "path": "COPYING"
         }
     },
-    "libedit": {
-        "type": "filelist",
-        "url": "https://thrysoee.dk/editline/",
-        "regex": "/href=\"(?<file>libedit-(?<version>[^\"]+)\\.tar\\.gz)\"/",
-        "provide-pre-built": true,
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
     "libevent": {
         "type": "ghrel",
         "repo": "libevent/libevent",
@@ -595,7 +547,7 @@
         "provide-pre-built": true,
         "license": {
             "type": "file",
-            "path": "COPYING.LIB"
+            "path": "COPYING"
         }
     },
     "libiconv-win": {
@@ -607,15 +559,6 @@
             "path": "source/COPYING"
         }
     },
-    "libidn2": {
-        "type": "filelist",
-        "url": "https://ftp.gnu.org/gnu/libidn/",
-        "regex": "/href=\"(?<file>libidn2-(?<version>[^\"]+)\\.tar\\.gz)\"/",
-        "license": {
-            "type": "file",
-            "path": "COPYING.LESSERv3"
-        }
-    },
     "libjpeg": {
         "type": "ghtar",
         "repo": "libjpeg-turbo/libjpeg-turbo",
@@ -650,16 +593,6 @@
             "path": "LICENSE"
         }
     },
-    "libmaxminddb": {
-        "type": "ghrel",
-        "repo": "maxmind/libmaxminddb",
-        "match": "libmaxminddb-.+\\.tar\\.gz",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "libmemcached": {
         "type": "ghtagtar",
         "repo": "awesomized/libmemcached",
@@ -727,30 +660,10 @@
             "path": "LICENSE.md"
         }
     },
-    "libunistring": {
-        "type": "filelist",
-        "url": "https://ftp.gnu.org/gnu/libunistring/",
-        "regex": "/href=\"(?<file>libunistring-(?<version>[^\"]+)\\.tar\\.gz)\"/",
-        "provide-pre-built": true,
-        "license": {
-            "type": "file",
-            "path": "COPYING.LIB"
-        }
-    },
-    "liburing": {
-        "type": "ghtar",
-        "repo": "axboe/liburing",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
     "libuuid": {
         "type": "git",
         "url": "https://github.com/static-php/libuuid.git",
         "rev": "master",
-        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "COPYING"
@@ -830,7 +743,7 @@
     "micro": {
         "type": "git",
         "path": "php-src/sapi/micro",
-        "rev": "master",
+        "rev": "php-85-win",
         "url": "https://github.com/static-php/phpmicro",
         "license": {
             "type": "file",
@@ -878,14 +791,6 @@
             "path": "COPYING"
         }
     },
-    "net-snmp": {
-        "type": "ghtagtar",
-        "repo": "net-snmp/net-snmp",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
     "nghttp2": {
         "type": "ghrel",
         "repo": "nghttp2/nghttp2",
@@ -963,15 +868,6 @@
             "path": "LICENSE"
         }
     },
-    "pcov": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/pcov",
-        "filename": "pcov.tgz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "pdo_sqlsrv": {
         "type": "url",
         "url": "https://pecl.php.net/get/pdo_sqlsrv",
@@ -994,7 +890,7 @@
     "postgresql": {
         "type": "ghtagtar",
         "repo": "postgres/postgres",
-        "match": "REL_18_\\d+",
+        "match": "REL_16_\\d+",
         "license": {
             "type": "file",
             "path": "COPYRIGHT"
@@ -1085,6 +981,7 @@
     },
     "snappy": {
         "type": "git",
+        "repo": "google/snappy",
         "rev": "main",
         "url": "https://github.com/google/snappy",
         "license": {
@@ -1093,8 +990,9 @@
         }
     },
     "spx": {
-        "type": "pie",
-        "repo": "noisebynorthwest/php-spx",
+        "type": "git",
+        "rev": "master",
+        "url": "https://github.com/static-php/php-spx.git",
         "path": "php-src/ext/spx",
         "license": {
             "type": "file",
@@ -1248,5 +1146,14 @@
             "type": "file",
             "path": "LICENSE"
         }
+    },
+    "liburing": {
+        "type": "ghtar",
+        "repo": "axboe/liburing",
+        "prefer-stable": true,
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
     }
 }

docs/.vitepress/components/CliGenerator.vue

@@ -744,26 +744,10 @@ h2 {
 }
 
 select {
-  border-radius: 8px;
+  border-radius: 4px;
   border: 1px solid var(--vp-c-divider);
-  padding: 8px 12px;
+  padding: 0 4px;
   width: 300px;
-  background-color: var(--vp-c-bg-soft);
-  color: var(--vp-c-text-1);
-  font-size: 14px;
-  transition: all 0.2s ease;
-  cursor: pointer;
-  outline: none;
-}
-
-select:hover {
-  border-color: var(--vp-c-brand-1);
-  background-color: var(--vp-c-bg);
-}
-
-select:focus {
-  border-color: var(--vp-c-brand-1);
-  box-shadow: 0 0 0 3px var(--vp-c-brand-soft);
 }
 
 .my-btn {
@@ -797,160 +781,17 @@ select:focus {
 
 .textarea {
   border: 1px solid var(--vp-c-divider);
-  border-radius: 8px;
-  width: calc(100% - 24px);
-  padding: 12px;
-  background-color: var(--vp-c-bg-soft);
-  color: var(--vp-c-text-1);
-  font-size: 14px;
-  font-family: var(--vp-font-family-mono);
-  line-height: 1.5;
-  transition: all 0.2s ease;
-  outline: none;
-  resize: vertical;
-}
-
-.textarea:hover {
-  border-color: var(--vp-c-brand-1);
-  background-color: var(--vp-c-bg);
-}
-
-.textarea:focus {
-  border-color: var(--vp-c-brand-1);
-  box-shadow: 0 0 0 3px var(--vp-c-brand-soft);
+  border-radius: 4px;
+  width: calc(100% - 12px);
+  padding: 4px 8px;
 }
 
 .input {
   display: block;
   border: 1px solid var(--vp-c-divider);
-  border-radius: 8px;
-  width: 100%;
-  padding: 10px 12px;
-  background-color: var(--vp-c-bg-soft);
-  color: var(--vp-c-text-1);
-  font-size: 14px;
-  transition: all 0.2s ease;
-  outline: none;
-  box-sizing: border-box;
-}
-
-.input:hover {
-  border-color: var(--vp-c-brand-1);
-  background-color: var(--vp-c-bg);
-}
-
-.input:focus {
-  border-color: var(--vp-c-brand-1);
-  box-shadow: 0 0 0 3px var(--vp-c-brand-soft);
-}
-
-/* Radio button styles */
-input[type="radio"] {
-  appearance: none;
-  width: 18px;
-  height: 18px;
-  border: 2px solid var(--vp-c-border);
-  border-radius: 50%;
-  background-color: var(--vp-c-bg);
-  cursor: pointer;
-  position: relative;
-  vertical-align: middle;
-  margin-right: 6px;
-  transition: all 0.2s ease;
-}
-
-input[type="radio"]:hover {
-  border-color: var(--vp-c-brand-1);
-  background-color: var(--vp-c-bg-soft);
-}
-
-input[type="radio"]:checked {
-  border-color: var(--vp-c-brand-1);
-  background-color: var(--vp-c-brand-1);
-}
-
-input[type="radio"]:checked::after {
-  content: '';
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 8px;
-  height: 8px;
-  border-radius: 50%;
-  background-color: var(--vp-c-bg);
-}
-
-input[type="radio"]:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
-/* Checkbox styles */
-input[type="checkbox"] {
-  appearance: none;
-  width: 18px;
-  height: 18px;
-  border: 2px solid var(--vp-c-border);
   border-radius: 4px;
-  background-color: var(--vp-c-bg);
-  cursor: pointer;
-  position: relative;
-  vertical-align: middle;
-  margin-right: 6px;
-  transition: all 0.2s ease;
-}
-
-input[type="checkbox"]:hover {
-  border-color: var(--vp-c-brand-1);
-  background-color: var(--vp-c-bg-soft);
-}
-
-input[type="checkbox"]:checked {
-  border-color: var(--vp-c-brand-1);
-  background-color: var(--vp-c-brand-1);
-}
-
-input[type="checkbox"]:checked::after {
-  content: '';
-  position: absolute;
-  top: 2px;
-  left: 5px;
-  width: 4px;
-  height: 8px;
-  border: solid var(--vp-c-bg);
-  border-width: 0 2px 2px 0;
-  transform: rotate(45deg);
-}
-
-input[type="checkbox"]:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
-/* Label styles */
-label {
-  cursor: pointer;
-  user-select: none;
-  color: var(--vp-c-text-1);
-  font-size: 14px;
-  line-height: 1.5;
-  transition: color 0.2s ease;
-}
-
-label:hover {
-  color: var(--vp-c-brand-1);
-}
-
-input[type="radio"]:disabled + label,
-input[type="checkbox"]:disabled + label {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
-input[type="radio"]:disabled + label:hover,
-input[type="checkbox"]:disabled + label:hover {
-  color: var(--vp-c-text-1);
+  width: 100%;
+  padding: 4px 8px;
 }
 
 .command-container {

docs/.vitepress/components/Contributors.vue

@@ -1,219 +0,0 @@
-<template>
-  <div class="contributors-container">
-    <div class="contributors-header">
-      <h2>Contributors</h2>
-      <p class="contributors-description">
-        Thanks to all the amazing people who have contributed to this project!
-      </p>
-    </div>
-
-    <div v-if="loading" class="loading-state">
-      <div class="spinner"></div>
-      <p>Loading contributors...</p>
-    </div>
-
-    <div v-else-if="error" class="error-state">
-      <p>{{ error }}</p>
-    </div>
-
-    <div v-else class="contributors-grid">
-      <a
-        v-for="contributor in contributors"
-        :key="contributor.id"
-        :href="contributor.html_url"
-        target="_blank"
-        rel="noopener noreferrer"
-        class="contributor-card"
-        :title="contributor.login"
-      >
-        <img
-          :src="contributor.avatar_url"
-          :alt="contributor.login"
-          class="contributor-avatar"
-          loading="lazy"
-        />
-        <div class="contributor-name">{{ contributor.login }}</div>
-      </a>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted } from 'vue';
-
-interface Contributor {
-  id: number;
-  login: string;
-  avatar_url: string;
-  html_url: string;
-  contributions: number;
-}
-
-const contributors = ref<Contributor[]>([]);
-const loading = ref(true);
-const error = ref('');
-
-const fetchContributors = async () => {
-  try {
-    loading.value = true;
-    error.value = '';
-
-    const response = await fetch(
-      'https://api.github.com/repos/crazywhalecc/static-php-cli/contributors?per_page=24'
-    );
-
-    if (!response.ok) {
-      throw new Error('Failed to fetch contributors');
-    }
-
-    const data = await response.json();
-    contributors.value = data;
-  } catch (err) {
-    error.value = 'Failed to load contributors. Please try again later.';
-    console.error('Error fetching contributors:', err);
-  } finally {
-    loading.value = false;
-  }
-};
-
-onMounted(() => {
-  fetchContributors();
-});
-</script>
-
-<style scoped>
-.contributors-container {
-  margin: 48px auto;
-  padding: 32px 24px;
-  max-width: 1152px;
-  background: linear-gradient(135deg, var(--vp-c-bg-soft) 0%, var(--vp-c-bg) 100%);
-  border-radius: 16px;
-  border: 1px solid var(--vp-c-divider);
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.05);
-}
-
-.contributors-header {
-  text-align: center;
-  margin-bottom: 24px;
-}
-
-.contributors-header h2 {
-  font-size: 1.5rem;
-  font-weight: 700;
-  margin: 0 0 8px 0;
-  background: linear-gradient(120deg, var(--vp-c-brand-1), var(--vp-c-brand-2));
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-  background-clip: text;
-}
-
-.contributors-description {
-  font-size: 0.95rem;
-  color: var(--vp-c-text-2);
-  margin: 0;
-  line-height: 1.5;
-}
-
-.loading-state,
-.error-state {
-  text-align: center;
-  padding: 40px 20px;
-  color: var(--vp-c-text-2);
-}
-
-.spinner {
-  width: 40px;
-  height: 40px;
-  margin: 0 auto 16px;
-  border: 4px solid var(--vp-c-divider);
-  border-top-color: var(--vp-c-brand-1);
-  border-radius: 50%;
-  animation: spin 1s linear infinite;
-}
-
-@keyframes spin {
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-.contributors-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(90px, 1fr));
-  gap: 16px;
-}
-
-.contributor-card {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 12px;
-  background: var(--vp-c-bg);
-  border-radius: 12px;
-  border: 1px solid var(--vp-c-divider);
-  transition: all 0.3s ease;
-  text-decoration: none;
-  color: var(--vp-c-text-1);
-}
-
-.contributor-card:hover {
-  transform: translateY(-4px);
-  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
-  border-color: var(--vp-c-brand-1);
-}
-
-.contributor-avatar {
-  width: 60px;
-  height: 60px;
-  border-radius: 50%;
-  border: 2px solid var(--vp-c-divider);
-  transition: all 0.3s ease;
-  margin-bottom: 8px;
-}
-
-.contributor-card:hover .contributor-avatar {
-  border-color: var(--vp-c-brand-1);
-  transform: scale(1.05);
-}
-
-.contributor-name {
-  font-size: 12px;
-  font-weight: 500;
-  text-align: center;
-  word-break: break-word;
-  max-width: 100%;
-}
-
-@media (max-width: 768px) {
-  .contributors-container {
-    margin: 32px 16px;
-    padding: 24px 16px;
-  }
-
-  .contributors-header h2 {
-    font-size: 1.25rem;
-  }
-
-  .contributors-description {
-    font-size: 0.9rem;
-  }
-
-  .contributors-grid {
-    grid-template-columns: repeat(auto-fill, minmax(70px, 1fr));
-    gap: 12px;
-  }
-
-  .contributor-card {
-    padding: 8px;
-  }
-
-  .contributor-avatar {
-    width: 48px;
-    height: 48px;
-  }
-
-  .contributor-name {
-    font-size: 11px;
-  }
-}
-</style>

docs/.vitepress/config.ts

@@ -4,7 +4,7 @@ import sidebarZh from "./sidebar.zh";
 
 // https://vitepress.dev/reference/site-config
 export default {
-  title: "Static PHP",
+  title: "static-php-cli",
   description: "Build single static PHP binary, with PHP project together, with popular extensions included.",
   locales: {
     en: {
@@ -44,7 +44,6 @@ export default {
   },
   themeConfig: {
     // https://vitepress.dev/reference/default-theme-config
-    logo: '/images/static-php_nobg.png',
     nav: [],
     socialLinks: [
       {icon: 'github', link: 'https://github.com/crazywhalecc/static-php-cli'}

docs/.vitepress/theme/style.css

@@ -4,21 +4,3 @@
     max-width: 1000px !important;
 }
 
-
-.vp-doc .contributors-header h2 {
-    padding-top: 0;
-    border-top: none;
-}
-
-.vp-doc .sponsors-header h2 {
-    padding-top: 0;
-    border-top: none;
-}
-
-.dark .VPImage.logo {
-  filter: contrast(0.7);
-}
-
-.dark .VPImage.image-src {
-  filter: contrast(0.7);
-}

docs/en/develop/source-module.md

@@ -36,7 +36,6 @@ The following is the source download configuration corresponding to the `libeven
 The most important field here is `type`. Currently, the types it supports are:
 
 - `url`: Directly use URL to download, for example: `https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz`.
-- `pie`: Download PHP extensions from Packagist using the PIE (PHP Installer for Extensions) standard.
 - `ghrel`: Use the GitHub Release API to download, download the artifacts uploaded from the latest version released by maintainers.
 - `ghtar`: Use the GitHub Release API to download. 
     Different from `ghrel`, `ghtar` is downloaded from the `source code (tar.gz)` in the latest Release of the project.
@@ -90,37 +89,6 @@ Example (download the imagick extension and extract it to the extension storage
 }
 ```
 
-## Download type - pie
-
-PIE (PHP Installer for Extensions) type sources refer to downloading PHP extensions from Packagist that follow the PIE standard.
-This method automatically fetches extension information from the Packagist repository and downloads the appropriate distribution file.
-
-The parameters included are:
-
-- `repo`: The Packagist vendor/package name, such as `vendor/package-name`
-
-Example (download a PHP extension from Packagist using PIE):
-
-```json
-{
-  "ext-example": {
-    "type": "pie",
-    "repo": "vendor/example-extension",
-    "path": "php-src/ext/example",
-    "license": {
-      "type": "file",
-      "path": "LICENSE"
-    }
-  }
-}
-```
-
-::: tip
-The PIE download type will automatically detect the extension information from Packagist metadata, 
-including the download URL, version, and distribution type. 
-The extension must be marked as `type: php-ext` or contain `php-ext` metadata in its Packagist package definition.
-:::
-
 ## Download type - ghrel
 
 ghrel will download files from Assets uploaded in GitHub Release. 

docs/en/faq/index.md

@@ -44,11 +44,6 @@ So on macOS, you can **directly** use SPC to build statically compiled PHP binar
 2. You will get `buildroot/modules/xdebug.so` and `buildroot/bin/php`.
 3. The `xdebug.so` file could be used for php that version and thread-safe are the same.
 
-For the Windows platform, since officially built extensions (such as `php_yaml.dll`) force the use of the `php8.dll` dynamic library as a link, and statically built PHP does not include any dynamic libraries other than system libraries,
-php.exe built by static-php cannot load officially built dynamic extensions. Since static-php-cli does not yet support building dynamic extensions, there is currently no way to load dynamic extensions with static-php.
-
-However, Windows can normally use the `FFI` extension to load other dll files and call them.
-
 ## Can it support Oracle database extension?
 
 Some extensions that rely on closed source libraries, such as `oci8`, `sourceguardian`, etc., 

docs/en/index.md

@@ -3,14 +3,11 @@
 layout: home
 
 hero:
-  name: "Static PHP"
+  name: "static-php-cli"
   tagline: "Build standalone PHP binary on Linux, macOS, FreeBSD, Windows, with PHP project together, with popular extensions included."
-  image:
-    src: /images/static-php_nobg.png
-    alt: Static PHP CLI Logo
   actions:
     - theme: brand
-      text: Get Started
+      text: Guide
       link: ./guide/
 
 features:
@@ -22,121 +19,3 @@ features:
     details: static-php-cli comes with dependency management and supports installation of different types of PHP extensions.
 ---
 
-<script setup>
-import {VPSponsors} from "vitepress/theme";
-import Contributors from '../.vitepress/components/Contributors.vue';
-
-const sponsors = [
-  { name: 'Beyond Code', img: '/images/beyondcode-seeklogo.png', url: 'https://beyondco.de/' },
-  { name: 'NativePHP', img: '/images/nativephp-logo.svg', url: 'https://nativephp.com/' },
-];
-</script>
-
-<div class="sponsors-section">
-  <div class="sponsors-header">
-    <h2>Special Sponsors</h2>
-    <p class="sponsors-description">
-      Thank you to our amazing sponsors for supporting this project!
-    </p>
-  </div>
-  <VPSponsors :data="sponsors"/>
-</div>
-
-<style scoped>
-.sponsors-section {
-  margin: 48px auto;
-  padding: 32px 24px;
-  max-width: 1152px;
-  background: linear-gradient(135deg, var(--vp-c-bg-soft) 0%, var(--vp-c-bg) 100%);
-  border-radius: 16px;
-  border: 1px solid var(--vp-c-divider);
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.05);
-  transition: all 0.3s ease;
-}
-
-.sponsors-section:hover {
-  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.1);
-  transform: translateY(-2px);
-}
-
-.sponsors-header {
-  text-align: center;
-  margin-bottom: 24px;
-}
-
-.sponsors-header h2 {
-  font-size: 1.5rem;
-  font-weight: 700;
-  margin: 0 0 8px 0;
-  background: linear-gradient(120deg, var(--vp-c-brand-1), var(--vp-c-brand-2));
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-  background-clip: text;
-}
-
-.sponsors-description {
-  font-size: 0.95rem;
-  color: var(--vp-c-text-2);
-  margin: 0;
-  line-height: 1.5;
-}
-
-@media (max-width: 768px) {
-  .sponsors-section {
-    margin: 32px 16px;
-    padding: 24px 16px;
-  }
-  
-  .sponsors-header h2 {
-    font-size: 1.25rem;
-  }
-  
-  .sponsors-description {
-    font-size: 0.9rem;
-  }
-}
-
-/* Hero logo styling */
-:deep(.VPImage.image-src) {
-  border-radius: 20px;
-  background: linear-gradient(135deg, var(--vp-c-bg-soft) 0%, var(--vp-c-default-soft) 100%);
-  padding: 40px;
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
-  transition: all 0.3s ease;
-}
-
-:deep(.VPImage.image-src:hover) {
-  transform: translateY(-4px);
-  box-shadow: 0 12px 40px rgba(0, 0, 0, 0.15);
-}
-
-/* Dark mode adjustments for logo */
-.dark :deep(.VPImage.image-src) {
-  background: linear-gradient(135deg, rgba(255, 255, 255, 0.05) 0%, rgba(255, 255, 255, 0.02) 100%);
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.5);
-  opacity: 0.9;
-}
-
-.dark :deep(.VPImage.image-src:hover) {
-  opacity: 1;
-  box-shadow: 0 12px 40px rgba(0, 0, 0, 0.7);
-}
-
-/* Additional styling for the logo image itself */
-:deep(.VPImage.image-src img) {
-  max-height: 280px;
-  width: auto;
-}
-
-@media (max-width: 768px) {
-  :deep(.VPImage.image-src) {
-    padding: 24px;
-  }
-  
-  :deep(.VPImage.image-src img) {
-    max-height: 200px;
-  }
-}
-</style>
-
-<Contributors />

docs/index.md

@@ -3,11 +3,8 @@
 layout: home
 
 hero:
-  name: "Static PHP"
+  name: "static-php-cli"
   tagline: "Build standalone PHP binary on Linux, macOS, FreeBSD, Windows, with PHP project together, with popular extensions included."
-  image:
-    src: /images/static-php_nobg.png
-    alt: Static PHP CLI Logo
   actions:
     - theme: brand
       text: Get Started
@@ -27,121 +24,13 @@ features:
 
 <script setup>
 import {VPSponsors} from "vitepress/theme";
-import Contributors from './.vitepress/components/Contributors.vue';
-
 const sponsors = [
   { name: 'Beyond Code', img: '/images/beyondcode-seeklogo.png', url: 'https://beyondco.de/' },
   { name: 'NativePHP', img: '/images/nativephp-logo.svg', url: 'https://nativephp.com/' },
 ];
 </script>
 
-<div class="sponsors-section">
-  <div class="sponsors-header">
-    <h2>Special Sponsors</h2>
-    <p class="sponsors-description">
-      Thank you to our amazing sponsors for supporting this project!
-    </p>
-  </div>
-  <VPSponsors :data="sponsors"/>
-</div>
+## Special Sponsors
 
-<style scoped>
-.sponsors-section {
-  margin: 48px auto;
-  padding: 32px 24px;
-  max-width: 1152px;
-  background: linear-gradient(135deg, var(--vp-c-bg-soft) 0%, var(--vp-c-bg) 100%);
-  border-radius: 16px;
-  border: 1px solid var(--vp-c-divider);
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.05);
-  transition: all 0.3s ease;
-}
-
-.sponsors-section:hover {
-  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.1);
-  transform: translateY(-2px);
-}
-
-.sponsors-header {
-  text-align: center;
-  margin-bottom: 24px;
-}
-
-.sponsors-header h2 {
-  font-size: 1.5rem;
-  font-weight: 700;
-  margin: 0 0 8px 0;
-  background: linear-gradient(120deg, var(--vp-c-brand-1), var(--vp-c-brand-2));
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-  background-clip: text;
-}
-
-.sponsors-description {
-  font-size: 0.95rem;
-  color: var(--vp-c-text-2);
-  margin: 0;
-  line-height: 1.5;
-}
-
-@media (max-width: 768px) {
-  .sponsors-section {
-    margin: 32px 16px;
-    padding: 24px 16px;
-  }
-  
-  .sponsors-header h2 {
-    font-size: 1.25rem;
-  }
-  
-  .sponsors-description {
-    font-size: 0.9rem;
-  }
-}
-
-/* Hero logo styling */
-:deep(.VPImage.image-src) {
-  border-radius: 20px;
-  background: linear-gradient(135deg, var(--vp-c-bg-soft) 0%, var(--vp-c-default-soft) 100%);
-  padding: 40px;
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
-  transition: all 0.3s ease;
-}
-
-:deep(.VPImage.image-src:hover) {
-  transform: translateY(-4px);
-  box-shadow: 0 12px 40px rgba(0, 0, 0, 0.15);
-}
-
-/* Dark mode adjustments for logo */
-.dark :deep(.VPImage.image-src) {
-  background: linear-gradient(135deg, rgba(255, 255, 255, 0.05) 0%, rgba(255, 255, 255, 0.02) 100%);
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.5);
-  opacity: 0.9;
-}
-
-.dark :deep(.VPImage.image-src:hover) {
-  opacity: 1;
-  box-shadow: 0 12px 40px rgba(0, 0, 0, 0.7);
-}
-
-/* Additional styling for the logo image itself */
-:deep(.VPImage.image-src img) {
-  max-height: 280px;
-  width: auto;
-}
-
-@media (max-width: 768px) {
-  :deep(.VPImage.image-src) {
-    padding: 24px;
-  }
-  
-  :deep(.VPImage.image-src img) {
-    max-height: 200px;
-  }
-}
-
-</style>
-
-<Contributors />
+<VPSponsors :data="sponsors"/>
 

docs/zh/develop/source-module.md

@@ -30,7 +30,6 @@ static-php-cli 的下载资源模块是一个主要的功能，它包含了所
 这里最主要的字段是 `type`，目前它支持的类型有：
 
 - `url`: 直接使用 URL 下载，例如：`https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz`。
-- `pie`: 使用 PIE（PHP Installer for Extensions）标准从 Packagist 下载 PHP 扩展。
 - `ghrel`: 使用 GitHub Release API 下载，即从 GitHub 项目发布的最新版本中上传的附件下载。
 - `ghtar`: 使用 GitHub Release API 下载，与 `ghrel` 不同的是，`ghtar` 是从项目的最新 Release 中找 `source code (tar.gz)` 下载的。
 - `ghtagtar`: 使用 GitHub Release API 下载，与 `ghtar` 相比，`ghtagtar` 可以从 `tags` 列表找最新的，并下载 `tar.gz` 格式的源码（因为有些项目只使用了 `tag` 发布版本）。
@@ -78,36 +77,6 @@ url 类型的资源指的是从 URL 直接下载文件。
 }
 ```
 
-## 下载类型 - pie
-
-PIE（PHP Installer for Extensions）类型的资源是从 Packagist 下载遵循 PIE 标准的 PHP 扩展。
-该方法会自动从 Packagist 仓库获取扩展信息，并下载相应的分发文件。
-
-包含的参数有：
-
-- `repo`: Packagist 的 vendor/package 名称，如 `vendor/package-name`
-
-例子（使用 PIE 从 Packagist 下载 PHP 扩展）：
-
-```json
-{
-  "ext-example": {
-    "type": "pie",
-    "repo": "vendor/example-extension",
-    "path": "php-src/ext/example",
-    "license": {
-      "type": "file",
-      "path": "LICENSE"
-    }
-  }
-}
-```
-
-::: tip
-PIE 下载类型会自动从 Packagist 元数据中检测扩展信息，包括下载 URL、版本和分发类型。
-扩展必须在其 Packagist 包定义中标记为 `type: php-ext` 或包含 `php-ext` 元数据。
-:::
-
 ## 下载类型 - ghrel
 
 ghrel 会从 GitHub Release 中上传的 Assets 下载文件。首先使用 GitHub Release API 获取最新版本，然后根据正则匹配方式下载相应的文件。

docs/zh/faq/index.md

@@ -41,11 +41,6 @@ buildroot/bin/php -d "zend_extension=/path/to/php{PHP_VER}-{ts/nts}/xdebug.so" -
 2. 你将获得 `buildroot/modules/xdebug.so` 和 `buildroot/bin/php`。
 3. `xdebug.so` 文件可用于版本和线程安全相同的 php。
 
-对于 Windows 平台，由于官方构建的扩展（如 `php_yaml.dll`）强制使用了 `php8.dll` 动态库作为链接，静态构建的 PHP 不包含任何系统库以外的动态库，
-所以 Windows 下无法加载官方构建的动态扩展。 由于 static-php-cli 还暂未支持构建动态扩展，所以目前还没有让 static-php 加载动态扩展的方法。
-
-不过，Windows 可以正常使用 `FFI` 扩展加载其他的 dll 文件并调用。
-
 ## 可以支持 Oracle 数据库扩展吗？
 
 部分依赖库闭源的扩展，如 `oci8`、`sourceguardian` 等，它们没有提供纯静态编译的依赖库文件（`.a`），仅提供了动态依赖库文件（`.so`），

docs/zh/index.md

@@ -3,140 +3,18 @@
 layout: home
 
 hero:
-  name: "Static PHP"
+  name: "static-php-cli"
   tagline: "在 Linux、macOS、FreeBSD、Windows 上与 PHP 项目一起构建独立的 PHP 二进制文件，并包含流行的扩展。"
-  image:
-    src: /images/static-php_nobg.png
-    alt: Static PHP CLI Logo
   actions:
     - theme: brand
-      text: 开始使用
+      text: 指南
       link: ./guide/
 
 features:
-  - title: 静态 CLI 二进制
-    details: 您可以轻松地编译一个独立的 PHP 二进制文件以供通用使用，包括 CLI、FPM SAPI。
-  - title: Micro 自解压可执行文件
-    details: 您可以编译一个自解压的可执行文件，并将 PHP 源代码与二进制文件打包在一起。
-  - title: 依赖管理
-    details: static-php-cli 附带依赖项管理，支持安装不同类型的 PHP 扩展。
+- title: 静态二进制
+  details: 您可以轻松地编译一个独立的 PHP 二进制文件以供嵌入程序使用。包括 cli、fpm、micro。
+- title: phpmicro 自执行二进制
+  details: 您可以使用 micro SAPI 编译一个自解压的可执行文件，并将 PHP 代码与二进制文件打包为一个文件。
+- title: 依赖管理
+  details: static-php-cli 附带依赖项管理，支持安装不同类型的 PHP 扩展和不同的依赖库。
 ---
-
-<script setup>
-import {VPSponsors} from "vitepress/theme";
-import Contributors from '../.vitepress/components/Contributors.vue';
-
-const sponsors = [
-  { name: 'Beyond Code', img: '/images/beyondcode-seeklogo.png', url: 'https://beyondco.de/' },
-  { name: 'NativePHP', img: '/images/nativephp-logo.svg', url: 'https://nativephp.com/' },
-];
-</script>
-
-<div class="sponsors-section">
-  <div class="sponsors-header">
-    <h2>特别赞助商</h2>
-    <p class="sponsors-description">
-      感谢我们出色的赞助商对本项目的支持！
-    </p>
-  </div>
-  <VPSponsors :data="sponsors"/>
-</div>
-
-<style scoped>
-.sponsors-section {
-  margin: 48px auto;
-  padding: 32px 24px;
-  max-width: 1152px;
-  background: linear-gradient(135deg, var(--vp-c-bg-soft) 0%, var(--vp-c-bg) 100%);
-  border-radius: 16px;
-  border: 1px solid var(--vp-c-divider);
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.05);
-  transition: all 0.3s ease;
-}
-
-.sponsors-section:hover {
-  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.1);
-  transform: translateY(-2px);
-}
-
-.sponsors-header {
-  text-align: center;
-  margin-bottom: 24px;
-}
-
-.sponsors-header h2 {
-  font-size: 1.5rem;
-  font-weight: 700;
-  margin: 0 0 8px 0;
-  background: linear-gradient(120deg, var(--vp-c-brand-1), var(--vp-c-brand-2));
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-  background-clip: text;
-}
-
-.sponsors-description {
-  font-size: 0.95rem;
-  color: var(--vp-c-text-2);
-  margin: 0;
-  line-height: 1.5;
-}
-
-@media (max-width: 768px) {
-  .sponsors-section {
-    margin: 32px 16px;
-    padding: 24px 16px;
-  }
-  
-  .sponsors-header h2 {
-    font-size: 1.25rem;
-  }
-  
-  .sponsors-description {
-    font-size: 0.9rem;
-  }
-}
-
-/* Hero logo styling */
-:deep(.VPImage.image-src) {
-  border-radius: 20px;
-  background: linear-gradient(135deg, var(--vp-c-bg-soft) 0%, var(--vp-c-default-soft) 100%);
-  padding: 40px;
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
-  transition: all 0.3s ease;
-}
-
-:deep(.VPImage.image-src:hover) {
-  transform: translateY(-4px);
-  box-shadow: 0 12px 40px rgba(0, 0, 0, 0.15);
-}
-
-/* Dark mode adjustments for logo */
-.dark :deep(.VPImage.image-src) {
-  background: linear-gradient(135deg, rgba(255, 255, 255, 0.05) 0%, rgba(255, 255, 255, 0.02) 100%);
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.5);
-  opacity: 0.9;
-}
-
-.dark :deep(.VPImage.image-src:hover) {
-  opacity: 1;
-  box-shadow: 0 12px 40px rgba(0, 0, 0, 0.7);
-}
-
-/* Additional styling for the logo image itself */
-:deep(.VPImage.image-src img) {
-  max-height: 280px;
-  width: auto;
-}
-
-@media (max-width: 768px) {
-  :deep(.VPImage.image-src) {
-    padding: 24px;
-  }
-  
-  :deep(.VPImage.image-src img) {
-    max-height: 200px;
-  }
-}
-</style>
-
-<Contributors />

phpstan.neon

@@ -17,4 +17,3 @@ parameters:
             - ./src/globals/ext-tests/swoole.php
             - ./src/globals/ext-tests/swoole.phpt
             - ./src/globals/test-extensions.php
-            - ./src/SPC/

spc.registry.json

@@ -1,32 +0,0 @@
-{
-    "name": "internal",
-    "autoload": "vendor/autoload.php",
-    "doctor": {
-        "psr-4": {
-            "StaticPHP\\Doctor\\Item": "src/StaticPHP/Doctor/Item"
-        }
-    },
-    "package": {
-        "psr-4": {
-            "Package": "src/Package"
-        },
-        "config": [
-            "config/pkg.ext.json",
-            "config/pkg.lib.json",
-            "config/pkg.target.json"
-        ]
-    },
-    "artifact": {
-        "config": [
-            "config/artifact.json"
-        ],
-        "psr-4": {
-            "Package\\Artifact": "src/Package/Artifact"
-        }
-    },
-    "command": {
-        "psr-4": {
-            "Package\\Command": "src/Package/Command"
-        }
-    }
-}

src/Package/Artifact/go_xcaddy.php

@@ -1,94 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Artifact;
-
-use StaticPHP\Artifact\ArtifactDownloader;
-use StaticPHP\Artifact\Downloader\DownloadResult;
-use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
-use StaticPHP\Attribute\Artifact\CustomBinary;
-use StaticPHP\Exception\DownloaderException;
-use StaticPHP\Runtime\SystemTarget;
-use StaticPHP\Util\GlobalEnvManager;
-use StaticPHP\Util\System\LinuxUtil;
-
-class go_xcaddy
-{
-    #[CustomBinary('go-xcaddy', [
-        'linux-x86_64',
-        'linux-aarch64',
-        'macos-x86_64',
-        'macos-aarch64',
-    ])]
-    public function downBinary(ArtifactDownloader $downloader): DownloadResult
-    {
-        $pkgroot = PKG_ROOT_PATH;
-        $name = SystemTarget::getCurrentPlatformString();
-        $arch = match (explode('-', $name)[1]) {
-            'x86_64' => 'amd64',
-            'aarch64' => 'arm64',
-            default => throw new DownloaderException('Unsupported architecture: ' . $name),
-        };
-        $os = match (explode('-', $name)[0]) {
-            'linux' => 'linux',
-            'macos' => 'darwin',
-            default => throw new DownloaderException('Unsupported OS: ' . $name),
-        };
-
-        // get version and hash
-        [$version] = explode("\n", default_shell()->executeCurl('https://go.dev/VERSION?m=text') ?: '');
-        if ($version === '') {
-            throw new DownloaderException('Failed to get latest Go version from https://go.dev/VERSION?m=text');
-        }
-        $page = default_shell()->executeCurl('https://go.dev/dl/');
-        if ($page === '' || $page === false) {
-            throw new DownloaderException('Failed to get Go download page from https://go.dev/dl/');
-        }
-
-        $version_regex = str_replace('.', '\.', $version);
-        $pattern = "/href=\"\\/dl\\/{$version_regex}\\.{$os}-{$arch}\\.tar\\.gz\">.*?<tt>([a-f0-9]{64})<\\/tt>/s";
-        if (preg_match($pattern, $page, $matches)) {
-            $hash = $matches[1];
-        } else {
-            throw new DownloaderException("Failed to find download hash for Go {$version} {$os}-{$arch}");
-        }
-
-        $url = "https://go.dev/dl/{$version}.{$os}-{$arch}.tar.gz";
-        $path = DOWNLOAD_PATH . DIRECTORY_SEPARATOR . "{$version}.{$os}-{$arch}.tar.gz";
-        default_shell()->executeCurlDownload($url, $path, retries: $downloader->getRetry());
-        // verify hash
-        $file_hash = hash_file('sha256', $path);
-        if ($file_hash !== $hash) {
-            throw new DownloaderException("Hash mismatch for downloaded go-xcaddy binary. Expected {$hash}, got {$file_hash}");
-        }
-        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: "{$pkgroot}/go-xcaddy", verified: true, version: $version);
-    }
-
-    #[AfterBinaryExtract('go-xcaddy', [
-        'linux-x86_64',
-        'linux-aarch64',
-        'macos-x86_64',
-        'macos-aarch64',
-    ])]
-    public function afterExtract(string $target_path): void
-    {
-        if (file_exists("{$target_path}/bin/go") && file_exists("{$target_path}/bin/xcaddy")) {
-            return;
-        }
-
-        $sanitizedPath = getenv('PATH');
-        if (PHP_OS_FAMILY === 'Linux' && !LinuxUtil::isMuslDist()) {
-            $sanitizedPath = preg_replace('#(:?/?[^:]*musl[^:]*)#', '', $sanitizedPath);
-            $sanitizedPath = preg_replace('#^:|:$|::#', ':', $sanitizedPath); // clean up colons
-        }
-
-        shell()->appendEnv([
-            'PATH' => "{$target_path}/bin:{$sanitizedPath}",
-            'GOROOT' => "{$target_path}",
-            'GOBIN' => "{$target_path}/bin",
-            'GOPATH' => "{$target_path}/go",
-        ])->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
-        GlobalEnvManager::addPathIfNotExists("{$target_path}/bin");
-    }
-}

src/Package/Artifact/zig.php

@@ -1,98 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Artifact;
-
-use StaticPHP\Artifact\ArtifactDownloader;
-use StaticPHP\Artifact\Downloader\DownloadResult;
-use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
-use StaticPHP\Attribute\Artifact\CustomBinary;
-use StaticPHP\Exception\DownloaderException;
-use StaticPHP\Runtime\SystemTarget;
-
-class zig
-{
-    #[CustomBinary('zig', [
-        'linux-x86_64',
-        'linux-aarch64',
-        'macos-x86_64',
-        'macos-aarch64',
-    ])]
-    public function downBinary(ArtifactDownloader $downloader): DownloadResult
-    {
-        $index_json = default_shell()->executeCurl('https://ziglang.org/download/index.json', retries: $downloader->getRetry());
-        $index_json = json_decode($index_json ?: '', true);
-        $latest_version = null;
-        foreach ($index_json as $version => $data) {
-            $latest_version = $version;
-            break;
-        }
-
-        if (!$latest_version) {
-            throw new DownloaderException('Could not determine latest Zig version');
-        }
-        $zig_arch = SystemTarget::getTargetArch();
-        $zig_os = match (SystemTarget::getTargetOS()) {
-            'Windows' => 'win',
-            'Darwin' => 'macos',
-            'Linux' => 'linux',
-            default => throw new DownloaderException('Unsupported OS for Zig: ' . SystemTarget::getTargetOS()),
-        };
-        $platform_key = "{$zig_arch}-{$zig_os}";
-        if (!isset($index_json[$latest_version][$platform_key])) {
-            throw new DownloaderException("No download available for {$platform_key} in Zig version {$latest_version}");
-        }
-        $download_info = $index_json[$latest_version][$platform_key];
-        $url = $download_info['tarball'];
-        $sha256 = $download_info['shasum'];
-        $filename = basename($url);
-        $path = DOWNLOAD_PATH . DIRECTORY_SEPARATOR . $filename;
-        default_shell()->executeCurlDownload($url, $path, retries: $downloader->getRetry());
-        // verify hash
-        $file_hash = hash_file('sha256', $path);
-        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);
-    }
-
-    #[AfterBinaryExtract('zig', [
-        'linux-x86_64',
-        'linux-aarch64',
-        'macos-x86_64',
-        'macos-aarch64',
-    ])]
-    public function postExtractZig(string $target_path): void
-    {
-        $files = ['zig', 'zig-cc', 'zig-c++', 'zig-ar', 'zig-ld.lld', 'zig-ranlib', 'zig-objcopy'];
-        $all_exist = true;
-        foreach ($files as $file) {
-            if (!file_exists("{$target_path}/{$file}")) {
-                $all_exist = false;
-                break;
-            }
-        }
-        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/Command/SwitchPhpVersionCommand.php

@@ -1,121 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Command;
-
-use StaticPHP\Artifact\ArtifactCache;
-use StaticPHP\Artifact\ArtifactDownloader;
-use StaticPHP\Artifact\DownloaderOptions;
-use StaticPHP\Command\BaseCommand;
-use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Registry\PackageLoader;
-use StaticPHP\Util\FileSystem;
-use StaticPHP\Util\InteractiveTerm;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Input\InputArgument;
-
-#[AsCommand('switch-php-version', description: 'Switch downloaded PHP version')]
-class SwitchPhpVersionCommand extends BaseCommand
-{
-    protected bool $no_motd = true;
-
-    public function configure(): void
-    {
-        $this->addArgument(
-            'php-version',
-            InputArgument::REQUIRED,
-            'PHP version (e.g., 8.4, 8.3, 8.2, 8.1, 8.0, 7.4, or specific like 8.4.5)',
-        );
-
-        // Downloader options
-        $this->getDefinition()->addOptions(DownloaderOptions::getConsoleOptions());
-
-        // Additional options
-        $this->addOption('keep-source', null, null, 'Keep extracted source directory (do not remove source/php-src)');
-    }
-
-    public function handle(): int
-    {
-        $php_ver = $this->getArgument('php-version');
-
-        // Validate version format
-        if (!$this->isValidPhpVersion($php_ver)) {
-            $this->output->writeln("<error>Invalid PHP version '{$php_ver}'!</error>");
-            $this->output->writeln('<comment>Supported formats: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, or specific version like 8.4.5</comment>');
-            return static::FAILURE;
-        }
-
-        $cache = ApplicationContext::get(ArtifactCache::class);
-
-        // Check if php-src is already locked
-        $source_info = $cache->getSourceInfo('php-src');
-        if ($source_info !== null) {
-            $current_version = $source_info['version'] ?? 'unknown';
-            $this->output->writeln("<info>Current PHP version: {$current_version}, removing old PHP source cache...");
-
-            // Remove cache entry and optionally the downloaded file
-            $cache->removeSource('php-src', delete_file: true);
-        }
-
-        // Remove extracted source directory if exists and --keep-source not set
-        $source_dir = SOURCE_PATH . '/php-src';
-        if (!$this->getOption('keep-source') && is_dir($source_dir)) {
-            $this->output->writeln('<info>Removing extracted PHP source directory...</info>');
-            InteractiveTerm::indicateProgress('Removing: ' . $source_dir);
-            FileSystem::removeDir($source_dir);
-            InteractiveTerm::finish('Removed: ' . $source_dir);
-        }
-
-        // Download new PHP source
-        $this->output->writeln("<info>Downloading PHP {$php_ver} source...</info>");
-
-        $this->input->setOption('with-php', $php_ver);
-
-        $downloaderOptions = DownloaderOptions::extractFromConsoleOptions($this->input->getOptions());
-        $downloader = new ArtifactDownloader($downloaderOptions);
-
-        // Get php-src artifact from php package
-        $php_package = PackageLoader::getPackage('php');
-        $artifact = $php_package->getArtifact();
-
-        if ($artifact === null) {
-            $this->output->writeln('<error>Failed to get php-src artifact!</error>');
-            return static::FAILURE;
-        }
-
-        $downloader->add($artifact);
-        $downloader->download();
-
-        // Get the new version info
-        $new_source_info = $cache->getSourceInfo('php-src');
-        $new_version = $new_source_info['version'] ?? $php_ver;
-
-        $this->output->writeln('');
-        $this->output->writeln("<info>Successfully switched to PHP {$new_version}!</info>");
-
-        return static::SUCCESS;
-    }
-
-    /**
-     * Validate PHP version format.
-     *
-     * Accepts:
-     * - Major.Minor format: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4
-     * - Full version format: 8.4.5, 8.3.12, etc.
-     */
-    private function isValidPhpVersion(string $version): bool
-    {
-        // Check major.minor format (e.g., 8.4)
-        if (in_array($version, ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'], true)) {
-            return true;
-        }
-
-        // Check full version format (e.g., 8.4.5)
-        if (preg_match('/^\d+\.\d+\.\d+$/', $version)) {
-            return true;
-        }
-
-        return false;
-    }
-}

src/Package/Extension/readline.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Extension;
-
-use Package\Target\php;
-use StaticPHP\Attribute\Package\AfterStage;
-use StaticPHP\Attribute\Package\BeforeStage;
-use StaticPHP\Attribute\Package\Extension;
-use StaticPHP\Attribute\PatchDescription;
-use StaticPHP\Package\PackageInstaller;
-use StaticPHP\Toolchain\Interface\ToolchainInterface;
-use StaticPHP\Util\SourcePatcher;
-
-#[Extension('readline')]
-class readline
-{
-    #[BeforeStage('php', [php::class, 'makeCliForUnix'], 'ext-readline')]
-    #[PatchDescription('Fix readline static build with musl')]
-    public function beforeMakeLinuxCli(PackageInstaller $installer, ToolchainInterface $toolchain): void
-    {
-        if ($toolchain->isStatic()) {
-            $php_src = $installer->getBuildPackage('php')->getSourceDir();
-            SourcePatcher::patchFile('musl_static_readline.patch', $php_src);
-        }
-    }
-
-    #[AfterStage('php', [php::class, 'makeCliForUnix'], 'ext-readline')]
-    public function afterMakeLinuxCli(PackageInstaller $installer, ToolchainInterface $toolchain): void
-    {
-        if ($toolchain->isStatic()) {
-            $php_src = $installer->getBuildPackage('php')->getSourceDir();
-            SourcePatcher::patchFile('musl_static_readline.patch', $php_src, true);
-        }
-    }
-}

src/Package/Library/imap.php

@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Library;
-
-use Package\Target\php;
-use StaticPHP\Attribute\Package\AfterStage;
-use StaticPHP\Attribute\Package\Library;
-use StaticPHP\Attribute\PatchDescription;
-use StaticPHP\Runtime\SystemTarget;
-use StaticPHP\Util\FileSystem;
-
-#[Library('imap')]
-class imap
-{
-    #[AfterStage('php', [php::class, 'patchEmbedScripts'], 'imap')]
-    #[PatchDescription('Fix missing -lcrypt in php-config libs on glibc systems')]
-    public function afterPatchScripts(): void
-    {
-        if (SystemTarget::getLibc() === 'glibc') {
-            FileSystem::replaceFileRegex(BUILD_BIN_PATH . '/php-config', '/^libs="(.*)"$/m', 'libs="$1 -lcrypt"');
-        }
-    }
-}

src/Package/Library/libedit.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Library;
-
-use StaticPHP\Attribute\Package\BeforeStage;
-use StaticPHP\Attribute\Package\BuildFor;
-use StaticPHP\Attribute\Package\Library;
-use StaticPHP\Package\LibraryPackage;
-use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
-use StaticPHP\Util\FileSystem;
-
-#[Library('libedit')]
-class libedit extends LibraryPackage
-{
-    #[BeforeStage(stage: 'build')]
-    public function patchBeforeBuild(): void
-    {
-        FileSystem::replaceFileRegex(
-            "{$this->getSourceDir()}/src/sys.h",
-            '|//#define\s+strl|',
-            '#define strl'
-        );
-    }
-
-    #[BuildFor('Darwin')]
-    #[BuildFor('Linux')]
-    public function build(): void
-    {
-        UnixAutoconfExecutor::create($this)
-            ->appendEnv(['CFLAGS' => '-D__STDC_ISO_10646__=201103L'])
-            ->configure()
-            ->make();
-        $this->patchPkgconfPrefix(['libedit.pc']);
-    }
-}

src/Package/Library/libiconv.php

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Library;
-
-use StaticPHP\Attribute\Package\BuildFor;
-use StaticPHP\Attribute\Package\Library;
-use StaticPHP\Package\LibraryPackage;
-use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
-
-#[Library('libiconv')]
-class libiconv
-{
-    #[BuildFor('Darwin')]
-    public function build(LibraryPackage $package): void
-    {
-        UnixAutoconfExecutor::create($package)
-            ->configure(
-                '--enable-extra-encodings',
-                '--enable-year2038',
-            )
-            ->make('install-lib', with_install: false)
-            ->make('install-lib', with_install: false, dir: "{$package->getSourceDir()}/libcharset");
-        $package->patchLaDependencyPrefix();
-    }
-}

src/Package/Library/libxml2.php

@@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Library;
-
-use StaticPHP\Attribute\Package\BuildFor;
-use StaticPHP\Attribute\Package\Library;
-use StaticPHP\Package\LibraryPackage;
-use StaticPHP\Runtime\Executor\UnixCMakeExecutor;
-use StaticPHP\Runtime\SystemTarget;
-use StaticPHP\Util\FileSystem;
-
-#[Library('libxml2')]
-class libxml2
-{
-    #[BuildFor('Darwin')]
-    public function build(LibraryPackage $package): void
-    {
-        $cmake = UnixCMakeExecutor::create($package)
-            ->optionalPackage(
-                'zlib',
-                '-DLIBXML2_WITH_ZLIB=ON ' .
-                "-DZLIB_LIBRARY={$package->getLibDir()}/libz.a " .
-                "-DZLIB_INCLUDE_DIR={$package->getIncludeDir()}",
-                '-DLIBXML2_WITH_ZLIB=OFF',
-            )
-            ->optionalPackage('xz', ...cmake_boolean_args('LIBXML2_WITH_LZMA'))
-            ->addConfigureArgs(
-                '-DLIBXML2_WITH_ICONV=ON',
-                '-DLIBXML2_WITH_ICU=OFF', // optional, but discouraged: https://gitlab.gnome.org/GNOME/libxml2/-/blob/master/README.md
-                '-DLIBXML2_WITH_PYTHON=OFF',
-                '-DLIBXML2_WITH_PROGRAMS=OFF',
-                '-DLIBXML2_WITH_TESTS=OFF',
-            );
-
-        if (SystemTarget::getTargetOS() === 'Linux') {
-            $cmake->addConfigureArgs('-DIconv_IS_BUILT_IN=OFF');
-        }
-
-        $cmake->build();
-
-        FileSystem::replaceFileStr(
-            BUILD_LIB_PATH . '/pkgconfig/libxml-2.0.pc',
-            '-lxml2 -liconv',
-            '-lxml2'
-        );
-        FileSystem::replaceFileStr(
-            BUILD_LIB_PATH . '/pkgconfig/libxml-2.0.pc',
-            '-lxml2',
-            '-lxml2 -liconv'
-        );
-    }
-}

src/Package/Library/ncurses.php

@@ -1,61 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Library;
-
-use StaticPHP\Attribute\Package\BuildFor;
-use StaticPHP\Attribute\Package\Library;
-use StaticPHP\Package\LibraryPackage;
-use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
-use StaticPHP\Toolchain\Interface\ToolchainInterface;
-use StaticPHP\Util\DirDiff;
-use StaticPHP\Util\FileSystem;
-
-#[Library('ncurses')]
-class ncurses
-{
-    #[BuildFor('Darwin')]
-    #[BuildFor('Linux')]
-    public function build(LibraryPackage $package, ToolchainInterface $toolchain): void
-    {
-        $dirdiff = new DirDiff(BUILD_BIN_PATH);
-
-        UnixAutoconfExecutor::create($package)
-            ->appendEnv([
-                'LDFLAGS' => $toolchain->isStatic() ? '-static' : '',
-            ])
-            ->configure(
-                '--enable-overwrite',
-                '--with-curses-h',
-                '--enable-pc-files',
-                '--enable-echo',
-                '--disable-widec',
-                '--with-normal',
-                '--with-ticlib',
-                '--without-tests',
-                '--without-dlsym',
-                '--without-debug',
-                '--enable-symlinks',
-                "--bindir={$package->getBinDir()}",
-                "--includedir={$package->getIncludeDir()}",
-                "--libdir={$package->getLibDir()}",
-                "--prefix={$package->getBuildRootPath()}",
-            )
-            ->make();
-        $new_files = $dirdiff->getIncrementFiles(true);
-        foreach ($new_files as $file) {
-            @unlink(BUILD_BIN_PATH . '/' . $file);
-        }
-
-        shell()->cd(BUILD_ROOT_PATH)->exec('rm -rf share/terminfo');
-        shell()->cd(BUILD_ROOT_PATH)->exec('rm -rf lib/terminfo');
-
-        $pkgconf_list = ['form.pc', 'menu.pc', 'ncurses++.pc', 'ncurses.pc', 'panel.pc', 'tic.pc'];
-        $package->patchPkgconfPrefix($pkgconf_list);
-
-        foreach ($pkgconf_list as $pkgconf) {
-            FileSystem::replaceFileStr("{$package->getLibDir()}/pkgconfig/{$pkgconf}", "-L{$package->getLibDir()}", '-L${libdir}');
-        }
-    }
-}

src/Package/Library/postgresql.php

@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Library;
-
-use Package\Target\php;
-use StaticPHP\Attribute\Package\BeforeStage;
-use StaticPHP\Attribute\Package\Library;
-use StaticPHP\Attribute\PatchDescription;
-use StaticPHP\Package\TargetPackage;
-
-#[Library('postgresql')]
-class postgresql
-{
-    #[BeforeStage('php', [php::class, 'configureForUnix'], 'postgresql')]
-    #[PatchDescription('Patch to avoid explicit_bzero detection issues on some systems')]
-    public function patchBeforePHPConfigure(TargetPackage $package): void
-    {
-        shell()->cd($package->getSourceDir())
-            ->exec('sed -i.backup "s/ac_cv_func_explicit_bzero\" = xyes/ac_cv_func_explicit_bzero\" = x_fake_yes/" ./configure');
-    }
-}

src/Package/README.md

@@ -1,3 +0,0 @@
-# Package Implementation
-
-This directory contains the implementation of the `Package` module, which provides functionality for managing and manipulating packages within the system.

src/Package/Target/go_xcaddy.php

@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Target;
-
-use StaticPHP\Attribute\Package\InitPackage;
-use StaticPHP\Attribute\Package\Target;
-use StaticPHP\Util\GlobalEnvManager;
-
-#[Target('go-xcaddy')]
-class go_xcaddy
-{
-    #[InitPackage]
-    public function init(): void
-    {
-        if (is_dir(PKG_ROOT_PATH . '/go-xcaddy/bin')) {
-            GlobalEnvManager::addPathIfNotExists(PKG_ROOT_PATH . '/go-xcaddy/bin');
-            GlobalEnvManager::putenv('GOROOT=' . PKG_ROOT_PATH . '/go-xcaddy');
-            GlobalEnvManager::putenv('GOBIN=' . PKG_ROOT_PATH . '/go-xcaddy/bin');
-            GlobalEnvManager::putenv('GOPATH=' . PKG_ROOT_PATH . '/go-xcaddy/go');
-        }
-    }
-}

src/Package/Target/micro.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Target;
-
-use StaticPHP\Attribute\Package\BeforeStage;
-use StaticPHP\Attribute\Package\Target;
-use StaticPHP\Attribute\PatchDescription;
-use StaticPHP\Package\TargetPackage;
-use StaticPHP\Util\FileSystem;
-
-#[Target('php-micro')]
-class micro
-{
-    #[BeforeStage('php', [php::class, 'makeEmbedForUnix'], 'php-micro')]
-    #[PatchDescription('Patch Makefile to build only libphp.la for embedding')]
-    public function patchBeforeEmbed(TargetPackage $package): void
-    {
-        FileSystem::replaceFileStr("{$package->getSourceDir()}/Makefile", 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
-    }
-}

src/Package/Target/php.php

@@ -1,684 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Target;
-
-use StaticPHP\Attribute\Package\BeforeStage;
-use StaticPHP\Attribute\Package\BuildFor;
-use StaticPHP\Attribute\Package\Info;
-use StaticPHP\Attribute\Package\InitPackage;
-use StaticPHP\Attribute\Package\ResolveBuild;
-use StaticPHP\Attribute\Package\Stage;
-use StaticPHP\Attribute\Package\Target;
-use StaticPHP\Attribute\Package\Validate;
-use StaticPHP\Attribute\PatchDescription;
-use StaticPHP\Config\PackageConfig;
-use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Exception\SPCException;
-use StaticPHP\Exception\WrongUsageException;
-use StaticPHP\Package\Package;
-use StaticPHP\Package\PackageBuilder;
-use StaticPHP\Package\PackageInstaller;
-use StaticPHP\Package\PhpExtensionPackage;
-use StaticPHP\Package\TargetPackage;
-use StaticPHP\Registry\ArtifactLoader;
-use StaticPHP\Registry\PackageLoader;
-use StaticPHP\Runtime\SystemTarget;
-use StaticPHP\Toolchain\Interface\ToolchainInterface;
-use StaticPHP\Toolchain\ToolchainManager;
-use StaticPHP\Util\DirDiff;
-use StaticPHP\Util\FileSystem;
-use StaticPHP\Util\InteractiveTerm;
-use StaticPHP\Util\SourcePatcher;
-use StaticPHP\Util\SPCConfigUtil;
-use StaticPHP\Util\System\UnixUtil;
-use StaticPHP\Util\V2CompatLayer;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
-use ZM\Logger\ConsoleColor;
-
-#[Target('php')]
-#[Target('php-cli')]
-#[Target('php-fpm')]
-#[Target('php-micro')]
-#[Target('php-cgi')]
-#[Target('php-embed')]
-#[Target('frankenphp')]
-class php extends TargetPackage
-{
-    public static function getPHPVersionID(): int
-    {
-        $artifact = ArtifactLoader::getArtifactInstance('php-src');
-        if (!file_exists("{$artifact->getSourceDir()}/main/php_version.h")) {
-            throw new WrongUsageException('PHP source files are not available, you need to download them first');
-        }
-
-        $file = file_get_contents("{$artifact->getSourceDir()}/main/php_version.h");
-        if (preg_match('/PHP_VERSION_ID (\d+)/', $file, $match) !== 0) {
-            return intval($match[1]);
-        }
-
-        throw new WrongUsageException('PHP version file format is malformed, please remove "./source/php-src" dir and download/extract again');
-    }
-
-    #[InitPackage]
-    public function init(TargetPackage $package): void
-    {
-        // universal build options (may move to base class later)
-        $package->addBuildOption('with-added-patch', 'P', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Inject patch script outside');
-
-        // basic build argument and options for PHP
-        $package->addBuildArgument('extensions', InputArgument::REQUIRED, 'Comma-separated list of static extensions to build');
-        $package->addBuildOption('no-strip', null, null, 'build without strip, keep symbols to debug');
-        $package->addBuildOption('with-upx-pack', null, null, 'Compress / pack binary using UPX tool (linux/windows only)');
-
-        // php configure and extra patch options
-        $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-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');
-
-        // phpmicro build options
-        if ($package->getName() === 'php' || $package->getName() === 'php-micro') {
-            $package->addBuildOption('with-micro-fake-cli', null, null, 'Let phpmicro\'s PHP_SAPI use "cli" instead of "micro"');
-            $package->addBuildOption('without-micro-ext-test', null, null, 'Disable phpmicro with extension test code');
-            $package->addBuildOption('with-micro-logo', null, InputOption::VALUE_REQUIRED, 'Use custom .ico for micro.sfx (windows only)');
-            $package->addBuildOption('enable-micro-win32', null, null, 'Enable win32 mode for phpmicro (Windows only)');
-        }
-
-        // frankenphp build options
-        if ($package->getName() === 'php' || $package->getName() === 'frankenphp') {
-            $package->addBuildOption('with-frankenphp-app', null, InputOption::VALUE_REQUIRED, 'Path to a folder to be embedded in FrankenPHP');
-        }
-
-        // embed build options
-        if ($package->getName() === 'php' || $package->getName() === 'php-embed') {
-            $package->addBuildOption('build-shared', 'D', InputOption::VALUE_REQUIRED, 'Shared extensions to build, comma separated', '');
-        }
-
-        // legacy php target build options
-        V2CompatLayer::addLegacyBuildOptionsForPhp($package);
-        if ($package->getName() === 'php') {
-            $package->addBuildOption('build-micro', null, null, 'Build micro SAPI');
-            $package->addBuildOption('build-cli', null, null, 'Build cli SAPI');
-            $package->addBuildOption('build-fpm', null, null, 'Build fpm SAPI (not available on Windows)');
-            $package->addBuildOption('build-embed', null, null, 'Build embed SAPI (not available on Windows)');
-            $package->addBuildOption('build-frankenphp', null, null, 'Build FrankenPHP SAPI (not available on Windows)');
-            $package->addBuildOption('build-cgi', null, null, 'Build cgi SAPI');
-            $package->addBuildOption('build-all', null, null, 'Build all SAPI');
-        }
-    }
-
-    #[ResolveBuild]
-    public function resolveBuild(TargetPackage $package, PackageInstaller $installer): array
-    {
-        // Parse extensions and additional packages for all php-* targets
-        $static_extensions = parse_extension_list($package->getBuildArgument('extensions'));
-        $additional_libraries = parse_comma_list($package->getBuildOption('with-libs'));
-        $additional_packages = parse_comma_list($package->getBuildOption('with-packages'));
-        $additional_packages = array_merge($additional_libraries, $additional_packages);
-        $shared_extensions = parse_extension_list($package->getBuildOption('build-shared') ?? []);
-
-        $extensions_pkg = array_map(
-            fn ($x) => "ext-{$x}",
-            array_values(array_unique([...$static_extensions, ...$shared_extensions]))
-        );
-
-        // get instances
-        foreach ($extensions_pkg as $extension) {
-            $extname = substr($extension, 4);
-            $config = PackageConfig::get($extension, 'php-extension', []);
-            if (!PackageLoader::hasPackage($extension)) {
-                throw new WrongUsageException("Extension [{$extname}] does not exist. Please check your extension name.");
-            }
-            $instance = PackageLoader::getPackage($extension);
-            if (!$instance instanceof PhpExtensionPackage) {
-                throw new WrongUsageException("Package [{$extension}] is not a PHP extension package");
-            }
-            // set build static/shared
-            if (in_array($extname, $static_extensions)) {
-                if (($config['build-static'] ?? true) === false) {
-                    throw new WrongUsageException("Extension [{$extname}] cannot be built as static extension.");
-                }
-                $instance->setBuildStatic();
-            }
-            if (in_array($extname, $shared_extensions)) {
-                if (($config['build-shared'] ?? true) === false) {
-                    throw new WrongUsageException("Extension [{$extname}] cannot be built as shared extension, please remove it from --build-shared option.");
-                }
-                $instance->setBuildShared();
-                $instance->setBuildWithPhp($config['build-with-php'] ?? false);
-            }
-        }
-
-        // building shared extensions need embed SAPI
-        if (!empty($shared_extensions) && !$package->getBuildOption('build-embed', false) && $package->getName() === 'php') {
-            $installer->addBuildPackage('php-embed');
-        }
-
-        return [...$extensions_pkg, ...$additional_packages];
-    }
-
-    #[Validate]
-    public function validate(Package $package): void
-    {
-        // frankenphp
-        if ($package->getName() === 'frankenphp' && $package instanceof TargetPackage) {
-            if (!$package->getBuildOption('enable-zts')) {
-                throw new WrongUsageException('FrankenPHP SAPI requires ZTS enabled PHP, build with `--enable-zts`!');
-            }
-            // frankenphp doesn't support windows, BSD is currently not supported by static-php-cli
-            if (!in_array(PHP_OS_FAMILY, ['Linux', 'Darwin'])) {
-                throw new WrongUsageException('FrankenPHP SAPI is only available on Linux and macOS!');
-            }
-        }
-        // linux does not support loading shared libraries when target is pure 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.'
-            );
-        }
-    }
-
-    #[Info]
-    public function info(Package $package, PackageInstaller $installer): array
-    {
-        /** @var TargetPackage $package */
-        if ($package->getName() !== 'php') {
-            return [];
-        }
-        $sapis = array_filter([
-            $installer->isPackageResolved('php-cli') ? 'cli' : null,
-            $installer->isPackageResolved('php-fpm') ? 'fpm' : null,
-            $installer->isPackageResolved('php-micro') ? 'micro' : null,
-            $installer->isPackageResolved('php-cgi') ? 'cgi' : null,
-            $installer->isPackageResolved('php-embed') ? 'embed' : null,
-            $installer->isPackageResolved('frankenphp') ? 'frankenphp' : null,
-        ]);
-        $static_extensions = array_filter($installer->getResolvedPackages(), fn ($x) => $x instanceof PhpExtensionPackage && $x->isBuildStatic());
-        $shared_extensions = parse_extension_list($package->getBuildOption('build-shared') ?? []);
-        $install_packages = array_filter($installer->getResolvedPackages(), fn ($x) => $x->getType() !== 'php-extension' && $x->getName() !== 'php' && !str_starts_with($x->getName(), 'php-'));
-        return [
-            'Build OS' => SystemTarget::getTargetOS() . ' (' . SystemTarget::getTargetArch() . ')',
-            'Build Target' => getenv('SPC_TARGET') ?: '',
-            'Build Toolchain' => ToolchainManager::getToolchainClass(),
-            'Build SAPI' => implode(', ', $sapis),
-            'Static Extensions (' . count($static_extensions) . ')' => implode(',', array_map(fn ($x) => substr($x->getName(), 4), $static_extensions)),
-            'Shared Extensions (' . count($shared_extensions) . ')' => implode(',', $shared_extensions),
-            'Install Packages (' . count($install_packages) . ')' => implode(',', array_map(fn ($x) => $x->getName(), $install_packages)),
-        ];
-    }
-
-    #[BeforeStage('php', 'build')]
-    public function beforeBuild(PackageBuilder $builder, Package $package): void
-    {
-        // Process -I option
-        $custom_ini = [];
-        foreach ($builder->getOption('with-hardcoded-ini', []) as $value) {
-            [$source_name, $ini_value] = explode('=', $value, 2);
-            $custom_ini[$source_name] = $ini_value;
-            logger()->info("Adding hardcoded INI [{$source_name} = {$ini_value}]");
-        }
-        if (!empty($custom_ini)) {
-            SourcePatcher::patchHardcodedINI($package->getSourceDir(), $custom_ini);
-        }
-
-        // Patch StaticPHP version
-        // detect patch (remove this when 8.3 deprecated)
-        $file = FileSystem::readFile("{$package->getSourceDir()}/main/main.c");
-        if (!str_contains($file, 'static-php-cli.version')) {
-            $version = SPC_VERSION;
-            logger()->debug('Inserting static-php-cli.version to php-src');
-            $file = str_replace('PHP_INI_BEGIN()', "PHP_INI_BEGIN()\n\tPHP_INI_ENTRY(\"static-php-cli.version\",\t\"{$version}\",\tPHP_INI_ALL,\tNULL)", $file);
-            FileSystem::writeFile("{$package->getSourceDir()}/main/main.c", $file);
-        }
-
-        // clean old modules that may conflict with the new php build
-        FileSystem::removeDir(BUILD_MODULES_PATH);
-    }
-
-    #[BeforeStage('php', [self::class, 'buildconfForUnix'], 'php')]
-    #[PatchDescription('Patch configure.ac for musl and musl-toolchain')]
-    #[PatchDescription('Let php m4 tools use static pkg-config')]
-    public function patchBeforeBuildconf(TargetPackage $package): void
-    {
-        // patch configure.ac for musl and musl-toolchain
-        $musl = SystemTarget::getTargetOS() === 'Linux' && SystemTarget::getLibc() === 'musl';
-        FileSystem::backupFile(SOURCE_PATH . '/php-src/configure.ac');
-        FileSystem::replaceFileStr(
-            SOURCE_PATH . '/php-src/configure.ac',
-            'if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1',
-            'if ' . ($musl ? 'true' : 'false')
-        );
-
-        // let php m4 tools use static pkg-config
-        FileSystem::replaceFileStr("{$package->getSourceDir()}/build/php.m4", 'PKG_CHECK_MODULES(', 'PKG_CHECK_MODULES_STATIC(');
-    }
-
-    #[Stage]
-    public function buildconfForUnix(TargetPackage $package): void
-    {
-        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('./buildconf'));
-        V2CompatLayer::emitPatchPoint('before-php-buildconf');
-        shell()->cd($package->getSourceDir())->exec(getenv('SPC_CMD_PREFIX_PHP_BUILDCONF'));
-    }
-
-    #[Stage]
-    public function configureForUnix(TargetPackage $package, PackageInstaller $installer): void
-    {
-        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('./configure'));
-        V2CompatLayer::emitPatchPoint('before-php-configure');
-        $cmd = getenv('SPC_CMD_PREFIX_PHP_CONFIGURE');
-
-        $args = [];
-        $version_id = self::getPHPVersionID();
-        // PHP JSON extension is built-in since PHP 8.0
-        if ($version_id < 80000) {
-            $args[] = '--enable-json';
-        }
-        // zts
-        if ($package->getBuildOption('enable-zts', false)) {
-            $args[] = '--enable-zts --disable-zend-signals';
-            if ($version_id >= 80100 && SystemTarget::getTargetOS() === 'Linux') {
-                $args[] = '--enable-zend-max-execution-timers';
-            }
-        }
-        // config-file-path and config-file-scan-dir
-        if ($option = $package->getBuildOption('with-config-file-path', false)) {
-            $args[] = "--with-config-file-path={$option}";
-        }
-        if ($option = $package->getBuildOption('with-config-file-scan-dir', false)) {
-            $args[] = "--with-config-file-scan-dir={$option}";
-        }
-        // perform enable cli options
-        $args[] = $installer->isPackageResolved('php-cli') ? '--enable-cli' : '--disable-cli';
-        $args[] = $installer->isPackageResolved('php-fpm') ? '--enable-fpm' : '--disable-fpm';
-        $args[] = $installer->isPackageResolved('php-micro') ? match (SystemTarget::getTargetOS()) {
-            'Linux' => '--enable-micro=all-static',
-            default => '--enable-micro',
-        } : null;
-        $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';
-        $args[] = getenv('SPC_EXTRA_PHP_VARS') ?: null;
-        $args = implode(' ', array_filter($args));
-
-        $static_extension_str = $this->makeStaticExtensionString($installer);
-
-        // run ./configure with args
-        $this->seekPhpSrcLogFileOnException(fn () => shell()->cd($package->getSourceDir())->setEnv([
-            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
-            'CPPFLAGS' => "-I{$package->getIncludeDir()}",
-            'LDFLAGS' => "-L{$package->getLibDir()} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
-        ])->exec("{$cmd} {$args} {$static_extension_str}"), $package->getSourceDir());
-    }
-
-    #[Stage]
-    public function makeForUnix(TargetPackage $package, PackageInstaller $installer): void
-    {
-        V2CompatLayer::emitPatchPoint('before-php-make');
-
-        logger()->info('cleaning up php-src build files');
-        shell()->cd($package->getSourceDir())->exec('make clean');
-
-        if ($installer->isPackageResolved('php-cli')) {
-            $package->runStage([self::class, 'makeCliForUnix']);
-        }
-        if ($installer->isPackageResolved('php-cgi')) {
-            $package->runStage([self::class, 'makeCgiForUnix']);
-        }
-        if ($installer->isPackageResolved('php-fpm')) {
-            $package->runStage([self::class, 'makeFpmForUnix']);
-        }
-        if ($installer->isPackageResolved('php-micro')) {
-            $package->runStage([self::class, 'makeMicroForUnix']);
-        }
-        if ($installer->isPackageResolved('php-embed')) {
-            $package->runStage([self::class, 'makeEmbedForUnix']);
-        }
-    }
-
-    #[Stage]
-    public function makeCliForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
-    {
-        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make cli'));
-        $concurrency = $builder->concurrency;
-        shell()->cd($package->getSourceDir())
-            ->setEnv($this->makeVars($installer))
-            ->exec("make -j{$concurrency} cli");
-
-        $builder->deployBinary("{$package->getSourceDir()}/sapi/cli/php", BUILD_BIN_PATH . '/php');
-        $package->setOutput('Binary path for cli SAPI', BUILD_BIN_PATH . '/php');
-    }
-
-    #[Stage]
-    public function makeCgiForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
-    {
-        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make cgi'));
-        $concurrency = $builder->concurrency;
-        shell()->cd($package->getSourceDir())
-            ->setEnv($this->makeVars($installer))
-            ->exec("make -j{$concurrency} cgi");
-
-        $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');
-    }
-
-    #[Stage]
-    public function makeFpmForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
-    {
-        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make fpm'));
-        $concurrency = $builder->concurrency;
-        shell()->cd($package->getSourceDir())
-            ->setEnv($this->makeVars($installer))
-            ->exec("make -j{$concurrency} fpm");
-
-        $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');
-    }
-
-    #[Stage]
-    #[PatchDescription('Patch phar extension for micro SAPI to support compressed phar')]
-    public function makeMicroForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
-    {
-        $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' : '';
-            // build
-            shell()->cd($package->getSourceDir())
-                ->setEnv($vars)
-                ->exec("make -j{$builder->concurrency} micro");
-
-            $builder->deployBinary($package->getSourceDir() . '/sapi/micro/micro.sfx', BUILD_BIN_PATH . '/micro.sfx');
-            $package->setOutput('Binary path for micro SAPI', BUILD_BIN_PATH . '/micro.sfx');
-        } finally {
-            if ($phar_patched) {
-                SourcePatcher::unpatchMicroPhar();
-            }
-        }
-    }
-
-    #[Stage]
-    public function makeEmbedForUnix(TargetPackage $package, PackageInstaller $installer, PackageBuilder $builder): void
-    {
-        InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('make embed'));
-        $shared_exts = array_filter(
-            $installer->getResolvedPackages(),
-            static fn ($x) => $x instanceof PhpExtensionPackage && $x->isBuildShared() && $x->isBuildWithPhp()
-        );
-        $install_modules = $shared_exts ? 'install-modules' : '';
-
-        // detect changes in module path
-        $diff = new DirDiff(BUILD_MODULES_PATH, true);
-
-        $root = BUILD_ROOT_PATH;
-        $sed_prefix = SystemTarget::getTargetOS() === 'Darwin' ? 'sed -i ""' : 'sed -i';
-
-        shell()->cd($package->getSourceDir())
-            ->setEnv($this->makeVars($installer))
-            ->exec("{$sed_prefix} \"s|^EXTENSION_DIR = .*|EXTENSION_DIR = /" . basename(BUILD_MODULES_PATH) . '|" Makefile')
-            ->exec("make -j{$builder->concurrency} INSTALL_ROOT={$root} install-sapi {$install_modules} install-build install-headers install-programs");
-
-        // ------------- SPC_CMD_VAR_PHP_EMBED_TYPE=shared -------------
-
-        // process libphp.so for shared embed
-        $suffix = SystemTarget::getTargetOS() === 'Darwin' ? 'dylib' : 'so';
-        $libphp_so = "{$package->getLibDir()}/libphp.{$suffix}";
-        if (file_exists($libphp_so)) {
-            // rename libphp.so if -release is set
-            if (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);
-        }
-
-        // process shared extensions that built-with-php
-        $increment_files = $diff->getChangedFiles();
-        $files = [];
-        foreach ($increment_files as $increment_file) {
-            $builder->deployBinary($increment_file, $increment_file, false);
-            $files[] = basename($increment_file);
-        }
-        if (!empty($files)) {
-            $package->setOutput('Built shared extensions', implode(', ', $files));
-        }
-
-        // ------------- SPC_CMD_VAR_PHP_EMBED_TYPE=static -------------
-
-        // process libphp.a for static embed
-        if (!file_exists("{$package->getLibDir()}/libphp.a")) {
-            return;
-        }
-        $ar = getenv('AR') ?: 'ar';
-        $libphp_a = "{$package->getLibDir()}/libphp.a";
-        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, 'patchEmbedScripts']);
-    }
-
-    #[Stage]
-    public function unixBuildSharedExt(PackageInstaller $installer, ToolchainInterface $toolchain): void
-    {
-        // collect shared extensions
-        /** @var PhpExtensionPackage[] $shared_extensions */
-        $shared_extensions = array_filter(
-            $installer->getResolvedPackages(PhpExtensionPackage::class),
-            fn ($x) => $x->isBuildShared() && !$x->isBuildWithPhp()
-        );
-        if (!empty($shared_extensions)) {
-            if ($toolchain->isStatic()) {
-                throw new WrongUsageException(
-                    "You're building against musl libc statically (the default on Linux), but you're trying to build shared extensions.\n" .
-                    'Static musl libc does not implement `dlopen`, so your php binary is not able to load shared extensions.' . "\n" .
-                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, or use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc`.'
-                );
-            }
-            FileSystem::createDir(BUILD_MODULES_PATH);
-
-            // backup
-            FileSystem::backupFile(BUILD_BIN_PATH . '/php-config');
-            FileSystem::backupFile(BUILD_LIB_PATH . '/php/build/phpize.m4');
-
-            FileSystem::replaceFileLineContainsString(BUILD_BIN_PATH . '/php-config', 'extension_dir=', 'extension_dir="' . BUILD_MODULES_PATH . '"');
-            FileSystem::replaceFileStr(BUILD_LIB_PATH . '/php/build/phpize.m4', 'test "[$]$1" = "no" && $1=yes', '# test "[$]$1" = "no" && $1=yes');
-        }
-
-        try {
-            logger()->debug('Building shared extensions...');
-            foreach ($shared_extensions as $extension) {
-                InteractiveTerm::setMessage('Building shared PHP extension: ' . ConsoleColor::yellow($extension->getName()));
-                $extension->buildShared();
-            }
-        } finally {
-            // restore php-config
-            if (!empty($shared_extensions)) {
-                FileSystem::restoreBackupFile(BUILD_BIN_PATH . '/php-config');
-                FileSystem::restoreBackupFile(BUILD_LIB_PATH . '/php/build/phpize.m4');
-            }
-        }
-    }
-
-    #[BuildFor('Darwin')]
-    #[BuildFor('Linux')]
-    public function build(TargetPackage $package): void
-    {
-        // virtual target, do nothing
-        if ($package->getName() !== 'php') {
-            return;
-        }
-
-        $package->runStage([$this, 'buildconfForUnix']);
-        $package->runStage([$this, 'configureForUnix']);
-        $package->runStage([$this, 'makeForUnix']);
-
-        $package->runStage([$this, 'unixBuildSharedExt']);
-    }
-
-    /**
-     * Patch phpize and php-config if needed
-     */
-    #[Stage]
-    public function patchEmbedScripts(): void
-    {
-        // patch phpize
-        if (file_exists(BUILD_BIN_PATH . '/phpize')) {
-            logger()->debug('Patching phpize prefix');
-            FileSystem::replaceFileStr(BUILD_BIN_PATH . '/phpize', "prefix=''", "prefix='" . BUILD_ROOT_PATH . "'");
-            FileSystem::replaceFileStr(BUILD_BIN_PATH . '/phpize', 's##', 's#/usr/local#');
-            $this->setOutput('phpize script path for embed SAPI', BUILD_BIN_PATH . '/phpize');
-        }
-        // patch php-config
-        if (file_exists(BUILD_BIN_PATH . '/php-config')) {
-            logger()->debug('Patching php-config prefix and libs order');
-            $php_config_str = FileSystem::readFile(BUILD_BIN_PATH . '/php-config');
-            $php_config_str = str_replace('prefix=""', 'prefix="' . BUILD_ROOT_PATH . '"', $php_config_str);
-            // move mimalloc to the beginning of libs
-            $php_config_str = preg_replace('/(libs=")(.*?)\s*(' . preg_quote(BUILD_LIB_PATH, '/') . '\/mimalloc\.o)\s*(.*?)"/', '$1$3 $2 $4"', $php_config_str);
-            // move lstdc++ to the end of libs
-            $php_config_str = preg_replace('/(libs=")(.*?)\s*(-lstdc\+\+)\s*(.*?)"/', '$1$2 $4 $3"', $php_config_str);
-            FileSystem::writeFile(BUILD_BIN_PATH . '/php-config', $php_config_str);
-            $this->setOutput('php-config script path for embed SAPI', BUILD_BIN_PATH . '/php-config');
-        }
-    }
-
-    /**
-     * Seek php-src/config.log when building PHP, add it to exception.
-     */
-    protected function seekPhpSrcLogFileOnException(callable $callback, string $source_dir): void
-    {
-        try {
-            $callback();
-        } catch (SPCException $e) {
-            if (file_exists("{$source_dir}/config.log")) {
-                $e->addExtraLogFile('php-src config.log', 'php-src.config.log');
-                copy("{$source_dir}/config.log", SPC_LOGS_DIR . '/php-src.config.log');
-            }
-            throw $e;
-        }
-    }
-
-    private function makeStaticExtensionString(PackageInstaller $installer): string
-    {
-        $arg = [];
-        foreach ($installer->getResolvedPackages() as $package) {
-            /** @var PhpExtensionPackage $package */
-            if ($package->getType() !== 'php-extension' || !$package instanceof PhpExtensionPackage) {
-                continue;
-            }
-
-            // build-shared=true, build-static=false, build-with-php=true
-            if ($package->isBuildShared() && !$package->isBuildStatic() && $package->isBuildWithPhp()) {
-                $arg[] = $package->getPhpConfigureArg(SystemTarget::getTargetOS(), true);
-            } elseif ($package->isBuildStatic()) {
-                $arg[] = $package->getPhpConfigureArg(SystemTarget::getTargetOS(), false);
-            }
-        }
-        $str = implode(' ', $arg);
-        logger()->debug("Static extension configure args: {$str}");
-        return $str;
-    }
-
-    /**
-     * 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(array_map(fn ($x) => $x->getName(), $installer->getResolvedPackages()));
-        $static = ApplicationContext::get(ToolchainInterface::class)->isStatic() ? '-all-static' : '';
-        $pie = SystemTarget::getTargetOS() === 'Linux' ? '-pie' : '';
-
-        return array_filter([
-            'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
-            'EXTRA_LDFLAGS_PROGRAM' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') . "{$config['ldflags']} {$static} {$pie}",
-            'EXTRA_LDFLAGS' => $config['ldflags'],
-            'EXTRA_LIBS' => $config['libs'],
-        ]);
-    }
-
-    /**
-     * 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)
-                    ));
-                }
-            }
-        }
-    }
-}

src/Package/Target/pkgconfig.php

@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Target;
-
-use StaticPHP\Attribute\Package\BuildFor;
-use StaticPHP\Attribute\Package\InitPackage;
-use StaticPHP\Attribute\Package\Target;
-use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Package\TargetPackage;
-use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
-use StaticPHP\Toolchain\Interface\ToolchainInterface;
-
-#[Target('pkg-config')]
-class pkgconfig
-{
-    #[InitPackage]
-    public function resolveBuild(): void
-    {
-        ApplicationContext::set('elephant', true);
-    }
-
-    #[BuildFor('Linux')]
-    #[BuildFor('Darwin')]
-    public function build(TargetPackage $package, ToolchainInterface $toolchain): void
-    {
-        UnixAutoconfExecutor::create($package)
-            ->appendEnv([
-                'CFLAGS' => '-Wimplicit-function-declaration -Wno-int-conversion',
-                'LDFLAGS' => $toolchain->isStatic() ? '--static' : '',
-            ])
-            ->configure(
-                '--with-internal-glib',
-                '--disable-host-tool',
-                '--without-sysroot',
-                '--without-system-include-path',
-                '--without-system-library-path',
-                '--without-pc-path',
-            )
-            ->make(with_install: 'install-exec');
-
-        shell()->exec('strip ' . BUILD_ROOT_PATH . '/bin/pkg-config');
-    }
-}

src/SPC/ConsoleApplication.php

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

src/SPC/builder/BuilderBase.php

@@ -128,6 +128,27 @@ abstract class BuilderBase
         return array_filter($this->exts, fn ($ext) => $ext->isBuildStatic());
     }
 
+    /**
+     * Check if there is a cpp extensions or libraries.
+     */
+    public function hasCpp(): bool
+    {
+        // judge cpp-extension
+        $exts = array_keys($this->getExts(false));
+        foreach ($exts as $ext) {
+            if (Config::getExt($ext, 'cpp-extension', false) === true) {
+                return true;
+            }
+        }
+        $libs = array_keys($this->getLibs());
+        foreach ($libs as $lib) {
+            if (Config::getLib($lib, 'cpp-library', false) === true) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Set libs only mode.
      *

src/SPC/builder/Extension.php

@@ -4,13 +4,17 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
-use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\EnvironmentException;
+use SPC\exception\FileSystemException;
 use SPC\exception\SPCException;
 use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
+use SPC\toolchain\ClangNativeToolchain;
+use SPC\toolchain\GccNativeToolchain;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;
 
@@ -77,7 +81,7 @@ class Extension
     {
         $escapedPath = str_replace("'", '', escapeshellarg(BUILD_ROOT_PATH)) !== BUILD_ROOT_PATH || str_contains(BUILD_ROOT_PATH, ' ') ? escapeshellarg(BUILD_ROOT_PATH) : BUILD_ROOT_PATH;
         $_name = str_replace('_', '-', $this->name);
-        return match ($arg_type = Config::getExt($this->name, 'arg-type', 'enable')) {
+        $arg = match ($arg_type = Config::getExt($this->name, 'arg-type', 'enable')) {
             'enable' => '--enable-' . $_name . ($shared ? '=shared' : '') . ' ',
             'enable-path' => '--enable-' . $_name . '=' . ($shared ? 'shared,' : '') . $escapedPath . ' ',
             'with' => '--with-' . $_name . ($shared ? '=shared' : '') . ' ',
@@ -85,6 +89,7 @@ class Extension
             'none', 'custom' => '',
             default => throw new WrongUsageException("argType does not accept {$arg_type}, use [enable/with/with-path] ."),
         };
+        return str_replace('-shared', '', $arg);
     }
 
     /**
@@ -126,7 +131,7 @@ class Extension
 
     public function getName(): string
     {
-        return $this->name;
+        return str_replace('-shared', '', $this->name);
     }
 
     /**
@@ -134,7 +139,7 @@ class Extension
      */
     public function getDistName(): string
     {
-        return $this->name;
+        return str_replace('-shared', '', $this->name);
     }
 
     public function getWindowsConfigureArg(bool $shared = false): string
@@ -221,25 +226,13 @@ class Extension
      */
     public function patchBeforeSharedMake(): bool
     {
-        $config = (new SPCConfigUtil($this->builder))->getExtensionConfig($this);
-        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
-        $lstdcpp = str_contains($sharedLibs, '-l:libstdc++.a') ? '-l:libstdc++.a' : null;
-        $lstdcpp ??= str_contains($sharedLibs, '-lstdc++') ? '-lstdc++' : '';
-
-        $makefileContent = file_get_contents($this->source_dir . '/Makefile');
-        if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
-            $prefix = $matches[1];
-            $currentLibs = trim($matches[2]);
-            $newLibs = trim("{$currentLibs} {$staticLibs} {$lstdcpp}");
-            $deduplicatedLibs = deduplicate_flags($newLibs);
-
-            FileSystem::replaceFileRegex(
-                $this->source_dir . '/Makefile',
-                '/^(.*_SHARED_LIBADD\s*=.*)$/m',
-                $prefix . $deduplicatedLibs
-            );
-        }
-
+        $config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs()));
+        [$staticLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
+        FileSystem::replaceFileRegex(
+            $this->source_dir . '/Makefile',
+            '/^(.*_SHARED_LIBADD\s*=.*)$/m',
+            '$1 ' . trim($staticLibs)
+        );
         if ($objs = getenv('SPC_EXTRA_RUNTIME_OBJECTS')) {
             FileSystem::replaceFileRegex(
                 $this->source_dir . '/Makefile',
@@ -306,7 +299,7 @@ class Extension
         // Run compile check if build target is cli
         // If you need to run some check, overwrite this or add your assert in src/globals/ext-tests/{extension_name}.php
         $sharedExtensions = $this->getSharedExtensionLoadString();
-        [$ret] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' --ri "' . $this->getDistName() . '"');
+        [$ret, $out] = shell()->execWithResult(BUILD_BIN_PATH . '/php -n' . $sharedExtensions . ' --ri "' . $this->getDistName() . '"');
         if ($ret !== 0) {
             throw new ValidationException(
                 "extension {$this->getName()} failed compile check: php-cli returned {$ret}",
@@ -336,7 +329,7 @@ class Extension
     {
         // Run compile check if build target is cli
         // If you need to run some check, overwrite this or add your assert in src/globals/ext-tests/{extension_name}.php
-        [$ret] = cmd()->execWithResult(BUILD_BIN_PATH . '/php.exe -n --ri "' . $this->getDistName() . '"', false);
+        [$ret] = cmd()->execWithResult(BUILD_ROOT_PATH . '/bin/php.exe -n --ri "' . $this->getDistName() . '"', false);
         if ($ret !== 0) {
             throw new ValidationException("extension {$this->getName()} failed compile check: php-cli returned {$ret}", validation_module: "Extension {$this->getName()} sanity check");
         }
@@ -413,7 +406,42 @@ class Extension
      */
     public function buildUnixShared(): void
     {
-        $env = $this->getSharedExtensionEnv();
+        $config = (new SPCConfigUtil($this->builder))->config(
+            [$this->getName()],
+            array_map(fn ($l) => $l->getName(), $this->getLibraryDependencies(recursive: true)),
+            $this->builder->getOption('with-suggested-exts'),
+            $this->builder->getOption('with-suggested-libs'),
+        );
+        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
+        $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
+        $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
+        $env = [
+            'CFLAGS' => $config['cflags'],
+            'CXXFLAGS' => $config['cflags'],
+            'LDFLAGS' => $config['ldflags'],
+            'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
+            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
+        ];
+        if (str_contains($env['LIBS'], '-lstdc++') && SPCTarget::getTargetOS() === 'Linux') {
+            if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+                $env['SPC_COMPILER_EXTRA'] = '-lstdc++';
+            } elseif (ToolchainManager::getToolchainClass() === GccNativeToolchain::class || ToolchainManager::getToolchainClass() === ClangNativeToolchain::class) {
+                try {
+                    $content = FileSystem::readFile($this->source_dir . '/config.m4');
+                    if ($content && !str_contains($content, 'PHP_ADD_LIBRARY(stdc++')) {
+                        $pattern = '/(PHP_NEW_EXTENSION\(' . $this->name . ',.*\))/m';
+                        $replacement = "$1\nPHP_ADD_LIBRARY(stdc++, 1, " . strtoupper($this->name) . '_SHARED_LIBADD)';
+                        FileSystem::replaceFileRegex(
+                            $this->source_dir . '/config.m4',
+                            $pattern,
+                            $replacement
+                        );
+                    }
+                } catch (FileSystemException) {
+                }
+            }
+        }
+
         if ($this->patchBeforeSharedPhpize()) {
             logger()->info("Extension [{$this->getName()}] patched before shared phpize");
         }
@@ -428,15 +456,13 @@ class Extension
             logger()->info("Extension [{$this->getName()}] patched before shared configure");
         }
 
-        $phpvars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
-
         shell()->cd($this->source_dir)
             ->setEnv($env)
             ->appendEnv($this->getExtraEnv())
             ->exec(
                 './configure ' . $this->getUnixConfigureArg(true) .
                 ' --with-php-config=' . BUILD_BIN_PATH . '/php-config ' .
-                "--enable-shared --disable-static {$phpvars}"
+                '--enable-shared --disable-static'
             );
 
         if ($this->patchBeforeSharedMake()) {
@@ -449,15 +475,6 @@ class Extension
             ->exec('make clean')
             ->exec('make -j' . $this->builder->concurrency)
             ->exec('make install');
-
-        // process *.so file
-        $soFile = BUILD_MODULES_PATH . '/' . $this->getName() . '.so';
-        if (!file_exists($soFile)) {
-            throw new ValidationException("extension {$this->getName()} build failed: {$soFile} not found", validation_module: "Extension {$this->getName()} build");
-        }
-        /** @var UnixBuilderBase $builder */
-        $builder = $this->builder;
-        $builder->deployBinary($soFile, $soFile, false);
     }
 
     /**
@@ -496,58 +513,6 @@ class Extension
         return $this->build_static;
     }
 
-    /**
-     * Get the library dependencies that current extension depends on.
-     *
-     * @param bool $recursive Whether it includes dependencies recursively
-     */
-    public function getLibraryDependencies(bool $recursive = false): array
-    {
-        $ret = array_filter($this->dependencies, fn ($x) => $x instanceof LibraryBase);
-        if (!$recursive) {
-            return $ret;
-        }
-
-        $deps = [];
-
-        $added = 1;
-        while ($added !== 0) {
-            $added = 0;
-            foreach ($ret as $depName => $dep) {
-                foreach ($dep->getDependencies(true) as $depdepName => $depdep) {
-                    if (!array_key_exists($depdepName, $deps)) {
-                        $deps[$depdepName] = $depdep;
-                        ++$added;
-                    }
-                }
-                if (!array_key_exists($depName, $deps)) {
-                    $deps[$depName] = $dep;
-                }
-            }
-        }
-
-        return $deps;
-    }
-
-    /**
-     * Returns the environment variables a shared extension needs to be built.
-     * CFLAGS, CXXFLAGS, LDFLAGS and so on.
-     */
-    protected function getSharedExtensionEnv(): array
-    {
-        $config = (new SPCConfigUtil($this->builder))->getExtensionConfig($this);
-        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
-        $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
-        $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
-        return [
-            'CFLAGS' => $config['cflags'],
-            'CXXFLAGS' => $config['cflags'],
-            'LDFLAGS' => $config['ldflags'],
-            'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
-            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
-        ];
-    }
-
     protected function addLibraryDependency(string $name, bool $optional = false): void
     {
         $depLib = $this->builder->getLib($name);
@@ -557,7 +522,7 @@ class Extension
             }
             logger()->info("enabling {$this->name} without library {$name}");
         } else {
-            $this->dependencies[$name] = $depLib;
+            $this->dependencies[] = $depLib;
         }
     }
 
@@ -570,7 +535,7 @@ class Extension
             }
             logger()->info("enabling {$this->name} without extension {$name}");
         } else {
-            $this->dependencies[$name] = $depExt;
+            $this->dependencies[] = $depExt;
         }
     }
 
@@ -605,4 +570,37 @@ class Extension
         }
         return [trim($staticLibString), trim($sharedLibString)];
     }
+
+    private function getLibraryDependencies(bool $recursive = false): array
+    {
+        $ret = array_filter($this->dependencies, fn ($x) => $x instanceof LibraryBase);
+        if (!$recursive) {
+            return $ret;
+        }
+
+        $deps = [];
+
+        $added = 1;
+        while ($added !== 0) {
+            $added = 0;
+            foreach ($ret as $depName => $dep) {
+                foreach ($dep->getDependencies(true) as $depdepName => $depdep) {
+                    if (!in_array($depdepName, array_keys($deps), true)) {
+                        $deps[$depdepName] = $depdep;
+                        ++$added;
+                    }
+                }
+                if (!in_array($depName, array_keys($deps), true)) {
+                    $deps[$depName] = $dep;
+                }
+            }
+        }
+
+        if (array_key_exists(0, $deps)) {
+            $zero = [0 => $deps[0]];
+            unset($deps[0]);
+            return $zero + $deps;
+        }
+        return $deps;
+    }
 }

src/SPC/builder/extension/gettext.php

@@ -15,11 +15,7 @@ class gettext extends Extension
     public function patchBeforeBuildconf(): bool
     {
         if ($this->builder instanceof MacOSBuilder) {
-            FileSystem::replaceFileStr(
-                SOURCE_PATH . '/php-src/ext/gettext/config.m4',
-                ['AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB', 'AC_CHECK_LIB([$GETTEXT_CHECK_IN_LIB'],
-                ['AC_CHECK_LIB(intl', 'AC_CHECK_LIB([intl'] // new php versions use a bracket
-            );
+            FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/gettext/config.m4', 'AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB', 'AC_CHECK_LIB(intl');
         }
         return true;
     }

src/SPC/builder/extension/grpc.php

@@ -43,7 +43,7 @@ class grpc extends Extension
     public function patchBeforeConfigure(): bool
     {
         $util = new SPCConfigUtil($this->builder, ['libs_only_deps' => true]);
-        $config = $util->getExtensionConfig($this);
+        $config = $util->config(['grpc']);
         $libs = $config['libs'];
         FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/configure', '-lgrpc', $libs);
         return true;
@@ -56,11 +56,4 @@ class grpc extends Extension
         GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -Wno-strict-prototypes');
         return true;
     }
-
-    protected function getSharedExtensionEnv(): array
-    {
-        $env = parent::getSharedExtensionEnv();
-        $env['CPPFLAGS'] = $env['CXXFLAGS'] . ' -Wno-attributes';
-        return $env;
-    }
 }

src/SPC/builder/extension/maxminddb.php

@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\store\FileSystem;
-use SPC\util\CustomExt;
-
-#[CustomExt('maxminddb')]
-class maxminddb extends Extension
-{
-    public function patchBeforeBuildconf(): bool
-    {
-        if (!is_dir(SOURCE_PATH . '/php-src/ext/maxminddb')) {
-            $original = $this->source_dir;
-            FileSystem::copyDir($original . '/ext', SOURCE_PATH . '/php-src/ext/maxminddb');
-            $this->source_dir = SOURCE_PATH . '/php-src/ext/maxminddb';
-            return true;
-        }
-        $this->source_dir = SOURCE_PATH . '/php-src/ext/maxminddb';
-        return false;
-    }
-}

src/SPC/builder/extension/rdkafka.php

@@ -7,7 +7,6 @@ namespace SPC\builder\extension;
 use SPC\builder\Extension;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
-use SPC\util\SPCConfigUtil;
 
 #[CustomExt('rdkafka')]
 class rdkafka extends Extension
@@ -16,7 +15,6 @@ class rdkafka extends Extension
     {
         FileSystem::replaceFileStr("{$this->source_dir}/config.m4", "-L\$RDKAFKA_DIR/\$PHP_LIBDIR -lm\n", "-L\$RDKAFKA_DIR/\$PHP_LIBDIR -lm \$RDKAFKA_LIBS\n");
         FileSystem::replaceFileStr("{$this->source_dir}/config.m4", "-L\$RDKAFKA_DIR/\$PHP_LIBDIR -lm\"\n", '-L$RDKAFKA_DIR/$PHP_LIBDIR -lm $RDKAFKA_LIBS"');
-        FileSystem::replaceFileStr("{$this->source_dir}/config.m4", 'PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,', 'AC_CHECK_LIB([$LIBNAME], [$LIBSYMBOL],');
         return true;
     }
 
@@ -39,7 +37,8 @@ class rdkafka extends Extension
 
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        $pkgconf_libs = (new SPCConfigUtil($this->builder, ['no_php' => true, 'libs_only_deps' => true]))->getExtensionConfig($this);
-        return '--with-rdkafka=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . " RDKAFKA_LIBS=\"{$pkgconf_libs['libs']}\"";
+        $pkgconf_libs = shell()->execWithResult('pkg-config --libs --static rdkafka')[1];
+        $pkgconf_libs = trim(implode('', $pkgconf_libs));
+        return '--with-rdkafka=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . ' RDKAFKA_LIBS="' . $pkgconf_libs . '"';
     }
 }

src/SPC/builder/extension/readline.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\exception\ValidationException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
@@ -24,7 +23,12 @@ class readline extends Extension
 
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        return '--with-libedit --without-readline';
+        $enable = '--without-libedit --with-readline=' . BUILD_ROOT_PATH;
+        if ($this->builder->getPHPVersionID() < 84000) {
+            // the check uses `char rl_pending_input()` instead of `extern int rl_pending_input`, which makes LTO fail
+            $enable .= ' ac_cv_lib_readline_rl_pending_input=yes';
+        }
+        return $enable;
     }
 
     public function buildUnixShared(): void
@@ -35,13 +39,4 @@ class readline extends Extension
         }
         parent::buildUnixShared();
     }
-
-    public function runCliCheckUnix(): void
-    {
-        parent::runCliCheckUnix();
-        [$ret, $out] = shell()->execWithResult('printf "exit\n" | ' . BUILD_BIN_PATH . '/php -a');
-        if ($ret !== 0 || !str_contains(implode("\n", $out), 'Interactive shell')) {
-            throw new ValidationException("readline extension failed sanity check. Code: {$ret}, output: " . implode("\n", $out));
-        }
-    }
 }

src/SPC/builder/extension/simdjson.php

@@ -6,8 +6,6 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\store\FileSystem;
-use SPC\toolchain\ToolchainManager;
-use SPC\toolchain\ZigToolchain;
 use SPC\util\CustomExt;
 
 #[CustomExt('simdjson')]
@@ -19,7 +17,7 @@ class simdjson extends Extension
         FileSystem::replaceFileRegex(
             SOURCE_PATH . '/php-src/ext/simdjson/config.m4',
             '/php_version=(`.*`)$/m',
-            'php_version=' . $php_ver
+            'php_version=' . strval($php_ver)
         );
         FileSystem::replaceFileStr(
             SOURCE_PATH . '/php-src/ext/simdjson/config.m4',
@@ -33,18 +31,4 @@ class simdjson extends Extension
         );
         return true;
     }
-
-    public function getSharedExtensionEnv(): array
-    {
-        $env = parent::getSharedExtensionEnv();
-        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $extra = getenv('SPC_COMPILER_EXTRA');
-            if (!str_contains((string) $extra, '-lstdc++')) {
-                f_putenv('SPC_COMPILER_EXTRA=' . clean_spaces($extra . ' -lstdc++'));
-            }
-            $env['CFLAGS'] .= ' -Xclang -target-feature -Xclang +evex512';
-            $env['CXXFLAGS'] .= ' -Xclang -target-feature -Xclang +evex512';
-        }
-        return $env;
-    }
 }

src/SPC/builder/extension/snmp.php

@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\store\FileSystem;
-use SPC\util\CustomExt;
-use SPC\util\PkgConfigUtil;
-
-#[CustomExt('snmp')]
-class snmp extends Extension
-{
-    public function patchBeforeBuildconf(): bool
-    {
-        // Overwrite m4 config using newer PHP version
-        if ($this->builder->getPHPVersionID() < 80400) {
-            FileSystem::copy(ROOT_DIR . '/src/globals/extra/snmp-ext-config-old.m4', "{$this->source_dir}/config.m4");
-        }
-        $libs = implode(' ', PkgConfigUtil::getLibsArray('netsnmp'));
-        FileSystem::replaceFileStr(
-            "{$this->source_dir}/config.m4",
-            'PHP_EVAL_LIBLINE([$SNMP_LIBS], [SNMP_SHARED_LIBADD])',
-            "SNMP_LIBS=\"{$libs}\"\nPHP_EVAL_LIBLINE([\$SNMP_LIBS],  [SNMP_SHARED_LIBADD])"
-        );
-        return true;
-    }
-}

src/SPC/builder/extension/spx.php

@@ -13,7 +13,7 @@ class spx extends Extension
 {
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        $arg = '--enable-SPX' . ($shared ? '=shared' : '');
+        $arg = '--enable-spx' . ($shared ? '=shared' : '');
         if ($this->builder->getLib('zlib') !== null) {
             $arg .= ' --with-zlib-dir=' . BUILD_ROOT_PATH;
         }
@@ -29,20 +29,4 @@ class spx extends Extension
         );
         return true;
     }
-
-    public function patchBeforeBuildconf(): bool
-    {
-        FileSystem::replaceFileStr(
-            $this->source_dir . '/config.m4',
-            'CFLAGS="$CFLAGS -Werror -Wall -O3 -pthread -std=gnu90"',
-            'CFLAGS="$CFLAGS -pthread"'
-        );
-        FileSystem::replaceFileStr(
-            $this->source_dir . '/src/php_spx.h',
-            "extern zend_module_entry spx_module_entry;\n",
-            "extern zend_module_entry spx_module_entry;;\n#define phpext_spx_ptr &spx_module_entry\n"
-        );
-        FileSystem::copy($this->source_dir . '/src/php_spx.h', $this->source_dir . '/php_spx.h');
-        return true;
-    }
 }

src/SPC/builder/extension/swoole.php

@@ -69,13 +69,10 @@ class swoole extends Extension
         $arg .= $this->builder->getExt('swoole-hook-pgsql') ? ' --enable-swoole-pgsql' : ' --disable-swoole-pgsql';
         $arg .= $this->builder->getExt('swoole-hook-mysql') ? ' --enable-mysqlnd' : ' --disable-mysqlnd';
         $arg .= $this->builder->getExt('swoole-hook-sqlite') ? ' --enable-swoole-sqlite' : ' --disable-swoole-sqlite';
-        if ($this->builder->getExt('swoole-hook-odbc')) {
-            $config = (new SPCConfigUtil($this->builder))->getLibraryConfig($this->builder->getLib('unixodbc'));
-            $arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"';
-        }
 
-        if ($this->getExtVersion() >= '6.1.0') {
-            $arg .= ' --enable-swoole-stdext';
+        if ($this->builder->getExt('swoole-hook-odbc')) {
+            $config = (new SPCConfigUtil($this->builder, ['libs_only_deps' => true]))->config([], ['unixodbc']);
+            $arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"';
         }
 
         if (SPCTarget::getTargetOS() === 'Darwin') {

src/SPC/builder/extension/trader.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\store\FileSystem;
-use SPC\util\CustomExt;
-
-#[CustomExt('trader')]
-class trader extends Extension
-{
-    public function patchBeforeBuildconf(): bool
-    {
-        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/trader/config.m4', 'PHP_TA', 'PHP_TRADER');
-        return true;
-    }
-}

src/SPC/builder/extension/zip.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\util\CustomExt;
-
-#[CustomExt('zip')]
-class zip extends Extension
-{
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        return !$shared ? '--with-zip=' . BUILD_ROOT_PATH : '--enable-zip=shared';
-    }
-}

src/SPC/builder/freebsd/BSDBuilder.php

@@ -153,7 +153,7 @@ class BSDBuilder extends UnixBuilderBase
         if (!$this->getOption('no-strip', false)) {
             $shell->exec('strip sapi/cli/php');
         }
-        $this->deploySAPIBinary(BUILD_TARGET_CLI);
+        $this->deployBinary(BUILD_TARGET_CLI);
     }
 
     /**
@@ -184,7 +184,7 @@ class BSDBuilder extends UnixBuilderBase
         if (!$this->getOption('no-strip', false)) {
             shell()->cd(SOURCE_PATH . '/php-src/sapi/micro')->exec('strip --strip-unneeded micro.sfx');
         }
-        $this->deploySAPIBinary(BUILD_TARGET_MICRO);
+        $this->deployBinary(BUILD_TARGET_MICRO);
 
         if ($this->phar_patched) {
             SourcePatcher::unpatchMicroPhar();
@@ -206,7 +206,7 @@ class BSDBuilder extends UnixBuilderBase
         if (!$this->getOption('no-strip', false)) {
             $shell->exec('strip sapi/fpm/php-fpm');
         }
-        $this->deploySAPIBinary(BUILD_TARGET_FPM);
+        $this->deployBinary(BUILD_TARGET_FPM);
     }
 
     /**

src/SPC/builder/linux/LinuxBuilder.php

@@ -7,8 +7,6 @@ namespace SPC\builder\linux;
 use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\PatchException;
 use SPC\exception\WrongUsageException;
-use SPC\store\Config;
-use SPC\store\DirDiff;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 use SPC\util\GlobalEnvManager;
@@ -91,14 +89,12 @@ class LinuxBuilder extends UnixBuilderBase
         // prepare build php envs
         // $musl_flag = SPCTarget::getLibc() === 'musl' ? ' -D__MUSL__' : ' -U__MUSL__';
         $php_configure_env = SystemUtil::makeEnvVarString([
-            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
+            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
             'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, // . ' -Dsomethinghere', // . $musl_flag,
             'LDFLAGS' => '-L' . BUILD_LIB_PATH,
             // 'LIBS' => SPCTarget::getRuntimeLibs(), // do not pass static libraries here yet, they may contain polyfills for libc functions!
         ]);
 
-        $phpvars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
-
         $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
         if ($embed_type !== 'static' && SPCTarget::isStatic()) {
             throw new WrongUsageException(
@@ -109,19 +105,18 @@ class LinuxBuilder extends UnixBuilderBase
 
         $this->seekPhpSrcLogFileOnException(fn () => shell()->cd(SOURCE_PATH . '/php-src')->exec(
             $php_configure_env . ' ' .
-            getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
-            ($enableCli ? '--enable-cli ' : '--disable-cli ') .
-            ($enableFpm ? '--enable-fpm ' . ($this->getLib('libacl') !== null ? '--with-fpm-acl ' : '') : '--disable-fpm ') .
-            ($enableEmbed ? "--enable-embed={$embed_type} " : '--disable-embed ') .
-            ($enableMicro ? '--enable-micro=all-static ' : '--disable-micro ') .
-            ($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
-            $config_file_path .
-            $config_file_scan_dir .
-            $json_74 .
-            $zts .
-            $maxExecutionTimers .
-            $phpvars . ' ' .
-            $this->makeStaticExtensionArgs() . ' '
+                getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
+                ($enableCli ? '--enable-cli ' : '--disable-cli ') .
+                ($enableFpm ? '--enable-fpm ' . ($this->getLib('libacl') !== null ? '--with-fpm-acl ' : '') : '--disable-fpm ') .
+                ($enableEmbed ? "--enable-embed={$embed_type} " : '--disable-embed ') .
+                ($enableMicro ? '--enable-micro=all-static ' : '--disable-micro ') .
+                ($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
+                $config_file_path .
+                $config_file_scan_dir .
+                $json_74 .
+                $zts .
+                $maxExecutionTimers .
+                $this->makeStaticExtensionArgs() . ' '
         ));
 
         $this->emitPatchPoint('before-php-make');
@@ -158,14 +153,7 @@ class LinuxBuilder extends UnixBuilderBase
         }
         $shared_extensions = array_map('trim', array_filter(explode(',', $this->getOption('build-shared'))));
         if (!empty($shared_extensions)) {
-            if (SPCTarget::isStatic()) {
-                throw new WrongUsageException(
-                    "You're building against musl libc statically (the default on Linux), but you're trying to build shared extensions.\n" .
-                    'Static musl libc does not implement `dlopen`, so your php binary is not able to load shared extensions.' . "\n" .
-                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, or use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc`.'
-                );
-            }
-            logger()->info('Building shared extensions...');
+            logger()->info('Building shared extensions ...');
             $this->buildSharedExts();
         }
     }
@@ -181,32 +169,40 @@ class LinuxBuilder extends UnixBuilderBase
      */
     protected function buildCli(): void
     {
-        if ($this->getExt('readline') && SPCTarget::isStatic()) {
-            SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src');
-        }
-
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
-        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
+        $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
-            ->exec("make {$concurrency} {$vars} cli");
+            ->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cli");
 
-        if ($this->getExt('readline') && SPCTarget::isStatic()) {
-            SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src', true);
+        if (!$this->getOption('no-strip', false)) {
+            shell()->cd(SOURCE_PATH . '/php-src/sapi/cli')->exec('strip --strip-unneeded php');
+        }
+        if ($this->getOption('with-upx-pack')) {
+            shell()->cd(SOURCE_PATH . '/php-src/sapi/cli')
+                ->exec(getenv('UPX_EXEC') . ' --best php');
         }
 
-        $this->deploySAPIBinary(BUILD_TARGET_CLI);
+        $this->deployBinary(BUILD_TARGET_CLI);
     }
 
     protected function buildCgi(): void
     {
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
-        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
+        $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
-            ->exec("make {$concurrency} {$vars} cgi");
+            ->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cgi");
 
-        $this->deploySAPIBinary(BUILD_TARGET_CGI);
+        if (!$this->getOption('no-strip', false)) {
+            shell()->cd(SOURCE_PATH . '/php-src/sapi/cgi')->exec('strip --strip-unneeded php-cgi');
+        }
+        if ($this->getOption('with-upx-pack')) {
+            shell()->cd(SOURCE_PATH . '/php-src/sapi/cgi')
+                ->exec(getenv('UPX_EXEC') . ' --best php-cgi');
+        }
+
+        $this->deployBinary(BUILD_TARGET_CGI);
     }
 
     /**
@@ -217,33 +213,29 @@ class LinuxBuilder extends UnixBuilderBase
         if ($this->getPHPVersionID() < 80000) {
             throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
         }
-        try {
-            if ($this->getExt('phar')) {
-                $this->phar_patched = true;
-                SourcePatcher::patchMicroPhar($this->getPHPVersionID());
-            }
+        if ($this->getExt('phar')) {
+            $this->phar_patched = true;
+            SourcePatcher::patchMicroPhar($this->getPHPVersionID());
+        }
 
-            $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
-            $vars = $this->getMakeExtraVars();
+        $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
+        $vars = $this->getMakeExtraVars();
 
-            // patch fake cli for micro
-            $vars['EXTRA_CFLAGS'] .= $enable_fake_cli;
-            $vars = SystemUtil::makeEnvVarString($vars);
-            $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
+        // patch fake cli for micro
+        $vars['EXTRA_CFLAGS'] .= $enable_fake_cli;
+        $vars = SystemUtil::makeEnvVarString($vars);
+        $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
 
-            shell()->cd(SOURCE_PATH . '/php-src')
-                ->exec('sed -i "s|//lib|/lib|g" Makefile')
-                ->exec("make {$concurrency} {$vars} micro");
+        shell()->cd(SOURCE_PATH . '/php-src')
+            ->exec('sed -i "s|//lib|/lib|g" Makefile')
+            ->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} micro");
 
-            // deploy micro.sfx
-            $dst = $this->deploySAPIBinary(BUILD_TARGET_MICRO);
+        $this->processMicroUPX();
 
-            // patch after UPX-ed micro.sfx
-            $this->processUpxedMicroSfx($dst);
-        } finally {
-            if ($this->phar_patched) {
-                SourcePatcher::unpatchMicroPhar();
-            }
+        $this->deployBinary(BUILD_TARGET_MICRO);
+
+        if ($this->phar_patched) {
+            SourcePatcher::unpatchMicroPhar();
         }
     }
 
@@ -253,12 +245,19 @@ class LinuxBuilder extends UnixBuilderBase
     protected function buildFpm(): void
     {
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
-        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
+        $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
-            ->exec("make {$concurrency} {$vars} fpm");
+            ->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} fpm");
 
-        $this->deploySAPIBinary(BUILD_TARGET_FPM);
+        if (!$this->getOption('no-strip', false)) {
+            shell()->cd(SOURCE_PATH . '/php-src/sapi/fpm')->exec('strip --strip-unneeded php-fpm');
+        }
+        if ($this->getOption('with-upx-pack')) {
+            shell()->cd(SOURCE_PATH . '/php-src/sapi/fpm')
+                ->exec(getenv('UPX_EXEC') . ' --best php-fpm');
+        }
+        $this->deployBinary(BUILD_TARGET_FPM);
     }
 
     /**
@@ -266,69 +265,17 @@ class LinuxBuilder extends UnixBuilderBase
      */
     protected function buildEmbed(): void
     {
-        $sharedExts = array_filter($this->exts, static fn ($ext) => $ext->isBuildShared());
-        $sharedExts = array_filter($sharedExts, static function ($ext) {
-            return Config::getExt($ext->getName(), 'build-with-php') === true;
-        });
-        $install_modules = $sharedExts ? 'install-modules' : '';
-
-        // detect changes in module path
-        $diff = new DirDiff(BUILD_MODULES_PATH, true);
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
-        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
+
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
             ->exec('sed -i "s|^EXTENSION_DIR = .*|EXTENSION_DIR = /' . basename(BUILD_MODULES_PATH) . '|" Makefile')
-            ->exec("make {$concurrency} INSTALL_ROOT=" . BUILD_ROOT_PATH . " {$vars} install-sapi {$install_modules} install-build install-headers install-programs");
+            ->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . ' INSTALL_ROOT=' . BUILD_ROOT_PATH . " {$vars} install");
 
-        // process libphp.so for shared embed
-        $libphpSo = BUILD_LIB_PATH . '/libphp.so';
-        if (file_exists($libphpSo)) {
-            // post actions: rename libphp.so to libphp-<release>.so if -release is set in LDFLAGS
-            $this->processLibphpSoFile($libphpSo);
-            // deploy libphp.so
-            $this->deployBinary($libphpSo, $libphpSo, false);
-        }
-
-        // process shared extensions build-with-php
-        $increment_files = $diff->getChangedFiles();
-        foreach ($increment_files as $increment_file) {
-            $this->deployBinary($increment_file, $increment_file, false);
-        }
-
-        // process libphp.a for static embed
-        if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'static') {
-            $AR = getenv('AR') ?: 'ar';
-            f_passthru("{$AR} -t " . BUILD_LIB_PATH . "/libphp.a | grep '\\.a$' | xargs -n1 {$AR} d " . BUILD_LIB_PATH . '/libphp.a');
-            // export dynamic symbols
-            SystemUtil::exportDynamicSymbols(BUILD_LIB_PATH . '/libphp.a');
-        }
-
-        // patch embed php scripts
-        $this->patchPhpScripts();
-    }
-
-    /**
-     * Return extra variables for php make command.
-     */
-    private function getMakeExtraVars(): array
-    {
-        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true, 'absolute_libs' => true]))->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
-        $static = SPCTarget::isStatic() ? '-all-static' : '';
-        $lib = BUILD_LIB_PATH;
-        return array_filter([
-            'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
-            'EXTRA_LIBS' => $config['libs'],
-            'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
-            'EXTRA_LDFLAGS_PROGRAM' => "-L{$lib} {$static} -pie",
-        ]);
-    }
-
-    private function processLibphpSoFile(string $libphpSo): void
-    {
         $ldflags = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') ?: '';
         $libDir = BUILD_LIB_PATH;
         $modulesDir = BUILD_MODULES_PATH;
+        $libphpSo = "{$libDir}/libphp.so";
         $realLibName = 'libphp.so';
         $cwd = getcwd();
 
@@ -390,29 +337,60 @@ class LinuxBuilder extends UnixBuilderBase
                 }
             }
         }
+
+        if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'static') {
+            $AR = getenv('AR') ?: 'ar';
+            f_passthru("{$AR} -t " . BUILD_LIB_PATH . "/libphp.a | grep '\\.a$' | xargs -n1 {$AR} d " . BUILD_LIB_PATH . '/libphp.a');
+            // export dynamic symbols
+            SystemUtil::exportDynamicSymbols(BUILD_LIB_PATH . '/libphp.a');
+        }
+
+        if (!$this->getOption('no-strip', false) && file_exists(BUILD_LIB_PATH . '/' . $realLibName)) {
+            shell()->cd(BUILD_LIB_PATH)->exec("strip --strip-unneeded {$realLibName}");
+        }
+        $this->patchPhpScripts();
     }
 
     /**
-     * Patch micro.sfx after UPX compression.
-     * micro needs special section handling in LinuxBuilder.
-     * The micro.sfx does not support UPX directly, but we can remove UPX
-     * info segment to adapt.
-     * This will also make micro.sfx with upx-packed more like a malware fore antivirus
+     * Return extra variables for php make command.
      */
-    private function processUpxedMicroSfx(string $dst): void
+    private function getMakeExtraVars(): array
     {
-        if ($this->getOption('with-upx-pack') && version_compare($this->getMicroVersion(), '0.2.0') >= 0) {
-            // strip first
-            // cut binary with readelf
-            [$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');
+        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true, 'absolute_libs' => true]))->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
+        $static = SPCTarget::isStatic() ? '-all-static' : '';
+        $lib = BUILD_LIB_PATH;
+        return [
+            'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
+            'EXTRA_LIBS' => $config['libs'],
+            'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
+            'EXTRA_LDFLAGS_PROGRAM' => "-L{$lib} {$static} -pie",
+        ];
+    }
+
+    /**
+     * Strip micro.sfx for Linux.
+     * The micro.sfx does not support UPX directly, but we can remove UPX-info segment to adapt.
+     * This will also make micro.sfx with upx-packed more like a malware fore antivirus :(
+     */
+    private function processMicroUPX(): void
+    {
+        if (version_compare($this->getMicroVersion(), '0.2.0') >= 0 && !$this->getOption('no-strip', false)) {
+            shell()->exec('strip --strip-unneeded ' . SOURCE_PATH . '/php-src/sapi/micro/micro.sfx');
+
+            if ($this->getOption('with-upx-pack')) {
+                // strip first
+                shell()->exec(getenv('UPX_EXEC') . ' --best ' . SOURCE_PATH . '/php-src/sapi/micro/micro.sfx');
+                // cut binary with readelf
+                [$ret, $out] = shell()->execWithResult('readelf -l ' . SOURCE_PATH . '/php-src/sapi/micro/micro.sfx | 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(SOURCE_PATH . '/php-src/sapi/micro/micro.sfx', substr(file_get_contents(SOURCE_PATH . '/php-src/sapi/micro/micro.sfx'), 0, $offset));
             }
-            $offset = hexdec($offset);
-            // remove upx extra wastes
-            file_put_contents($dst, substr(file_get_contents($dst), 0, $offset));
         }
     }
 }

src/SPC/builder/linux/SystemUtil.php

@@ -141,7 +141,7 @@ class SystemUtil
     {
         return [
             // debian-like
-            'debian', 'ubuntu', 'Deepin', 'neon',
+            'debian', 'ubuntu', 'Deepin',
             // rhel-like
             'redhat',
             // centos

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -78,7 +78,7 @@ class openssl extends LinuxLibraryBase
         if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc'), 'prefix=')) {
             FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
         }
-        FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Requires.private: zlib');
+        FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Libs.private: ${libdir}/libz.a');
         FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/cmake/OpenSSL/OpenSSLConfig.cmake', '/set\(OPENSSL_LIBCRYPTO_DEPENDENCIES .*\)/m', 'set(OPENSSL_LIBCRYPTO_DEPENDENCIES "${OPENSSL_LIBRARY_DIR}/libz.a")');
     }
 }

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

@@ -4,6 +4,9 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
+/**
+ * gmp is a template library class for unix
+ */
 class readline extends LinuxLibraryBase
 {
     use \SPC\builder\unix\library\readline;

src/SPC/builder/macos/MacOSBuilder.php

@@ -7,8 +7,6 @@ namespace SPC\builder\macos;
 use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\WrongUsageException;
-use SPC\store\Config;
-use SPC\store\DirDiff;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 use SPC\util\GlobalEnvManager;
@@ -106,7 +104,7 @@ class MacOSBuilder extends UnixBuilderBase
 
         // prepare build php envs
         $envs_build_php = SystemUtil::makeEnvVarString([
-            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
+            'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
             'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
             'LDFLAGS' => '-L' . BUILD_LIB_PATH,
         ]);
@@ -188,9 +186,12 @@ class MacOSBuilder extends UnixBuilderBase
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
 
         $shell = shell()->cd(SOURCE_PATH . '/php-src');
-        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
-        $shell->exec("make {$concurrency} {$vars} cli");
-        $this->deploySAPIBinary(BUILD_TARGET_CLI);
+        $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
+        $shell->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cli");
+        if (!$this->getOption('no-strip', false)) {
+            $shell->exec('dsymutil -f sapi/cli/php')->exec('strip -S sapi/cli/php');
+        }
+        $this->deployBinary(BUILD_TARGET_CLI);
     }
 
     protected function buildCgi(): void
@@ -198,9 +199,12 @@ class MacOSBuilder extends UnixBuilderBase
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
 
         $shell = shell()->cd(SOURCE_PATH . '/php-src');
-        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
-        $shell->exec("make {$concurrency} {$vars} cgi");
-        $this->deploySAPIBinary(BUILD_TARGET_CGI);
+        $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
+        $shell->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cgi");
+        if (!$this->getOption('no-strip', false)) {
+            $shell->exec('dsymutil -f sapi/cgi/php-cgi')->exec('strip -S sapi/cgi/php-cgi');
+        }
+        $this->deployBinary(BUILD_TARGET_CGI);
     }
 
     /**
@@ -211,30 +215,30 @@ class MacOSBuilder extends UnixBuilderBase
         if ($this->getPHPVersionID() < 80000) {
             throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
         }
+        if ($this->getExt('phar')) {
+            $this->phar_patched = true;
+            SourcePatcher::patchMicroPhar($this->getPHPVersionID());
+        }
 
-        try {
-            if ($this->getExt('phar')) {
-                $this->phar_patched = true;
-                SourcePatcher::patchMicroPhar($this->getPHPVersionID());
-            }
+        $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
+        $vars = $this->getMakeExtraVars();
 
-            $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
-            $vars = $this->getMakeExtraVars();
+        // patch fake cli for micro
+        $vars['EXTRA_CFLAGS'] .= $enable_fake_cli;
+        $vars = SystemUtil::makeEnvVarString($vars);
 
-            // patch fake cli for micro
-            $vars['EXTRA_CFLAGS'] .= $enable_fake_cli;
-            $vars = SystemUtil::makeEnvVarString($vars);
+        $shell = shell()->cd(SOURCE_PATH . '/php-src');
+        // build
+        $shell->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . " {$vars} micro");
+        // strip
+        if (!$this->getOption('no-strip', false)) {
+            $shell->exec('dsymutil -f sapi/micro/micro.sfx')->exec('strip -S sapi/micro/micro.sfx');
+        }
 
-            $shell = shell()->cd(SOURCE_PATH . '/php-src');
-            // build
-            $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
-            $shell->exec("make {$concurrency} {$vars} micro");
+        $this->deployBinary(BUILD_TARGET_MICRO);
 
-            $this->deploySAPIBinary(BUILD_TARGET_MICRO);
-        } finally {
-            if ($this->phar_patched) {
-                SourcePatcher::unpatchMicroPhar();
-            }
+        if ($this->phar_patched) {
+            SourcePatcher::unpatchMicroPhar();
         }
     }
 
@@ -246,9 +250,11 @@ class MacOSBuilder extends UnixBuilderBase
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
 
         $shell = shell()->cd(SOURCE_PATH . '/php-src');
-        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
-        $shell->exec("make {$concurrency} {$vars} fpm");
-        $this->deploySAPIBinary(BUILD_TARGET_FPM);
+        $shell->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . " {$vars} fpm");
+        if (!$this->getOption('no-strip', false)) {
+            $shell->exec('dsymutil -f sapi/fpm/php-fpm')->exec('strip -S sapi/fpm/php-fpm');
+        }
+        $this->deployBinary(BUILD_TARGET_FPM);
     }
 
     /**
@@ -256,31 +262,10 @@ class MacOSBuilder extends UnixBuilderBase
      */
     protected function buildEmbed(): void
     {
-        $sharedExts = array_filter($this->exts, static fn ($ext) => $ext->isBuildShared());
-        $sharedExts = array_filter($sharedExts, static function ($ext) {
-            return Config::getExt($ext->getName(), 'build-with-php') === true;
-        });
-        $install_modules = $sharedExts ? 'install-modules' : '';
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
-        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
-
-        $diff = new DirDiff(BUILD_MODULES_PATH, true);
 
         shell()->cd(SOURCE_PATH . '/php-src')
-            ->exec('sed -i "" "s|^EXTENSION_DIR = .*|EXTENSION_DIR = /' . basename(BUILD_MODULES_PATH) . '|" Makefile')
-            ->exec("make {$concurrency} INSTALL_ROOT=" . BUILD_ROOT_PATH . " {$vars} install-sapi {$install_modules} install-build install-headers install-programs");
-
-        $libphp = BUILD_LIB_PATH . '/libphp.dylib';
-        if (file_exists($libphp)) {
-            $this->deployBinary($libphp, $libphp, false);
-            // macOS currently have no -release option for dylib, so we just rename it here
-        }
-
-        // process shared extensions build-with-php
-        $increment_files = $diff->getChangedFiles();
-        foreach ($increment_files as $increment_file) {
-            $this->deployBinary($increment_file, $increment_file, false);
-        }
+            ->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . ' INSTALL_ROOT=' . BUILD_ROOT_PATH . " {$vars} install");
 
         if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'static') {
             $AR = getenv('AR') ?: 'ar';
@@ -294,10 +279,10 @@ class MacOSBuilder extends UnixBuilderBase
     private function getMakeExtraVars(): array
     {
         $config = (new SPCConfigUtil($this, ['libs_only_deps' => true]))->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
-        return array_filter([
+        return [
             'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             'EXTRA_LDFLAGS_PROGRAM' => '-L' . BUILD_LIB_PATH,
             'EXTRA_LIBS' => $config['libs'],
-        ]);
+        ];
     }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -63,7 +63,7 @@ class openssl extends MacOSLibraryBase
         if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc'), 'prefix=')) {
             FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
         }
-        FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Requires.private: zlib');
+        FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Libs.private: ${libdir}/libz.a');
         FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/cmake/OpenSSL/OpenSSLConfig.cmake', '/set\(OPENSSL_LIBCRYPTO_DEPENDENCIES .*\)/m', 'set(OPENSSL_LIBCRYPTO_DEPENDENCIES "${OPENSSL_LIBRARY_DIR}/libz.a")');
     }
 }

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

@@ -4,6 +4,9 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
+/**
+ * gmp is a template library class for unix
+ */
 class readline extends MacOSLibraryBase
 {
     use \SPC\builder\unix\library\readline;

src/SPC/builder/unix/UnixBuilderBase.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace SPC\builder\unix;
 
 use SPC\builder\BuilderBase;
-use SPC\builder\linux\SystemUtil;
 use SPC\builder\linux\SystemUtil as LinuxSystemUtil;
 use SPC\exception\SPCException;
 use SPC\exception\SPCInternalException;
@@ -14,7 +13,6 @@ use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
 use SPC\store\pkg\GoXcaddy;
-use SPC\store\SourceManager;
 use SPC\toolchain\GccNativeToolchain;
 use SPC\toolchain\ToolchainManager;
 use SPC\util\DependencyUtil;
@@ -80,92 +78,6 @@ abstract class UnixBuilderBase extends BuilderBase
         $this->lib_list = $sorted_libraries;
     }
 
-    /**
-     * Strip unneeded symbols from binary file.
-     */
-    public function stripBinary(string $binary_path): void
-    {
-        shell()->exec(match (PHP_OS_FAMILY) {
-            'Darwin' => "strip -S {$binary_path}",
-            'Linux' => "strip --strip-unneeded {$binary_path}",
-            default => throw new SPCInternalException('stripBinary is only supported on Linux and macOS'),
-        });
-    }
-
-    /**
-     * Extract debug information from binary file.
-     *
-     * @param string $binary_path the path to the binary file, including executables, shared libraries, etc
-     */
-    public function extractDebugInfo(string $binary_path): string
-    {
-        $target_dir = BUILD_ROOT_PATH . '/debug';
-        FileSystem::createDir($target_dir);
-        $basename = basename($binary_path);
-        $debug_file = "{$target_dir}/{$basename}" . (PHP_OS_FAMILY === 'Darwin' ? '.dwarf' : '.debug');
-        if (PHP_OS_FAMILY === 'Darwin') {
-            shell()->exec("dsymutil -f {$binary_path} -o {$debug_file}");
-        } elseif (PHP_OS_FAMILY === 'Linux') {
-            if ($eu_strip = SystemUtil::findCommand('eu-strip')) {
-                shell()
-                    ->exec("{$eu_strip} -f {$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}");
-            }
-        } else {
-            throw new SPCInternalException('extractDebugInfo is only supported on Linux and macOS');
-        }
-        return $debug_file;
-    }
-
-    /**
-     * Deploy the binary file from src to dst.
-     */
-    public function deployBinary(string $src, string $dst, bool $executable = true): string
-    {
-        logger()->debug('Deploying binary from ' . $src . ' to ' . $dst);
-
-        // file must exists
-        if (!file_exists($src)) {
-            throw new SPCInternalException("Deploy failed. Cannot find file: {$src}");
-        }
-        // dst dir must exists
-        FileSystem::createDir(dirname($dst));
-
-        // ignore copy to self
-        if (realpath($src) !== realpath($dst)) {
-            shell()->exec('cp ' . escapeshellarg($src) . ' ' . escapeshellarg($dst));
-        }
-
-        // file exist
-        if (!file_exists($dst)) {
-            throw new SPCInternalException("Deploy failed. Cannot find file after copy: {$dst}");
-        }
-
-        // extract debug info
-        $this->extractDebugInfo($dst);
-
-        // strip
-        if (!$this->getOption('no-strip')) {
-            $this->stripBinary($dst);
-        }
-
-        // UPX for linux
-        $upx_option = $this->getOption('with-upx-pack');
-        if ($upx_option && PHP_OS_FAMILY === 'Linux' && $executable) {
-            if ($this->getOption('no-strip')) {
-                logger()->warning('UPX compression is not recommended when --no-strip is enabled.');
-            }
-            logger()->info("Compressing {$dst} with UPX");
-            shell()->exec(getenv('UPX_EXEC') . " --best {$dst}");
-        }
-
-        return $dst;
-    }
-
     /**
      * Sanity check after build complete.
      */
@@ -296,20 +208,23 @@ abstract class UnixBuilderBase extends BuilderBase
     }
 
     /**
-     * Deploy binaries that produces executable SAPI
+     * Deploy the binary file to the build bin path.
+     *
+     * @param int $type Type integer, one of BUILD_TARGET_CLI, BUILD_TARGET_MICRO, BUILD_TARGET_FPM
      */
-    protected function deploySAPIBinary(int $type): string
+    protected function deployBinary(int $type): bool
     {
         $src = match ($type) {
             BUILD_TARGET_CLI => SOURCE_PATH . '/php-src/sapi/cli/php',
             BUILD_TARGET_MICRO => SOURCE_PATH . '/php-src/sapi/micro/micro.sfx',
             BUILD_TARGET_FPM => SOURCE_PATH . '/php-src/sapi/fpm/php-fpm',
             BUILD_TARGET_CGI => SOURCE_PATH . '/php-src/sapi/cgi/php-cgi',
-            BUILD_TARGET_FRANKENPHP => BUILD_BIN_PATH . '/frankenphp',
             default => throw new SPCInternalException("Deployment does not accept type {$type}"),
         };
-        $dst = BUILD_BIN_PATH . '/' . basename($src);
-        return $this->deployBinary($src, $dst);
+        logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');
+        FileSystem::createDir(BUILD_BIN_PATH);
+        shell()->exec('cp ' . escapeshellarg($src) . ' ' . escapeshellarg(BUILD_BIN_PATH));
+        return true;
     }
 
     /**
@@ -350,75 +265,22 @@ abstract class UnixBuilderBase extends BuilderBase
         }
     }
 
-    /**
-     * Process the --with-frankenphp-app option
-     * Creates app.tar and app.checksum in source/frankenphp directory
-     */
-    protected function processFrankenphpApp(): void
-    {
-        $frankenphpSourceDir = getenv('FRANKENPHP_SOURCE_PATH') ?: SOURCE_PATH . '/frankenphp';
-        if (!is_dir($frankenphpSourceDir)) {
-            SourceManager::initSource(['frankenphp'], ['frankenphp']);
-        }
-        $frankenphpAppPath = $this->getOption('with-frankenphp-app');
-
-        if ($frankenphpAppPath) {
-            if (!is_dir($frankenphpAppPath)) {
-                throw new WrongUsageException("The path provided to --with-frankenphp-app is not a valid directory: {$frankenphpAppPath}");
-            }
-            $appTarPath = $frankenphpSourceDir . '/app.tar';
-            logger()->info("Creating app.tar from {$frankenphpAppPath}");
-
-            shell()->exec('tar -cf ' . escapeshellarg($appTarPath) . ' -C ' . escapeshellarg($frankenphpAppPath) . ' .');
-
-            $checksum = hash_file('md5', $appTarPath);
-            file_put_contents($frankenphpSourceDir . '/app_checksum.txt', $checksum);
-        } else {
-            FileSystem::removeFileIfExists($frankenphpSourceDir . '/app.tar');
-            FileSystem::removeFileIfExists($frankenphpSourceDir . '/app_checksum.txt');
-            file_put_contents($frankenphpSourceDir . '/app.tar', '');
-            file_put_contents($frankenphpSourceDir . '/app_checksum.txt', '');
-        }
-    }
-
-    protected function getFrankenPHPVersion(): string
-    {
-        if ($version = getenv('FRANKENPHP_VERSION')) {
-            return $version;
-        }
-        $frankenphpSourceDir = getenv('FRANKENPHP_SOURCE_PATH') ?: SOURCE_PATH . '/frankenphp';
-        $goModPath = $frankenphpSourceDir . '/caddy/go.mod';
-
-        if (!file_exists($goModPath)) {
-            throw new SPCInternalException("FrankenPHP caddy/go.mod file not found at {$goModPath}, why did we not download FrankenPHP?");
-        }
-
-        $content = file_get_contents($goModPath);
-        if (preg_match('/github\.com\/dunglas\/frankenphp\s+v?(\d+\.\d+\.\d+)/', $content, $matches)) {
-            return $matches[1];
-        }
-
-        throw new SPCInternalException('Could not find FrankenPHP version in caddy/go.mod');
-    }
-
     protected function buildFrankenphp(): void
     {
         GlobalEnvManager::addPathIfNotExists(GoXcaddy::getPath());
-        $this->processFrankenphpApp();
         $nobrotli = $this->getLib('brotli') === null ? ',nobrotli' : '';
         $nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : '';
         $xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES');
-        $frankenphpSourceDir = getenv('FRANKENPHP_SOURCE_PATH') ?: SOURCE_PATH . '/frankenphp';
-
-        $xcaddyModules = preg_replace('#--with github.com/dunglas/frankenphp\S*#', '', $xcaddyModules);
-        $xcaddyModules = "--with github.com/dunglas/frankenphp={$frankenphpSourceDir} " .
-            "--with github.com/dunglas/frankenphp/caddy={$frankenphpSourceDir}/caddy {$xcaddyModules}";
+        // make it possible to build from a different frankenphp directory!
+        if (!str_contains($xcaddyModules, '--with github.com/dunglas/frankenphp')) {
+            $xcaddyModules = '--with github.com/dunglas/frankenphp ' . $xcaddyModules;
+        }
         if ($this->getLib('brotli') === null && str_contains($xcaddyModules, '--with github.com/dunglas/caddy-cbrotli')) {
             logger()->warning('caddy-cbrotli module is enabled, but brotli library is not built. Disabling caddy-cbrotli.');
             $xcaddyModules = str_replace('--with github.com/dunglas/caddy-cbrotli', '', $xcaddyModules);
         }
-
-        $frankenPhpVersion = $this->getFrankenPHPVersion();
+        [, $out] = shell()->execWithResult('go list -m github.com/dunglas/frankenphp@latest');
+        $frankenPhpVersion = str_replace('github.com/dunglas/frankenphp v', '', $out[0]);
         $libphpVersion = $this->getPHPVersion();
         $dynamic_exports = '';
         if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
@@ -428,18 +290,20 @@ abstract class UnixBuilderBase extends BuilderBase
                 $dynamic_exports = ' ' . $dynamicSymbolsArgument;
             }
         }
-        $extLdFlags = "-extldflags '-pie{$dynamic_exports} {$this->arch_ld_flags}'";
+        $debugFlags = $this->getOption('no-strip') ? '-w -s ' : '';
+        $extLdFlags = "-extldflags '-pie{$dynamic_exports}'";
         $muslTags = '';
         $staticFlags = '';
         if (SPCTarget::isStatic()) {
-            $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000{$dynamic_exports} {$this->arch_ld_flags}'";
+            $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000{$dynamic_exports}'";
             $muslTags = 'static_build,';
             $staticFlags = '-static-pie';
         }
 
         $config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list);
-        $cflags = "{$this->arch_c_flags} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -DFRANKENPHP_VERSION=' . $frankenPhpVersion;
+        $cflags = "{$this->arch_c_flags} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS');
         $libs = $config['libs'];
+        $libs .= PHP_OS_FAMILY === 'Linux' ? ' -lrt' : '';
         // Go's gcc driver doesn't automatically link against -lgcov or -lrt. Ugly, but necessary fix.
         if ((str_contains((string) getenv('SPC_DEFAULT_C_FLAGS'), '-fprofile') ||
                 str_contains((string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'), '-fprofile')) &&
@@ -452,7 +316,7 @@ abstract class UnixBuilderBase extends BuilderBase
             'CGO_CFLAGS' => clean_spaces($cflags),
             'CGO_LDFLAGS' => "{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs}",
             'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
-                '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' .
+                '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' . $debugFlags .
                 '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .
                 "v{$frankenPhpVersion} PHP {$libphpVersion} Caddy'\\\" " .
                 "-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
@@ -462,7 +326,13 @@ abstract class UnixBuilderBase extends BuilderBase
             ->setEnv($env)
             ->exec("xcaddy build --output frankenphp {$xcaddyModules}");
 
-        $this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP);
+        if (!$this->getOption('no-strip', false) && file_exists(BUILD_BIN_PATH . '/frankenphp')) {
+            if (PHP_OS_FAMILY === 'Linux') {
+                shell()->cd(BUILD_BIN_PATH)->exec('strip --strip-unneeded frankenphp');
+            } else { // macOS doesn't understand strip-unneeded
+                shell()->cd(BUILD_BIN_PATH)->exec('strip -S frankenphp');
+            }
+        }
     }
 
     /**

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

@@ -17,7 +17,7 @@ trait attr
             ->exec('libtoolize --force --copy')
             ->exec('./autogen.sh || autoreconf -if')
             ->configure('--disable-nls')
-            ->make('install-attributes_h install-data install-libattr_h install-libLTLIBRARIES install-pkgincludeHEADERS install-pkgconfDATA', with_install: false);
+            ->make();
         $this->patchPkgconfPrefix(['libattr.pc'], PKGCONF_PATCH_PREFIX);
     }
 }

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

@@ -23,8 +23,6 @@ trait curl
             ->optionalLib('zstd', ...cmake_boolean_args('CURL_ZSTD'))
             ->optionalLib('idn2', ...cmake_boolean_args('USE_LIBIDN2'))
             ->optionalLib('psl', ...cmake_boolean_args('CURL_USE_LIBPSL'))
-            ->optionalLib('krb5', ...cmake_boolean_args('CURL_USE_GSSAPI'))
-            ->optionalLib('idn2', ...cmake_boolean_args('CURL_USE_IDN2'))
             ->optionalLib('libcares', '-DENABLE_ARES=ON')
             ->addConfigureArgs(
                 '-DBUILD_CURL_EXE=OFF',

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

@@ -31,7 +31,7 @@ trait gettext
             $autoconf->addConfigureArgs('--disable-threads');
         }
 
-        $autoconf->configure()->make(dir: $this->getSourceDir() . '/gettext-runtime/intl');
+        $autoconf->configure()->make();
         $this->patchLaDependencyPrefix();
     }
 }

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

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\util\executor\UnixAutoconfExecutor;
-
-trait idn2
-{
-    protected function build(): void
-    {
-        UnixAutoconfExecutor::create($this)
-            ->configure(
-                '--disable-nls',
-                '--disable-doc',
-                '--enable-year2038',
-                '--disable-rpath'
-            )
-            ->optionalLib('libiconv', "--with-libiconv-prefix={$this->getBuildRootPath()}")
-            ->optionalLib('libunistring', "--with-libunistring-prefix={$this->getBuildRootPath()}")
-            ->optionalLib('gettext', "--with-libnintl-prefix={$this->getBuildRootPath()}")
-            ->make();
-        $this->patchPkgconfPrefix(['libidn2.pc']);
-        $this->patchLaDependencyPrefix();
-    }
-}

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

@@ -12,11 +12,6 @@ trait imagemagick
 {
     protected function build(): void
     {
-        $original_ldflags = $this->builder->arch_ld_flags;
-        if (str_contains($this->builder->arch_ld_flags, '-Wl,--as-needed')) {
-            $this->builder->arch_ld_flags = str_replace('-Wl,--as-needed', '', $original_ldflags);
-        }
-
         $ac = UnixAutoconfExecutor::create($this)
             ->optionalLib('libzip', ...ac_with_args('zip'))
             ->optionalLib('libjpeg', ...ac_with_args('jpeg'))
@@ -37,7 +32,7 @@ trait imagemagick
             );
 
         // special: linux-static target needs `-static`
-        $ldflags = SPCTarget::isStatic() ? '-static -ldl' : '-ldl';
+        $ldflags = SPCTarget::isStatic() ? ('-static -ldl') : '-ldl';
 
         // special: macOS needs -iconv
         $libs = SPCTarget::getTargetOS() === 'Darwin' ? '-liconv' : '';
@@ -50,8 +45,6 @@ trait imagemagick
 
         $ac->configure()->make();
 
-        $this->builder->arch_ld_flags = $original_ldflags;
-
         $filelist = [
             'ImageMagick.pc',
             'ImageMagick-7.Q16HDRI.pc',

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

@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\util\executor\UnixAutoconfExecutor;
-use SPC\util\SPCConfigUtil;
-
-trait krb5
-{
-    protected function build(): void
-    {
-        $origin_source_dir = $this->source_dir;
-        $this->source_dir .= '/src';
-        shell()->cd($this->source_dir)->exec('autoreconf -if');
-        $libs = array_map(fn ($x) => $x->getName(), $this->getDependencies(true));
-        $spc = new SPCConfigUtil($this->builder, ['no_php' => true, 'libs_only_deps' => true]);
-        $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));
-        $extraEnv = [
-            'CFLAGS' => '-fcommon',
-            'LIBS' => $config['libs'],
-        ];
-        if (getenv('SPC_LD_LIBRARY_PATH') && getenv('SPC_LIBRARY_PATH')) {
-            $extraEnv = [...$extraEnv, ...[
-                'LD_LIBRARY_PATH' => getenv('SPC_LD_LIBRARY_PATH'),
-                'LIBRARY_PATH' => getenv('SPC_LIBRARY_PATH'),
-            ]];
-        }
-        $args = [
-            '--disable-nls',
-            '--disable-rpath',
-            '--without-system-verto',
-        ];
-        if (PHP_OS_FAMILY === 'Darwin') {
-            $extraEnv['LDFLAGS'] = '-framework Kerberos';
-            $args[] = 'ac_cv_func_secure_getenv=no';
-        }
-        UnixAutoconfExecutor::create($this)
-            ->appendEnv($extraEnv)
-            ->optionalLib('ldap', '--with-ldap', '--without-ldap')
-            ->optionalLib('libedit', '--with-libedit', '--without-libedit')
-            ->configure(...$args)
-            ->make();
-        $this->patchPkgconfPrefix([
-            'krb5-gssapi.pc',
-            'krb5.pc',
-            'kadm-server.pc',
-            'kadm-client.pc',
-            'kdb.pc',
-            'mit-krb5-gssapi.pc',
-            'mit-krb5.pc',
-            'gssrpc.pc',
-        ]);
-        $this->source_dir = $origin_source_dir;
-    }
-}

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

@@ -26,7 +26,7 @@ trait libacl
             ->exec('libtoolize --force --copy')
             ->exec('./autogen.sh || autoreconf -if')
             ->configure('--disable-nls', '--disable-tests')
-            ->make('install-acl_h install-libacl_h install-data install-libLTLIBRARIES install-pkgincludeHEADERS install-sysincludeHEADERS install-pkgconfDATA', with_install: false);
+            ->make();
         $this->patchPkgconfPrefix(['libacl.pc'], PKGCONF_PATCH_PREFIX);
     }
 }

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

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\store\FileSystem;
-use SPC\util\executor\UnixAutoconfExecutor;
-
-trait libedit
-{
-    public function patchBeforeBuild(): bool
-    {
-        FileSystem::replaceFileRegex(
-            $this->source_dir . '/src/sys.h',
-            '|//#define\s+strl|',
-            '#define strl'
-        );
-        return true;
-    }
-
-    protected function build(): void
-    {
-        UnixAutoconfExecutor::create($this)
-            ->appendEnv(['CFLAGS' => '-D__STDC_ISO_10646__=201103L'])
-            ->configure()
-            ->make();
-        $this->patchPkgconfPrefix(['libedit.pc']);
-    }
-}

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

@@ -10,13 +10,7 @@ trait libiconv
 {
     protected function build(): void
     {
-        UnixAutoconfExecutor::create($this)
-            ->configure(
-                '--enable-extra-encodings',
-                '--enable-year2038',
-            )
-            ->make('install-lib', with_install: false)
-            ->make('install-lib', with_install: false, dir: $this->getSourceDir() . '/libcharset');
+        UnixAutoconfExecutor::create($this)->configure('--enable-extra-encodings')->make();
         $this->patchLaDependencyPrefix();
     }
 }

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

@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\util\executor\UnixCMakeExecutor;
-
-trait libmaxminddb
-{
-    protected function build(): void
-    {
-        UnixCMakeExecutor::create($this)
-            ->addConfigureArgs(
-                '-DBUILD_TESTING=OFF',
-                '-DMAXMINDDB_BUILD_BINARIES=OFF',
-            )
-            ->build();
-    }
-}

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

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\unix\library;
 
 use SPC\store\FileSystem;
-use SPC\util\executor\UnixCMakeExecutor;
+use SPC\util\executor\UnixAutoconfExecutor;
 
 trait librdkafka
 {
@@ -26,18 +26,34 @@ trait librdkafka
 
     protected function build(): void
     {
-        UnixCMakeExecutor::create($this)
-            ->optionalLib('zstd', ...cmake_boolean_args('WITH_ZSTD'))
-            ->optionalLib('curl', ...cmake_boolean_args('WITH_CURL'))
-            ->optionalLib('openssl', ...cmake_boolean_args('WITH_SSL'))
-            ->optionalLib('zlib', ...cmake_boolean_args('WITH_ZLIB'))
-            ->optionalLib('liblz4', ...cmake_boolean_args('ENABLE_LZ4_EXT'))
-            ->addConfigureArgs(
-                '-DWITH_SASL=OFF',
-                '-DRDKAFKA_BUILD_STATIC=ON',
-                '-DRDKAFKA_BUILD_EXAMPLES=OFF',
-                '-DRDKAFKA_BUILD_TESTS=OFF',
+        UnixAutoconfExecutor::create($this)
+            ->appendEnv(['CFLAGS' => '-Wno-int-conversion -Wno-unused-but-set-variable -Wno-unused-variable'])
+            ->optionalLib(
+                'zstd',
+                function ($lib) {
+                    putenv("STATIC_LIB_libzstd={$lib->getLibDir()}/libzstd.a");
+                    return '';
+                },
+                '--disable-zstd'
             )
-            ->build();
+            ->removeConfigureArgs(
+                '--with-pic',
+                '--enable-pic',
+            )
+            ->configure(
+                '--disable-curl',
+                '--disable-sasl',
+                '--disable-valgrind',
+                '--disable-zlib',
+                '--disable-ssl',
+            )
+            ->make();
+
+        $this->patchPkgconfPrefix(['rdkafka.pc', 'rdkafka-static.pc', 'rdkafka++.pc', 'rdkafka++-static.pc']);
+        // remove dynamic libs
+        shell()
+            ->exec("rm -rf {$this->getLibDir()}/*.so.*")
+            ->exec("rm -rf {$this->getLibDir()}/*.so")
+            ->exec("rm -rf {$this->getLibDir()}/*.dylib");
     }
 }

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

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

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

@@ -22,7 +22,6 @@ trait libzip
                 '-DBUILD_EXAMPLES=OFF',
                 '-DBUILD_REGRESS=OFF',
                 '-DBUILD_TOOLS=OFF',
-                '-DBUILD_OSSFUZZ=OFF',
             )
             ->build();
         $this->patchPkgconfPrefix(['libzip.pc'], PKGCONF_PATCH_PREFIX);

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

@@ -38,7 +38,7 @@ trait ncurses
             ->make();
         $final = FileSystem::scanDirFiles(BUILD_BIN_PATH, relative: true);
         // Remove the new files
-        $new_files = array_diff($final, $filelist ?: []);
+        $new_files = array_diff($final, $filelist);
         foreach ($new_files as $file) {
             @unlink(BUILD_BIN_PATH . '/' . $file);
         }