Add google analytics for docs

.github/workflows/build-unix.yml

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

.github/workflows/tests.yml

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

bin/spc-alpine-docker

@@ -108,7 +108,8 @@ RUN apk update; \
         wget \
         xz \
         gettext-dev \
-        binutils-gold
+        binutils-gold \
+        patchelf
 
 RUN curl -#fSL https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-linux-\$(uname -m).tar.gz | tar -xz -C /usr/local/bin && \
     chmod +x /usr/local/bin/php
@@ -161,47 +162,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
@@ -223,5 +183,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-gnu-docker

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

config/env.ini

@@ -1,41 +1,40 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; 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_LINUX_DEFAULT_CC:   (linux only) the default compiler for linux. (For alpine linux: `gcc`, default: `$GNU_ARCH-linux-musl-gcc`)
-;   SPC_LINUX_DEFAULT_CXX:  (linux only) the default c++ compiler for linux. (For alpine linux: `g++`, default: `$GNU_ARCH-linux-musl-g++`)
-;   SPC_LINUX_DEFAULT_AR:   (linux only) the default archiver for linux. (For alpine linux: `ar`, default: `$GNU_ARCH-linux-musl-ar`)
-;   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`)
+;   SPC_EXTRA_PHP_VARS:                     the extra vars for building php, used in `configure` and `make` command.
 
 [global]
 ; Build concurrency for make -jN, default is CPU_COUNT, this value are used in every libs.
@@ -45,7 +44,7 @@ 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}"
 
@@ -75,10 +74,8 @@ SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime
 ; - musl-native: used for alpine linux, can build `musl` and `musl -dynamic` target.
 ; - gnu-native: used for general linux distros, can build gnu target for the installed glibc version only.
 
-; option to specify the target, superceded by SPC_TARGET if set
+; LEGACY option to specify the target
 SPC_LIBC=musl
-; uncomment to link libc dynamically on musl
-; SPC_MUSL_DYNAMIC=true
 
 ; Recommended: specify your target here. Zig toolchain will be used.
 ; examples:
@@ -93,7 +90,6 @@ SPC_LIBC=musl
 CC=${SPC_LINUX_DEFAULT_CC}
 CXX=${SPC_LINUX_DEFAULT_CXX}
 AR=${SPC_LINUX_DEFAULT_AR}
-RANLIB=${SPC_LINUX_DEFAULT_RANLIB}
 LD=${SPC_LINUX_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
 SPC_DEFAULT_C_FLAGS="-fPIC -Os"
@@ -113,15 +109,13 @@ SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --disable
 ; *** 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=""
 
-; optional, path to openssl conf. This affects where openssl will look for the default CA.
-; default on Debian/Alpine: /etc/ssl, default on RHEL: /etc/pki/tls
-OPENSSLDIR=""
-
 [macos]
 ; build target: macho or macho (possibly we could support macho-universal in the future)
 ; Currently we do not support universal and cross-compilation for macOS.
@@ -147,12 +141,10 @@ SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-
 ; *** 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}"
-; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
-SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
-; minimum compatible macOS version (LLVM vars, availability not guaranteed)
-MACOSX_DEPLOYMENT_TARGET=12.0
+; 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

config/ext.json

@@ -43,27 +43,6 @@
     "calendar": {
         "type": "builtin"
     },
-    "clickhouse": {
-        "support": {
-            "Windows": "wip",
-            "BSD": "wip"
-        },
-        "type": "external",
-        "source": "ext-clickhouse",
-        "arg-type": "custom",
-        "cpp-extension": true,
-        "lib-suggests": [
-            "openssl"
-        ]
-    },
-    "com_dotnet": {
-        "support": {
-            "BSD": "no",
-            "Linux": "no",
-            "Darwin": "no"
-        },
-        "type": "builtin"
-    },
     "ctype": {
         "type": "builtin"
     },
@@ -76,8 +55,7 @@
         ],
         "ext-depends-windows": [
             "zlib",
-            "openssl",
-            "brotli"
+            "openssl"
         ]
     },
     "dba": {
@@ -87,19 +65,6 @@
             "qdbm"
         ]
     },
-    "decimal": {
-        "type": "external",
-        "source": "ext-decimal",
-        "arg-type": "custom",
-        "lib-depends": [
-            "libmpdec"
-        ]
-    },
-    "deepclone": {
-        "type": "external",
-        "source": "deepclone",
-        "arg-type": "enable"
-    },
     "dio": {
         "support": {
             "BSD": "wip"
@@ -162,41 +127,9 @@
             "sockets"
         ]
     },
-    "excimer": {
-        "support": {
-            "Windows": "wip",
-            "BSD": "wip"
-        },
-        "type": "external",
-        "source": "ext-excimer"
-    },
     "exif": {
         "type": "builtin"
     },
-    "fastchart": {
-        "support": {
-            "Windows": "wip",
-            "BSD": "wip"
-        },
-        "type": "external",
-        "source": "ext-fastchart",
-        "lib-depends": [
-            "freetype"
-        ],
-        "lib-suggests": [
-            "libpng",
-            "libjpeg",
-            "libwebp"
-        ]
-    },
-    "fastjson": {
-        "support": {
-            "Windows": "wip",
-            "BSD": "wip"
-        },
-        "type": "external",
-        "source": "ext-fastjson"
-    },
     "ffi": {
         "support": {
             "Linux": "partial",
@@ -287,7 +220,6 @@
         "support": {
             "BSD": "wip"
         },
-        "arg-type": "with-path",
         "type": "external",
         "source": "ext-gmssl",
         "lib-depends": [
@@ -300,14 +232,11 @@
             "BSD": "wip"
         },
         "type": "external",
-        "source": "ext-grpc",
+        "source": "grpc",
         "arg-type-unix": "enable-path",
         "cpp-extension": true,
         "lib-depends": [
-            "grpc",
-            "zlib",
-            "openssl",
-            "libcares"
+            "grpc"
         ]
     },
     "iconv": {
@@ -429,18 +358,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",
@@ -479,7 +396,8 @@
         "ext-depends": [
             "zlib",
             "session"
-        ]
+        ],
+        "build-with-php": true
     },
     "memcached": {
         "support": {
@@ -557,40 +475,6 @@
             "zlib"
         ]
     },
-    "mysqlnd_ed25519": {
-        "type": "external",
-        "source": "mysqlnd_ed25519",
-        "arg-type": "enable",
-        "target": [
-            "shared"
-        ],
-        "ext-depends": [
-            "mysqlnd"
-        ],
-        "lib-depends": [
-            "libsodium"
-        ],
-        "lib-suggests": [
-            "openssl"
-        ]
-    },
-    "mysqlnd_parsec": {
-        "type": "external",
-        "source": "mysqlnd_parsec",
-        "arg-type": "enable",
-        "target": [
-            "shared"
-        ],
-        "ext-depends": [
-            "mysqlnd"
-        ],
-        "lib-depends": [
-            "libsodium"
-        ],
-        "lib-suggests": [
-            "openssl"
-        ]
-    },
     "oci8": {
         "type": "wip",
         "support": {
@@ -671,13 +555,6 @@
         "type": "builtin",
         "unix-only": true
     },
-    "pcov": {
-        "type": "external",
-        "source": "pcov",
-        "target": [
-            "shared"
-        ]
-    },
     "pdo": {
         "type": "builtin"
     },

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,12 +98,11 @@
             "ngtcp2",
             "zstd",
             "libcares",
-            "ldap",
-            "idn2",
-            "krb5"
+            "ldap"
         ],
         "lib-suggests-windows": [
-            "brotli"
+            "brotli",
+            "zstd"
         ],
         "frameworks": [
             "CoreFoundation",
@@ -123,7 +116,7 @@
             "libfastlz.a"
         ],
         "headers": [
-            "fastlz.h"
+            "fastlz/fastlz.h"
         ]
     },
     "freetype": {
@@ -142,7 +135,9 @@
             "zlib"
         ],
         "lib-suggests": [
-            "libpng"
+            "libpng",
+            "bzip2",
+            "brotli"
         ]
     },
     "gettext": {
@@ -233,24 +228,6 @@
             "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,
@@ -298,26 +275,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": [
@@ -352,18 +309,12 @@
         "static-libs-unix": [
             "libaom.a"
         ],
-        "static-libs-windows": [
-            "aom.lib"
-        ],
         "cpp-library": true
     },
     "libargon2": {
         "source": "libargon2",
         "static-libs-unix": [
             "libargon2.a"
-        ],
-        "lib-suggests": [
-            "libsodium"
         ]
     },
     "libavif": {
@@ -373,15 +324,6 @@
         ],
         "static-libs-windows": [
             "avif.lib"
-        ],
-        "lib-depends": [
-            "libaom"
-        ],
-        "lib-suggests": [
-            "libwebp",
-            "libjpeg",
-            "libxml2",
-            "libpng"
         ]
     },
     "libcares": {
@@ -454,7 +396,6 @@
     },
     "libheif": {
         "source": "libheif",
-        "cpp-library": true,
         "static-libs-unix": [
             "libheif.a"
         ],
@@ -494,7 +435,7 @@
         "static-libs-windows": [
             "libjpeg_a.lib"
         ],
-        "lib-depends": [
+        "lib-suggests-windows": [
             "zlib"
         ]
     },
@@ -519,28 +460,6 @@
             "liblz4.a"
         ]
     },
-    "libmaxminddb": {
-        "source": "libmaxminddb",
-        "static-libs-unix": [
-            "libmaxminddb.a"
-        ],
-        "headers": [
-            "maxminddb.h",
-            "maxminddb_config.h"
-        ]
-    },
-    "libmpdec": {
-        "source": "libmpdec",
-        "static-libs-unix": [
-            "libmpdec.a"
-        ],
-        "static-libs-windows": [
-            "libmpdec_a.lib"
-        ],
-        "headers": [
-            "mpdecimal.h"
-        ]
-    },
     "libmemcached": {
         "source": "libmemcached",
         "cpp-library": true,
@@ -587,16 +506,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"
         ]
     },
@@ -643,16 +559,6 @@
             "zstd"
         ]
     },
-    "libunistring": {
-        "source": "libunistring",
-        "static-libs-unix": [
-            "libunistring.a"
-        ],
-        "headers": [
-            "unistr.h",
-            "unistring/"
-        ]
-    },
     "liburing": {
         "source": "liburing",
         "pkg-configs": [
@@ -775,6 +681,7 @@
             "xz"
         ],
         "lib-suggests-windows": [
+            "zstd",
             "openssl"
         ]
     },
@@ -874,9 +781,6 @@
     },
     "openssl": {
         "source": "openssl",
-        "pkg-configs": [
-            "openssl"
-        ],
         "static-libs-unix": [
             "libssl.a",
             "libcrypto.a"
@@ -989,11 +893,6 @@
     },
     "unixodbc": {
         "source": "unixodbc",
-        "pkg-configs": [
-            "odbc",
-            "odbccr",
-            "odbcinst"
-        ],
         "static-libs-unix": [
             "libodbc.a",
             "libodbccr.a",
@@ -1011,9 +910,6 @@
         ],
         "headers": [
             "wtr/watcher-c.h"
-        ],
-        "frameworks": [
-            "CoreServices"
         ]
     },
     "xz": {
@@ -1038,9 +934,6 @@
     },
     "zlib": {
         "source": "zlib",
-        "pkg-configs": [
-            "zlib"
-        ],
         "static-libs-unix": [
             "libz.a"
         ],
@@ -1054,9 +947,6 @@
     },
     "zstd": {
         "source": "zstd",
-        "pkg-configs": [
-            "libzstd"
-        ],
         "static-libs-unix": [
             "libzstd.a"
         ],

config/source.json

@@ -84,25 +84,6 @@
             "path": "COPYING"
         }
     },
-    "ext-decimal": {
-        "type": "ghtagtar",
-        "repo": "php-decimal/ext-decimal",
-        "match": "v2\\.\\d.*",
-        "path": "php-src/ext/decimal",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "deepclone": {
-        "type": "ghtagtar",
-        "repo": "symfony/php-ext-deepclone",
-        "path": "php-src/ext/deepclone",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "dio": {
         "type": "url",
         "url": "https://pecl.php.net/get/dio",
@@ -124,19 +105,10 @@
         }
     },
     "ext-brotli": {
-        "type": "ghtagtar",
-        "repo": "kjdev/php-ext-brotli",
+        "type": "git",
         "path": "php-src/ext/brotli",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "ext-clickhouse": {
-        "type": "ghtagtar",
-        "repo": "iliaal/php_clickhouse",
-        "match": "tarball/refs/tags/\\d",
-        "path": "php-src/ext/clickhouse",
+        "rev": "master",
+        "url": "https://github.com/kjdev/php-ext-brotli",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -154,41 +126,13 @@
     },
     "ext-event": {
         "type": "url",
-        "url": "https://bitbucket.org/osmanov/pecl-event/get/3.1.4.tar.gz",
+        "url": "https://bitbucket.org/osmanov/pecl-event/get/3.0.8.tar.gz",
         "path": "php-src/ext/event",
         "license": {
             "type": "file",
             "path": "LICENSE"
         }
     },
-    "ext-excimer": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/excimer",
-        "path": "php-src/ext/excimer",
-        "filename": "excimer.tgz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "ext-fastchart": {
-        "type": "ghtagtar",
-        "repo": "iliaal/fastchart",
-        "path": "php-src/ext/fastchart",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "ext-fastjson": {
-        "type": "ghtagtar",
-        "repo": "iliaal/fastjson",
-        "path": "php-src/ext/fastjson",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "ext-glfw": {
         "type": "git",
         "url": "https://github.com/mario-deluna/php-glfw",
@@ -207,18 +151,6 @@
             "path": "LICENSE"
         }
     },
-    "ext-grpc": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/grpc",
-        "path": "php-src/ext/grpc",
-        "filename": "grpc.tgz",
-        "license": {
-            "type": "file",
-            "path": [
-                "LICENSE"
-            ]
-        }
-    },
     "ext-imagick": {
         "type": "url",
         "url": "https://pecl.php.net/get/imagick",
@@ -252,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",
@@ -273,7 +196,7 @@
     },
     "ext-rdkafka": {
         "type": "ghtar",
-        "repo": "php-rdkafka/php-rdkafka",
+        "repo": "arnaud-lb/php-rdkafka",
         "path": "php-src/ext/rdkafka",
         "license": {
             "type": "file",
@@ -360,9 +283,10 @@
         }
     },
     "ext-zstd": {
-        "type": "ghtar",
-        "repo": "kjdev/php-ext-zstd",
+        "type": "git",
         "path": "php-src/ext/zstd",
+        "rev": "master",
+        "url": "https://github.com/kjdev/php-ext-zstd",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -377,19 +301,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"
@@ -406,7 +321,7 @@
     },
     "gmp": {
         "type": "filelist",
-        "url": "https://ftp.gnu.org/gnu/gmp/",
+        "url": "https://gmplib.org/download/gmp/",
         "regex": "/href=\"(?<file>gmp-(?<version>[^\"]+)\\.tar\\.xz)\"/",
         "provide-pre-built": true,
         "alt": {
@@ -419,9 +334,9 @@
         }
     },
     "gmssl": {
-        "type": "git",
-        "url": "https://github.com/guanzhi/GmSSL.git",
-        "rev": "master",
+        "type": "ghtar",
+        "repo": "guanzhi/GmSSL",
+        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -506,14 +421,6 @@
             "path": "COPYING"
         }
     },
-    "krb5": {
-        "type": "url",
-        "url": "https://web.mit.edu/kerberos/dist/krb5/1.22/krb5-1.22.2.tar.gz",
-        "license": {
-            "type": "file",
-            "path": "NOTICE"
-        }
-    },
     "ldap": {
         "type": "filelist",
         "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/",
@@ -569,7 +476,7 @@
     "libavif": {
         "type": "ghtar",
         "repo": "AOMediaCodec/libavif",
-        "provide-pre-built": false,
+        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -672,19 +579,9 @@
             "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",
-        "prefer-stable": true,
         "license": {
             "type": "file",
             "path": "LICENSE.md"
@@ -716,24 +613,6 @@
             "path": "LICENSE"
         }
     },
-    "libmaxminddb": {
-        "type": "ghrel",
-        "repo": "maxmind/libmaxminddb",
-        "match": "libmaxminddb-.+\\.tar\\.gz",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "libmpdec": {
-        "type": "url",
-        "url": "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-4.0.1.tar.gz",
-        "license": {
-            "type": "file",
-            "path": "COPYRIGHT.txt"
-        }
-    },
     "libmemcached": {
         "type": "ghtagtar",
         "repo": "awesomized/libmemcached",
@@ -744,10 +623,9 @@
         }
     },
     "libpng": {
-        "type": "ghtagtar",
-        "repo": "pnggroup/libpng",
-        "match": "v1\\.6\\.\\d+",
-        "query": "?per_page=150",
+        "type": "git",
+        "url": "https://github.com/glennrp/libpng.git",
+        "rev": "libpng16",
         "provide-pre-built": true,
         "license": {
             "type": "file",
@@ -755,9 +633,9 @@
         }
     },
     "librabbitmq": {
-        "type": "ghtar",
-        "repo": "alanxz/rabbitmq-c",
-        "prefer-stable": true,
+        "type": "git",
+        "url": "https://github.com/alanxz/rabbitmq-c.git",
+        "rev": "master",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -774,7 +652,7 @@
     "libsodium": {
         "type": "ghrel",
         "repo": "jedisct1/libsodium",
-        "match": "libsodium-(?!1\\.0\\.21)\\d+(\\.\\d+)*\\.tar\\.gz",
+        "match": "libsodium-\\d+(\\.\\d+)*\\.tar\\.gz",
         "prefer-stable": true,
         "provide-pre-built": true,
         "license": {
@@ -802,16 +680,6 @@
             "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",
@@ -825,7 +693,6 @@
         "type": "git",
         "url": "https://github.com/static-php/libuuid.git",
         "rev": "master",
-        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "COPYING"
@@ -846,9 +713,8 @@
         ]
     },
     "libwebp": {
-        "type": "ghtagtar",
-        "repo": "webmproject/libwebp",
-        "match": "v1\\.\\d+\\.\\d+$",
+        "type": "url",
+        "url": "https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.2.tar.gz",
         "provide-pre-built": true,
         "license": {
             "type": "file",
@@ -856,10 +722,8 @@
         }
     },
     "libxml2": {
-        "type": "ghtagtar",
-        "repo": "GNOME/libxml2",
-        "match": "v2\\.\\d+\\.\\d+$",
-        "provide-pre-built": false,
+        "type": "url",
+        "url": "https://github.com/GNOME/libxml2/archive/refs/tags/v2.12.5.tar.gz",
         "license": {
             "type": "file",
             "path": "Copyright"
@@ -946,24 +810,6 @@
             "path": "LICENSE"
         }
     },
-    "mysqlnd_ed25519": {
-        "type": "pie",
-        "repo": "mariadb/mysqlnd_ed25519",
-        "path": "php-src/ext/mysqlnd_ed25519",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
-    "mysqlnd_parsec": {
-        "type": "pie",
-        "repo": "mariadb/mysqlnd_parsec",
-        "path": "php-src/ext/mysqlnd_parsec",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "ncurses": {
         "type": "filelist",
         "url": "https://ftp.gnu.org/pub/gnu/ncurses/",
@@ -1026,7 +872,7 @@
     "openssl": {
         "type": "ghrel",
         "repo": "openssl/openssl",
-        "match": "openssl-3.+\\.tar\\.gz",
+        "match": "openssl.+\\.tar\\.gz",
         "prefer-stable": true,
         "alt": {
             "type": "filelist",
@@ -1059,15 +905,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",
@@ -1220,6 +1057,7 @@
         "path": "php-src/ext/swoole",
         "type": "ghtar",
         "repo": "swoole/swoole-src",
+        "match": "v6\\.+",
         "prefer-stable": true,
         "license": {
             "type": "file",
@@ -1264,8 +1102,9 @@
         }
     },
     "xdebug": {
-        "type": "pie",
-        "repo": "xdebug/xdebug",
+        "type": "url",
+        "url": "https://pecl.php.net/get/xdebug",
+        "filename": "xdebug.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"

docs/.vitepress/config.ts

@@ -1,5 +1,6 @@
 import sidebarEn from "./sidebar.en";
 import sidebarZh from "./sidebar.zh";
+import sidebarJa from "./sidebar.ja";
 
 
 // https://vitepress.dev/reference/site-config
@@ -61,5 +62,19 @@ export default {
         indexName: 'static-php docs',
       },
     },
-  }
+  },
+  head: [
+    [
+      'script',
+      { async: '', src: 'https://www.googletagmanager.com/gtag/js?id=G-0MBJ29BD7F' }
+    ],
+    [
+      'script',
+      {},
+      `window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', 'G-0MBJ29BD7F');`
+    ]
+  ]
 }

docs/en/guide/action-build.md

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

docs/en/guide/manual-build.md

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

docs/zh/guide/action-build.md

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

docs/zh/guide/manual-build.md

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

phpstan.neon

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

src/SPC/ConsoleApplication.php

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

src/SPC/builder/BuilderBase.php

@@ -29,7 +29,7 @@ abstract class BuilderBase
     /** @var array<int, string> extension names */
     protected array $ext_list = [];
 
-    /** @var array<int, string> all libraries being built (resolved dep list) */
+    /** @var array<int, string> library names */
     protected array $lib_list = [];
 
     /** @var bool compile libs only (just mark it) */
@@ -143,7 +143,7 @@ abstract class BuilderBase
      *
      * @internal
      */
-    public function proveExts(array $static_extensions, array $shared_extensions = [], bool $skip_check_deps = false, bool $skip_extract = false, int $build_target = BUILD_TARGET_NONE): void
+    public function proveExts(array $static_extensions, array $shared_extensions = [], bool $skip_check_deps = false, bool $skip_extract = false): void
     {
         // judge ext
         foreach ($static_extensions as $ext) {
@@ -171,9 +171,7 @@ abstract class BuilderBase
             SourceManager::initSource(exts: [...$static_extensions, ...$shared_extensions]);
             $this->emitPatchPoint('after-exts-extract');
             // patch micro
-            if (($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO) {
-                SourcePatcher::patchMicro();
-            }
+            SourcePatcher::patchMicro();
         }
 
         foreach ([...$static_extensions, ...$shared_extensions] as $extension) {

src/SPC/builder/Extension.php

@@ -4,17 +4,14 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
-use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\EnvironmentException;
 use SPC\exception\SPCException;
 use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
-use SPC\toolchain\ToolchainManager;
-use SPC\toolchain\ZigToolchain;
-use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
+use SPC\util\SPCTarget;
 
 class Extension
 {
@@ -98,8 +95,7 @@ class Extension
             fn ($x) => $x->getStaticLibFiles(),
             $this->getLibraryDependencies(recursive: true)
         );
-        $libs = implode(' ', $ret);
-        return deduplicate_flags($libs);
+        return implode(' ', $ret);
     }
 
     /**
@@ -186,6 +182,14 @@ class Extension
      */
     public function patchBeforeMake(): bool
     {
+        if (SPCTarget::getTargetOS() === 'Linux' && $this->isBuildShared() && ($objs = getenv('SPC_EXTRA_RUNTIME_OBJECTS'))) {
+            FileSystem::replaceFileRegex(
+                SOURCE_PATH . '/php-src/Makefile',
+                "/^(shared_objects_{$this->getName()}\\s*=.*)$/m",
+                "$1 {$objs}",
+            );
+            return true;
+        }
         return false;
     }
 
@@ -216,7 +220,7 @@ class Extension
      */
     public function patchBeforeSharedMake(): bool
     {
-        $config = (new SPCConfigUtil($this->builder))->getExtensionConfig($this);
+        $config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs()));
         [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
         $lstdcpp = str_contains($sharedLibs, '-l:libstdc++.a') ? '-l:libstdc++.a' : null;
         $lstdcpp ??= str_contains($sharedLibs, '-lstdc++') ? '-lstdc++' : '';
@@ -225,7 +229,7 @@ class Extension
         if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
             $prefix = $matches[1];
             $currentLibs = trim($matches[2]);
-            $newLibs = clean_spaces("{$currentLibs} {$staticLibs} {$lstdcpp}");
+            $newLibs = trim("{$currentLibs} {$staticLibs} {$lstdcpp}");
             $deduplicatedLibs = deduplicate_flags($newLibs);
 
             FileSystem::replaceFileRegex(
@@ -235,6 +239,13 @@ class Extension
             );
         }
 
+        if ($objs = getenv('SPC_EXTRA_RUNTIME_OBJECTS')) {
+            FileSystem::replaceFileRegex(
+                $this->source_dir . '/Makefile',
+                "/^(shared_objects_{$this->getName()}\\s*=.*)$/m",
+                "$1 {$objs}",
+            );
+        }
         return true;
     }
 
@@ -373,9 +384,6 @@ class Extension
                 logger()->info('Shared extension [' . $this->getName() . '] was already built, skipping (' . $this->getName() . '.so)');
                 return;
             }
-            if ((string) Config::getExt($this->getName(), 'type') === 'addon') {
-                return;
-            }
             logger()->info('Building extension [' . $this->getName() . '] as shared extension (' . $this->getName() . '.so)');
             foreach ($this->dependencies as $dependency) {
                 if (!$dependency instanceof Extension) {
@@ -386,12 +394,13 @@ class Extension
                     $dependency->buildShared([...$visited, $this->getName()]);
                 }
             }
-            $this->builder->emitPatchPoint('before-shared-ext[' . $this->getName() . ']-build');
+            if (Config::getExt($this->getName(), 'type') === 'addon') {
+                return;
+            }
             match (PHP_OS_FAMILY) {
                 'Darwin', 'Linux' => $this->buildUnixShared(),
                 default => throw new WrongUsageException(PHP_OS_FAMILY . ' build shared extensions is not supported yet'),
             };
-            $this->builder->emitPatchPoint('after-shared-ext[' . $this->getName() . ']-build');
         } catch (SPCException $e) {
             $e->bindExtensionInfo(['extension_name' => $this->getName()]);
             throw $e;
@@ -439,20 +448,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';
-        $soDest = $soFile;
-        preg_match('/-release\s+(\S*)/', getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $matches);
-        if (!empty($matches[1])) {
-            $soDest = str_replace('.so', '-' . $matches[1] . '.so', $soFile);
-        }
-        if (!file_exists($soFile)) {
-            throw new ValidationException("extension {$this->getName()} build failed: {$soFile} not found", validation_module: "Extension {$this->getName()} build");
-        }
-        /** @var UnixBuilderBase $builder */
-        $builder = $this->builder;
-        $builder->deployBinary($soFile, $soDest, false);
     }
 
     /**
@@ -491,63 +486,25 @@ 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
     {
-        $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
-        if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
-            GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
-        }
-        $config = (new SPCConfigUtil($this->builder, ['no_php' => true]))->getExtensionConfig($this);
+        $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 ';
-        $extraLd = trim((string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'));
-        if (PHP_OS_FAMILY !== 'Darwin') {
-            $extraLd = trim($extraLd . ' -Wl,-Bsymbolic');
-        }
         return [
             'CFLAGS' => $config['cflags'],
             'CXXFLAGS' => $config['cflags'],
             'LDFLAGS' => $config['ldflags'],
-            'EXTRA_LDFLAGS' => $extraLd,
             'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ];
@@ -562,7 +519,7 @@ class Extension
             }
             logger()->info("enabling {$this->name} without library {$name}");
         } else {
-            $this->dependencies[$name] = $depLib;
+            $this->dependencies[] = $depLib;
         }
     }
 
@@ -575,7 +532,7 @@ class Extension
             }
             logger()->info("enabling {$this->name} without extension {$name}");
         } else {
-            $this->dependencies[$name] = $depExt;
+            $this->dependencies[] = $depExt;
         }
     }
 
@@ -610,4 +567,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 (!array_key_exists($depdepName, $deps)) {
+                        $deps[$depdepName] = $depdep;
+                        ++$added;
+                    }
+                }
+                if (!array_key_exists($depName, $deps)) {
+                    $deps[$depName] = $dep;
+                }
+            }
+        }
+
+        if (array_key_exists(0, $deps)) {
+            $zero = [0 => $deps[0]];
+            unset($deps[0]);
+            return $zero + $deps;
+        }
+        return $deps;
+    }
 }

src/SPC/builder/LibraryBase.php

@@ -184,18 +184,18 @@ abstract class LibraryBase
 
             // extract first if not exists
             if (!is_dir($this->source_dir)) {
-                $this->getBuilder()->emitPatchPoint('before-library[' . static::NAME . ']-extract');
+                $this->getBuilder()->emitPatchPoint('before-library[ ' . static::NAME . ']-extract');
                 SourceManager::initSource(libs: [static::NAME], source_only: true);
-                $this->getBuilder()->emitPatchPoint('after-library[' . static::NAME . ']-extract');
+                $this->getBuilder()->emitPatchPoint('after-library[ ' . static::NAME . ']-extract');
             }
 
             if (!$this->patched && $this->patchBeforeBuild()) {
                 file_put_contents($this->source_dir . '/.spc.patched', 'PATCHED!!!');
             }
-            $this->getBuilder()->emitPatchPoint('before-library[' . static::NAME . ']-build');
+            $this->getBuilder()->emitPatchPoint('before-library[ ' . static::NAME . ']-build');
             $this->build();
             $this->installLicense();
-            $this->getBuilder()->emitPatchPoint('after-library[' . static::NAME . ']-build');
+            $this->getBuilder()->emitPatchPoint('after-library[ ' . static::NAME . ']-build');
             return LIB_STATUS_OK;
         }
 
@@ -346,46 +346,25 @@ abstract class LibraryBase
      */
     protected function installLicense(): void
     {
+        FileSystem::createDir(BUILD_ROOT_PATH . '/source-licenses/' . $this->getName());
         $source = Config::getLib($this->getName(), 'source');
-        FileSystem::createDir(BUILD_ROOT_PATH . "/source-licenses/{$source}");
         $license_files = Config::getSource($source)['license'] ?? [];
         if (is_assoc_array($license_files)) {
             $license_files = [$license_files];
         }
         foreach ($license_files as $index => $license) {
             if ($license['type'] === 'text') {
-                FileSystem::writeFile(BUILD_ROOT_PATH . "/source-licenses/{$source}/{$index}.txt", $license['text']);
+                FileSystem::writeFile(BUILD_ROOT_PATH . '/source-licenses/' . $this->getName() . "/{$index}.txt", $license['text']);
                 continue;
             }
             if ($license['type'] === 'file') {
-                copy($this->source_dir . '/' . $license['path'], BUILD_ROOT_PATH . "/source-licenses/{$source}/{$index}.txt");
+                copy($this->source_dir . '/' . $license['path'], BUILD_ROOT_PATH . '/source-licenses/' . $this->getName() . "/{$index}.txt");
             }
         }
     }
 
     protected function isLibraryInstalled(): bool
     {
-        if ($pkg_configs = Config::getLib(static::NAME, 'pkg-configs', [])) {
-            $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
-            $search_paths = array_unique(array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path)));
-
-            foreach ($pkg_configs as $name) {
-                $found = false;
-                foreach ($search_paths as $path) {
-                    if (file_exists($path . "/{$name}.pc")) {
-                        $found = true;
-                        break;
-                    }
-                }
-                if (!$found) {
-                    return false;
-                }
-            }
-            // allow using system dependencies if pkg_config_path is explicitly defined
-            if (count($search_paths) > 1) {
-                return true;
-            }
-        }
         foreach (Config::getLib(static::NAME, 'static-libs', []) as $name) {
             if (!file_exists(BUILD_LIB_PATH . "/{$name}")) {
                 return false;
@@ -396,17 +375,8 @@ abstract class LibraryBase
                 return false;
             }
         }
-        $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
-        $search_paths = array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path));
         foreach (Config::getLib(static::NAME, 'pkg-configs', []) as $name) {
-            $found = false;
-            foreach ($search_paths as $path) {
-                if (file_exists($path . "/{$name}.pc")) {
-                    $found = true;
-                    break;
-                }
-            }
-            if (!$found) {
+            if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$name}.pc")) {
                 return false;
             }
         }

src/SPC/builder/extension/clickhouse.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\util\CustomExt;
-
-#[CustomExt('clickhouse')]
-class clickhouse extends Extension
-{
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        $arg = '--enable-clickhouse' . ($shared ? '=shared' : '');
-        if ($this->builder->getLib('openssl')) {
-            $arg .= ' --enable-clickhouse-openssl';
-        }
-        return $arg;
-    }
-}

src/SPC/builder/extension/com_dotnet.php

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

src/SPC/builder/extension/decimal.php

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

src/SPC/builder/extension/ffi.php

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

src/SPC/builder/extension/grpc.php

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

src/SPC/builder/extension/imagick.php

@@ -5,8 +5,6 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\toolchain\ToolchainManager;
-use SPC\toolchain\ZigToolchain;
 use SPC\util\CustomExt;
 
 #[CustomExt('imagick')]
@@ -21,9 +19,7 @@ class imagick extends Extension
     protected function splitLibsIntoStaticAndShared(string $allLibs): array
     {
         [$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
-        if (ToolchainManager::getToolchainClass() !== ZigToolchain::class &&
-            (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset'))
-        ) {
+        if (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
             $static .= ' -l:libstdc++.a';
             $shared = str_replace('-lstdc++', '', $shared);
         }

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/memcache.php

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

src/SPC/builder/extension/mongodb.php

@@ -5,22 +5,11 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
-use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('mongodb')]
 class mongodb extends Extension
 {
-    public function patchBeforeBuildconf(): bool
-    {
-        FileSystem::replaceFileRegex(
-            SOURCE_PATH . '/php-src/ext/mongodb/config.m4',
-            '/^(\s+)(src\/libmongoc\/)/m',
-            '$1${ac_config_dir}/$2'
-        );
-        return true;
-    }
-
     public function getUnixConfigureArg(bool $shared = false): string
     {
         $arg = ' --enable-mongodb' . ($shared ? '=shared' : '') . ' ';
@@ -35,9 +24,4 @@ class mongodb extends Extension
         $arg .= $this->builder->getLib('zlib') ? ' --with-mongodb-zlib=yes ' : ' --with-mongodb-zlib=bundled ';
         return clean_spaces($arg);
     }
-
-    public function getExtraEnv(): array
-    {
-        return ['CFLAGS' => '-std=c17'];
-    }
 }

src/SPC/builder/extension/mysqlnd_ed25519.php

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

src/SPC/builder/extension/mysqlnd_parsec.php

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

src/SPC/builder/extension/opcache.php

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

src/SPC/builder/extension/password_argon2.php

@@ -24,6 +24,25 @@ class password_argon2 extends Extension
         }
     }
 
+    public function patchBeforeMake(): bool
+    {
+        $patched = parent::patchBeforeMake();
+        if ($this->builder->getLib('libsodium') !== null) {
+            $extraLibs = getenv('SPC_EXTRA_LIBS');
+            if ($extraLibs !== false) {
+                $extraLibs = str_replace(
+                    [BUILD_LIB_PATH . '/libargon2.a', BUILD_LIB_PATH . '/libsodium.a'],
+                    ['', BUILD_LIB_PATH . '/libargon2.a ' . BUILD_LIB_PATH . '/libsodium.a'],
+                    $extraLibs,
+                );
+                $extraLibs = trim(preg_replace('/\s+/', ' ', $extraLibs)); // normalize spacing
+                f_putenv('SPC_EXTRA_LIBS=' . $extraLibs);
+                return true;
+            }
+        }
+        return $patched;
+    }
+
     public function getConfigureArg(bool $shared = false): string
     {
         if ($this->builder->getLib('openssl') !== null) {

src/SPC/builder/extension/pgsql.php

@@ -45,7 +45,7 @@ class pgsql extends Extension
     protected function getExtraEnv(): array
     {
         return [
-            'CFLAGS' => '-std=c17 -Wno-int-conversion',
+            'CFLAGS' => '-Wno-int-conversion',
         ];
     }
 }

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/spx.php

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

src/SPC/builder/extension/sqlsrv.php

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

src/SPC/builder/extension/swoole.php

@@ -17,7 +17,6 @@ class swoole extends Extension
     public function patchBeforeMake(): bool
     {
         $patched = parent::patchBeforeMake();
-        FileSystem::replaceFileStr($this->source_dir . '/ext-src/php_swoole_private.h', 'PHP_VERSION_ID > 80500', 'PHP_VERSION_ID >= 80600');
         if ($this->builder instanceof MacOSBuilder) {
             // Fix swoole with event extension <util.h> conflict bug
             $util_path = shell()->execWithResult('xcrun --show-sdk-path', false)[1][0] . '/usr/include/util.h';
@@ -50,16 +49,19 @@ class swoole extends Extension
 
         // commonly used feature: coroutine-time
         $arg .= ' --enable-swoole-coro-time --with-pic';
-        $arg .= ' --enable-swoole-ssh --enable-swoole-curl';
 
         $arg .= $this->builder->getOption('enable-zts') ? ' --enable-swoole-thread --disable-thread-context' : ' --disable-swoole-thread --enable-thread-context';
 
+        // required features: curl, openssl (but curl hook is buggy for php 8.0)
+        $arg .= $this->builder->getPHPVersionID() >= 80100 ? ' --enable-swoole-curl' : ' --disable-swoole-curl';
+        $arg .= ' --enable-openssl';
+
         // additional features that only require libraries
         $arg .= $this->builder->getLib('libcares') ? ' --enable-cares' : '';
         $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : '';
         $arg .= $this->builder->getLib('nghttp2') ? (' --with-nghttp2-dir=' . BUILD_ROOT_PATH) : '';
         $arg .= $this->builder->getLib('zstd') ? ' --enable-zstd' : '';
-        $arg .= $this->builder->getLib('liburing') && getenv('SPC_LIBC') !== 'glibc' ? ' --enable-iouring --enable-uring-socket' : '--disable-iouring';
+        $arg .= $this->builder->getLib('liburing') ? ' --enable-iouring' : '';
         $arg .= $this->builder->getExt('sockets') ? ' --enable-sockets' : '';
 
         // enable additional features that require the pdo extension, but conflict with pdo_* extensions
@@ -68,10 +70,9 @@ class swoole extends Extension
         $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'));
+            $config = (new SPCConfigUtil($this->builder, ['libs_only_deps' => true]))->config([], ['unixodbc']);
             $arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"';
         }
-        $arg .= $this->builder->getExt('ftp')?->isBuildStatic() ? ' --disable-swoole-ftp' : ' --enable-swoole-ftp';
 
         if ($this->getExtVersion() >= '6.1.0') {
             $arg .= ' --enable-swoole-stdext';

src/SPC/builder/extension/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/xlswriter.php

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

src/SPC/builder/freebsd/BSDBuilder.php

@@ -65,8 +65,6 @@ class BSDBuilder extends UnixBuilderBase
             ('--with-config-file-path=' . $this->getOption('with-config-file-path') . ' ') : '';
         $config_file_scan_dir = $this->getOption('with-config-file-scan-dir', false) ?
             ('--with-config-file-scan-dir=' . $this->getOption('with-config-file-scan-dir') . ' ') : '';
-        $sysconfdir = $this->getOption('with-sysconfdir', false) ?
-            ('--sysconfdir=' . $this->getOption('with-sysconfdir') . ' ') : '';
 
         $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI;
         $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM;
@@ -91,7 +89,6 @@ class BSDBuilder extends UnixBuilderBase
                 ($enableMicro ? '--enable-micro ' : '--disable-micro ') .
                 $config_file_path .
                 $config_file_scan_dir .
-                $sysconfdir .
                 $json_74 .
                 $zts .
                 $this->makeStaticExtensionArgs()
@@ -156,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);
     }
 
     /**
@@ -187,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();
@@ -209,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/freebsd/library/libmpdec.php

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

src/SPC/builder/linux/LinuxBuilder.php

@@ -8,13 +8,9 @@ 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\toolchain\ToolchainManager;
-use SPC\toolchain\ZigToolchain;
 use SPC\util\GlobalEnvManager;
-use SPC\util\PgoManager;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;
 
@@ -23,8 +19,6 @@ class LinuxBuilder extends UnixBuilderBase
     /** @var bool Micro patch phar flag */
     private bool $phar_patched = false;
 
-    private ?PgoManager $pgo = null;
-
     public function __construct(array $options = [])
     {
         $this->options = $options;
@@ -51,8 +45,6 @@ class LinuxBuilder extends UnixBuilderBase
      */
     public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
     {
-        $this->pgo = PgoManager::fromBuilder($this, $build_target);
-
         $cflags = $this->arch_c_flags;
         f_putenv('CFLAGS=' . $cflags);
 
@@ -72,8 +64,7 @@ class LinuxBuilder extends UnixBuilderBase
             // php 8.5 contains opcache extension by default,
             // if opcache_jit is enabled for 8.5 or opcache enabled,
             // we need to disable undefined behavior sanitizer.
-            $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
-            f_putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
+            f_putenv('SPC_COMPILER_EXTRA=-fno-sanitize=undefined');
         }
 
         if ($this->getOption('enable-zts', false)) {
@@ -88,8 +79,6 @@ class LinuxBuilder extends UnixBuilderBase
             ('--with-config-file-path=' . $this->getOption('with-config-file-path') . ' ') : '';
         $config_file_scan_dir = $this->getOption('with-config-file-scan-dir', false) ?
             ('--with-config-file-scan-dir=' . $this->getOption('with-config-file-scan-dir') . ' ') : '';
-        $sysconfdir = $this->getOption('with-sysconfdir', false) ?
-            ('--sysconfdir=' . $this->getOption('with-sysconfdir') . ' ') : '';
 
         $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI;
         $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM;
@@ -101,7 +90,7 @@ 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!
@@ -127,7 +116,6 @@ class LinuxBuilder extends UnixBuilderBase
             ($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
             $config_file_path .
             $config_file_scan_dir .
-            $sysconfdir .
             $json_74 .
             $zts .
             $maxExecutionTimers .
@@ -137,40 +125,35 @@ class LinuxBuilder extends UnixBuilderBase
 
         $this->emitPatchPoint('before-php-make');
         SourcePatcher::patchBeforeMake($this);
-        PgoManager::patchBeforeMake($this);
 
         $this->cleanMake();
 
-        $pgo = $this->pgo;
-        $needsClean = false;
-        $sapiBuilds = [
-            ['cli', $enableCli, true, fn () => $this->buildCli()],
-            ['fpm', $enableFpm, true, fn () => $this->buildFpm()],
-            ['cgi', $enableCgi, true, fn () => $this->buildCgi()],
-            ['micro', $enableMicro, true, fn () => $this->buildMicro()],
-            ['embed', $enableEmbed, true, function () use ($enableMicro): void {
-                if ($enableMicro) {
-                    FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
-                }
-                $this->buildEmbed();
-            }],
-            // frankenphp doesn't rebuild php-src; xcaddy links against the deployed libphp.so
-            ['frankenphp', $enableFrankenphp, false, fn () => $this->buildFrankenphp()],
-        ];
-
-        foreach ($sapiBuilds as [$sapi, $enabled, $rebuildsPhpSrc, $build]) {
-            if (!$enabled) {
-                continue;
+        if ($enableCli) {
+            logger()->info('building cli');
+            $this->buildCli();
+        }
+        if ($enableFpm) {
+            logger()->info('building fpm');
+            $this->buildFpm();
+        }
+        if ($enableCgi) {
+            logger()->info('building cgi');
+            $this->buildCgi();
+        }
+        if ($enableMicro) {
+            logger()->info('building micro');
+            $this->buildMicro();
+        }
+        if ($enableEmbed) {
+            logger()->info('building embed');
+            if ($enableMicro) {
+                FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
             }
-            if ($pgo) {
-                if ($needsClean && $rebuildsPhpSrc) {
-                    $this->cleanMake();
-                }
-                $pgo->applyForSapi($sapi);
-                $needsClean = $needsClean || $rebuildsPhpSrc;
-            }
-            logger()->info('building ' . $sapi);
-            $build();
+            $this->buildEmbed();
+        }
+        if ($enableFrankenphp) {
+            logger()->info('building frankenphp');
+            $this->buildFrankenphp();
         }
         $shared_extensions = array_map('trim', array_filter(explode(',', $this->getOption('build-shared'))));
         if (!empty($shared_extensions)) {
@@ -178,7 +161,7 @@ class LinuxBuilder extends UnixBuilderBase
                 throw new WrongUsageException(
                     "You're building against musl libc statically (the default on Linux), but you're trying to build shared extensions.\n" .
                     'Static musl libc does not implement `dlopen`, so your php binary is not able to load shared extensions.' . "\n" .
-                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc` or use SPC_MUSL_DYNAMIC=true on alpine.'
+                    '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...');
@@ -211,7 +194,15 @@ class LinuxBuilder extends UnixBuilderBase
             SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src', true);
         }
 
-        $this->deploySAPIBinary(BUILD_TARGET_CLI);
+        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->deployBinary(BUILD_TARGET_CLI);
     }
 
     protected function buildCgi(): void
@@ -222,7 +213,15 @@ class LinuxBuilder extends UnixBuilderBase
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
             ->exec("make {$concurrency} {$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);
     }
 
     /**
@@ -233,33 +232,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);
+        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
 
-            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("make {$concurrency} {$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();
         }
     }
 
@@ -274,7 +269,14 @@ class LinuxBuilder extends UnixBuilderBase
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
             ->exec("make {$concurrency} {$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);
     }
 
     /**
@@ -282,19 +284,11 @@ class LinuxBuilder extends UnixBuilderBase
      */
     protected function buildEmbed(): void
     {
-        $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
-        if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
-            GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
-        }
         $sharedExts = array_filter($this->exts, static fn ($ext) => $ext->isBuildShared());
         $sharedExts = array_filter($sharedExts, static function ($ext) {
             return Config::getExt($ext->getName(), 'build-with-php') === true;
         });
         $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')
@@ -302,25 +296,72 @@ class LinuxBuilder extends UnixBuilderBase
             ->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");
 
-        // process libphp.so for shared embed
-        $libphpSo = BUILD_LIB_PATH . '/libphp.so';
-        $libphpSoDest = BUILD_LIB_PATH . '/libphp.so';
-        if (file_exists($libphpSo)) {
-            // deploy libphp.so
-            preg_match('/-release\s+(\S*)/', getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $matches);
-            if (!empty($matches[1])) {
-                $libphpSoDest = str_replace('.so', '-' . $matches[1] . '.so', $libphpSo);
+        $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();
+
+        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);
             }
-            $this->deployBinary($libphpSo, $libphpSoDest, false);
+            if (file_exists($libphpRelease)) {
+                chdir($libDir);
+                if (file_exists($libphpSo)) {
+                    unlink($libphpSo);
+                }
+                symlink($realLibName, 'libphp.so');
+                shell()->exec(sprintf(
+                    'patchelf --set-soname %s %s',
+                    escapeshellarg($realLibName),
+                    escapeshellarg($libphpRelease)
+                ));
+            }
+            if (is_dir($modulesDir)) {
+                chdir($modulesDir);
+                foreach ($this->getExts() as $ext) {
+                    if (!$ext->isBuildShared()) {
+                        continue;
+                    }
+                    $name = $ext->getName();
+                    $versioned = "{$name}-{$release}.so";
+                    $unversioned = "{$name}.so";
+                    $src = "{$modulesDir}/{$versioned}";
+                    $dst = "{$modulesDir}/{$unversioned}";
+                    if (is_file($src)) {
+                        rename($src, $dst);
+                        shell()->exec(sprintf(
+                            'patchelf --set-soname %s %s',
+                            escapeshellarg($unversioned),
+                            escapeshellarg($dst)
+                        ));
+                    }
+                }
+            }
+            chdir($cwd);
         }
 
-        // process shared extensions build-with-php
-        $increment_files = $diff->getChangedFiles();
-        foreach ($increment_files as $increment_file) {
-            $this->deployBinary($increment_file, $increment_file, false);
+        $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)
+                    ));
+                }
+            }
         }
 
-        // 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');
@@ -328,7 +369,9 @@ class LinuxBuilder extends UnixBuilderBase
             SystemUtil::exportDynamicSymbols(BUILD_LIB_PATH . '/libphp.a');
         }
 
-        // patch embed php scripts
+        if (!$this->getOption('no-strip', false) && file_exists(BUILD_LIB_PATH . '/' . $realLibName)) {
+            shell()->cd(BUILD_LIB_PATH)->exec("strip --strip-unneeded {$realLibName}");
+        }
         $this->patchPhpScripts();
     }
 
@@ -337,45 +380,41 @@ class LinuxBuilder extends UnixBuilderBase
      */
     private function getMakeExtraVars(): array
     {
-        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true, 'absolute_libs' => true]))->config(array_keys($this->getExts(false)), [], $this->getOption('with-suggested-exts'), $this->lib_list);
+        $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;
-        $extra_ldflags = (string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS');
-        if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared'
-            && !str_contains($extra_ldflags, '-avoid-version')
-            && !preg_match('/-release\s+\S+/', $extra_ldflags)) {
-            $extra_ldflags = trim($extra_ldflags . ' -avoid-version -module');
-        }
-        $extra_ldflags_program = trim("-L{$lib} {$static} -pie " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM'));
         return array_filter([
             'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             'EXTRA_LIBS' => $config['libs'],
-            'EXTRA_LDFLAGS' => $extra_ldflags,
-            'EXTRA_LDFLAGS_PROGRAM' => $extra_ldflags_program,
+            'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
+            'EXTRA_LDFLAGS_PROGRAM' => "-L{$lib} {$static} -pie",
         ]);
     }
 
     /**
-     * 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
+     * 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 processUpxedMicroSfx(string $dst): void
+    private function processMicroUPX(): void
     {
-        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');
+        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/library/icu.php

@@ -15,11 +15,9 @@ class icu extends LinuxLibraryBase
 
     protected function build(): void
     {
-        $userCxxFlags = trim((string) getenv('SPC_DEFAULT_CXX_FLAGS'));
-        $userLdFlags = trim((string) getenv('SPC_DEFAULT_LD_FLAGS'));
         $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1 -DPIC -fPIC"';
-        $cxxflags = "CXXFLAGS=\"-std=c++17 -DPIC -fPIC -fno-ident {$userCxxFlags}\"";
-        $ldflags = SPCTarget::isStatic() ? "LDFLAGS=\"-static {$userLdFlags}\"" : "LDFLAGS=\"{$userLdFlags}\"";
+        $cxxflags = 'CXXFLAGS="-std=c++17 -DPIC -fPIC -fno-ident"';
+        $ldflags = SPCTarget::isStatic() ? 'LDFLAGS="-static"' : '';
         shell()->cd($this->source_dir . '/source')->initializeEnv($this)
             ->exec(
                 "{$cppflags} {$cxxflags} {$ldflags} " .

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/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/libmpdec.php

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

src/SPC/builder/linux/library/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/liburing.php

@@ -6,8 +6,6 @@ namespace SPC\builder\linux\library;
 
 use SPC\builder\linux\SystemUtil;
 use SPC\store\FileSystem;
-use SPC\toolchain\GccNativeToolchain;
-use SPC\toolchain\ToolchainManager;
 use SPC\util\executor\UnixAutoconfExecutor;
 use SPC\util\SPCTarget;
 
@@ -17,19 +15,26 @@ class liburing extends LinuxLibraryBase
 
     public function patchBeforeBuild(): bool
     {
-        if (SystemUtil::isMuslDist()) {
-            FileSystem::replaceFileStr($this->source_dir . '/configure', 'realpath -s', 'realpath');
-            return true;
+        if (!SystemUtil::isMuslDist()) {
+            return false;
         }
-        return false;
+        FileSystem::replaceFileStr($this->source_dir . '/configure', 'realpath -s', 'realpath');
+        return true;
     }
 
     protected function build(): void
     {
-        $use_libc = ToolchainManager::getToolchainClass() !== GccNativeToolchain::class || version_compare(SPCTarget::getLibcVersion(), '2.30', '>=');
+        $use_libc = SPCTarget::getLibc() !== 'glibc' || version_compare(SPCTarget::getLibcVersion(), '2.30', '>=');
         $make = UnixAutoconfExecutor::create($this);
 
-        if ($use_libc) {
+        if (!$use_libc) {
+            $make->appendEnv([
+                'CC' => 'gcc', // libc-less version fails to compile with clang or zig
+                'CXX' => 'g++',
+                'AR' => 'ar',
+                'LD' => 'ld',
+            ]);
+        } else {
             $make->appendEnv([
                 'CFLAGS' => '-D_GNU_SOURCE',
             ]);
@@ -46,7 +51,7 @@ class liburing extends LinuxLibraryBase
                 $use_libc ? '--use-libc' : '',
             )
             ->configure()
-            ->make('library ENABLE_SHARED=0', 'install ENABLE_SHARED=0', with_clean: false);
+            ->make('library', 'install ENABLE_SHARED=0', with_clean: false);
 
         $this->patchPkgconfPrefix();
     }

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

@@ -21,7 +21,6 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
-use SPC\builder\linux\SystemUtil;
 use SPC\store\FileSystem;
 
 class openssl extends LinuxLibraryBase
@@ -52,28 +51,18 @@ class openssl extends LinuxLibraryBase
             $zlib_extra = '';
         }
 
-        $openssl_dir = getenv('OPENSSLDIR') ?: null;
-        // TODO: in v3 use the following: $openssl_dir ??= SystemUtil::getOSRelease()['dist'] === 'redhat' ? '/etc/pki/tls' : '/etc/ssl';
-        $openssl_dir ??= '/etc/ssl';
         $ex_lib = trim($ex_lib);
 
-        // OpenSSL's Configure ignores env CFLAGS for its target template; pass our flags as extra args after the target.
-        $userCFlags = trim((string) getenv('SPC_DEFAULT_C_FLAGS'));
-        $userLdFlags = trim((string) getenv('SPC_DEFAULT_LD_FLAGS'));
-        $userExtraFlags = trim($userCFlags . ' ' . $userLdFlags);
-
         shell()->cd($this->source_dir)->initializeEnv($this)
             ->exec(
                 "{$env} ./Configure no-shared {$extra} " .
                 '--prefix=' . BUILD_ROOT_PATH . ' ' .
                 '--libdir=' . BUILD_LIB_PATH . ' ' .
-                "--openssldir={$openssl_dir} " .
+                '--openssldir=/etc/ssl ' .
                 "{$zlib_extra}" .
                 'enable-pie ' .
                 'no-legacy ' .
-                'no-tests ' .
-                "linux-{$arch} " .
-                $userExtraFlags
+                "linux-{$arch}"
             )
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")

src/SPC/builder/macos/MacOSBuilder.php

@@ -8,7 +8,6 @@ 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;
@@ -96,8 +95,6 @@ class MacOSBuilder extends UnixBuilderBase
             ('--with-config-file-path=' . $this->getOption('with-config-file-path') . ' ') : '';
         $config_file_scan_dir = $this->getOption('with-config-file-scan-dir', false) ?
             ('--with-config-file-scan-dir=' . $this->getOption('with-config-file-scan-dir') . ' ') : '';
-        $sysconfdir = $this->getOption('with-sysconfdir', false) ?
-            ('--sysconfdir=' . $this->getOption('with-sysconfdir') . ' ') : '';
 
         $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI;
         $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM;
@@ -108,7 +105,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,
         ]);
@@ -131,7 +128,6 @@ class MacOSBuilder extends UnixBuilderBase
                 ($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
                 $config_file_path .
                 $config_file_scan_dir .
-                $sysconfdir .
                 $json_74 .
                 $zts .
                 $this->makeStaticExtensionArgs() . ' ' .
@@ -193,7 +189,10 @@ class MacOSBuilder extends UnixBuilderBase
         $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);
+        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
@@ -203,7 +202,10 @@ class MacOSBuilder extends UnixBuilderBase
         $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);
+        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);
     }
 
     /**
@@ -214,30 +216,31 @@ 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
+        $concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
+        $shell->exec("make {$concurrency} {$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();
         }
     }
 
@@ -251,7 +254,10 @@ class MacOSBuilder extends UnixBuilderBase
         $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);
+        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);
     }
 
     /**
@@ -266,25 +272,9 @@ class MacOSBuilder extends UnixBuilderBase
         $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);
-        }
-
         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');
@@ -296,7 +286,7 @@ class MacOSBuilder extends UnixBuilderBase
 
     private function getMakeExtraVars(): array
     {
-        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true]))->config(array_keys($this->getExts(false)), [], $this->getOption('with-suggested-exts'), $this->lib_list);
+        $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([
             'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             'EXTRA_LDFLAGS_PROGRAM' => '-L' . BUILD_LIB_PATH,

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/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/libmpdec.php

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

src/SPC/builder/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/traits/UnixLibraryTrait.php

@@ -34,7 +34,7 @@ trait UnixLibraryTrait
             $files = array_map(fn ($x) => "{$x}.pc", $conf_pc);
         }
         foreach ($files as $name) {
-            $realpath = realpath(BUILD_LIB_PATH . '/pkgconfig/' . $name);
+            $realpath = realpath(BUILD_ROOT_PATH . '/lib/pkgconfig/' . $name);
             if ($realpath === false) {
                 throw new PatchException('pkg-config prefix patcher', 'Cannot find library [' . static::NAME . '] pkgconfig file [' . $name . '] in ' . BUILD_LIB_PATH . '/pkgconfig/ !');
             }

src/SPC/builder/traits/UnixSystemUtilTrait.php

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

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,91 +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}");
-        }
-
-        if (!$this->getOption('no-strip') && !$this->getOption('pgi') && !$this->getOption('cs-pgi')) {
-            // extract debug info
-            $this->extractDebugInfo($dst);
-            // extra 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.
      */
@@ -229,16 +142,14 @@ abstract class UnixBuilderBase extends BuilderBase
             copy(ROOT_DIR . '/src/globals/common-tests/embed.c', $sample_file_path . '/embed.c');
             copy(ROOT_DIR . '/src/globals/common-tests/embed.php', $sample_file_path . '/embed.php');
             $util = new SPCConfigUtil($this);
-            $config = $util->config(array_keys($this->getExts(false)), [], $this->getOption('with-suggested-exts'), $this->lib_list);
+            $config = $util->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
             $lens = "{$config['cflags']} {$config['ldflags']} {$config['libs']}";
             if (SPCTarget::isStatic()) {
                 $lens .= ' -static';
             }
             $dynamic_exports = '';
-            $embedType = 'static';
             // if someone changed to EMBED_TYPE=shared, we need to add LD_LIBRARY_PATH
             if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
-                $embedType = 'shared';
                 if (PHP_OS_FAMILY === 'Darwin') {
                     $ext_path = 'DYLD_LIBRARY_PATH=' . BUILD_LIB_PATH . ':$DYLD_LIBRARY_PATH ';
                 } else {
@@ -257,19 +168,18 @@ abstract class UnixBuilderBase extends BuilderBase
                 }
             }
             $cc = getenv('CC');
-
             [$ret, $out] = shell()->cd($sample_file_path)->execWithResult("{$cc} -o embed embed.c {$lens} {$dynamic_exports}");
             if ($ret !== 0) {
                 throw new ValidationException(
-                    'embed failed to build. Error message: ' . implode("\n", $out),
-                    validation_module: $embedType . ' libphp embed build sanity check'
+                    'embed failed sanity check: build failed. Error message: ' . implode("\n", $out),
+                    validation_module: 'static libphp.a sanity check'
                 );
             }
             [$ret, $output] = shell()->cd($sample_file_path)->execWithResult($ext_path . './embed');
             if ($ret !== 0 || trim(implode('', $output)) !== 'hello') {
                 throw new ValidationException(
-                    'embed failed to run. Error message: ' . implode("\n", $output),
-                    validation_module: $embedType . ' libphp embed run sanity check'
+                    'embed failed sanity check: run failed. Error message: ' . implode("\n", $output),
+                    validation_module: 'static libphp.a sanity check'
                 );
             }
         }
@@ -298,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;
     }
 
     /**
@@ -352,76 +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) {
-            $frankenphpAppPath = trim($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') {
@@ -431,6 +290,7 @@ abstract class UnixBuilderBase extends BuilderBase
                 $dynamic_exports = ' ' . $dynamicSymbolsArgument;
             }
         }
+        $debugFlags = $this->getOption('no-strip') ? '-w -s ' : '';
         $extLdFlags = "-extldflags '-pie{$dynamic_exports} {$this->arch_ld_flags}'";
         $muslTags = '';
         $staticFlags = '';
@@ -440,8 +300,8 @@ abstract class UnixBuilderBase extends BuilderBase
             $staticFlags = '-static-pie';
         }
 
-        $config = (new SPCConfigUtil($this))->config(array_keys($this->getExts(false)), [], false, $this->lib_list);
-        $cflags = "{$this->arch_c_flags} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -DFRANKENPHP_VERSION=' . $frankenPhpVersion;
+        $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');
         $libs = $config['libs'];
         // 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') ||
@@ -450,26 +310,28 @@ abstract class UnixBuilderBase extends BuilderBase
             $cflags .= ' -Wno-error=missing-profile';
             $libs .= ' -lgcov';
         }
-        $extraLdProgram = (string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM');
         $env = [...[
             'CGO_ENABLED' => '1',
             'CGO_CFLAGS' => clean_spaces($cflags),
-            'CGO_LDFLAGS' => trim("{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs} {$extraLdProgram}"),
+            'CGO_LDFLAGS' => "{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs}",
             'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
-                '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' .
-                '-X \'github.com/caddyserver/caddy/v2/modules/caddyhttp.ServerHeader=FrankenPHP Caddy\' ' .
-                '-X \'github.com/caddyserver/caddy/v2.CustomBinaryName=frankenphp\' ' .
+                '-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}",
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ], ...GoXcaddy::getEnvironment()];
-        $pgo = file_exists("{$frankenphpSourceDir}/caddy/frankenphp/default.pgo") ? "--pgo {$frankenphpSourceDir}/caddy/frankenphp/default.pgo " : '';
         shell()->cd(BUILD_BIN_PATH)
             ->setEnv($env)
-            ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddyModules}");
+            ->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/bzip2.php

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

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

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\store\FileSystem;
 use SPC\util\executor\UnixCMakeExecutor;
 
 trait curl
@@ -24,26 +23,15 @@ 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',
                 '-DBUILD_LIBCURL_DOCS=OFF',
-                '-DOPENSSL_ROOT_DIR=' . BUILD_ROOT_PATH,
             )
             ->build();
 
+        // patch pkgconf
         $this->patchPkgconfPrefix(['libcurl.pc']);
-        // On glibc <2.28 without built-in pthreads, FindThreads sets
-        // INTERFACE_LINK_LIBRARIES to '-lpthread'
-        // curls .pc generator walks and prepends '-l' to each
-        // entry, resulting in -l-lpthread
-        FileSystem::replaceFileRegex(
-            BUILD_LIB_PATH . '/pkgconfig/libcurl.pc',
-            '/-l(-l\S+)/',
-            '$1'
-        );
         shell()->cd(BUILD_LIB_PATH . '/cmake/CURL/')
             ->exec("sed -ie 's|\"/lib/libcurl.a\"|\"" . BUILD_LIB_PATH . "/libcurl.a\"|g' CURLTargets-release.cmake");
     }

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

@@ -10,9 +10,8 @@ trait fastlz
 {
     protected function build(): void
     {
-        $extra = trim((string) getenv('SPC_DEFAULT_C_FLAGS'));
         shell()->cd($this->source_dir)->initializeEnv($this)
-            ->exec((getenv('CC') ?: 'cc') . " -c {$extra} fastlz.c -o fastlz.o")
+            ->exec((getenv('CC') ?: 'cc') . ' -c -O3 -fPIC fastlz.c -o fastlz.o')
             ->exec((getenv('AR') ?: 'ar') . ' rcs libfastlz.a fastlz.o');
 
         if (!copy($this->source_dir . '/fastlz.h', BUILD_INCLUDE_PATH . '/fastlz.h')) {

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

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

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

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

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

@@ -10,14 +10,7 @@ trait gmp
 {
     protected function build(): void
     {
-        UnixAutoconfExecutor::create($this)
-            ->appendEnv([
-                'CFLAGS' => '-std=c17',
-            ])
-            ->configure(
-                '--enable-fat'
-            )
-            ->make();
+        UnixAutoconfExecutor::create($this)->configure()->make();
         $this->patchPkgconfPrefix(['gmp.pc']);
     }
 }

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

@@ -34,9 +34,6 @@ trait imagemagick
             ->addConfigureArgs(
                 '--disable-openmp',
                 '--without-x',
-                // implicit --with-gcc-arch
-                // bleeds host cpu features into built binaries
-                '--without-gcc-arch',
             );
 
         // special: linux-static target needs `-static`

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

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

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

@@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\toolchain\ToolchainManager;
-use SPC\toolchain\ZigToolchain;
-use SPC\util\executor\UnixAutoconfExecutor;
-use SPC\util\SPCConfigUtil;
-
-trait krb5
-{
-    protected function build(): void
-    {
-        $origin_source_dir = $this->source_dir;
-        $this->source_dir .= '/src';
-        shell()->cd($this->source_dir)->exec('ls -lah');
-        if (!file_exists($this->source_dir . '/configure')) {
-            shell()->cd($this->source_dir)->exec('autoreconf -if');
-        }
-        $libs = array_map(fn ($x) => $x->getName(), $this->getDependencies(true));
-        $spc = new SPCConfigUtil($this->builder, ['no_php' => true, 'libs_only_deps' => true]);
-        $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));
-        $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';
-        }
-        $make = UnixAutoconfExecutor::create($this)
-            ->appendEnv($extraEnv)
-            ->optionalLib('ldap', '--with-ldap', '--without-ldap')
-            ->optionalLib('libedit', '--with-libedit', '--without-libedit')
-            ->configure(...$args);
-
-        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $make->exec('find . -name Makefile -exec sed -i "s/-Werror=incompatible-pointer-types//g" {} +');
-        }
-        $make->make();
-        $this->patchPkgconfPrefix([
-            'krb5-gssapi.pc',
-            'krb5.pc',
-            '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/libaom.php

@@ -4,11 +4,9 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\builder\linux\SystemUtil;
 use SPC\toolchain\ToolchainManager;
 use SPC\toolchain\ZigToolchain;
 use SPC\util\executor\UnixCMakeExecutor;
-use SPC\util\SPCTarget;
 
 trait libaom
 {
@@ -19,23 +17,9 @@ trait libaom
             $new = trim($extra . ' -D_GNU_SOURCE');
             f_putenv("SPC_COMPILER_EXTRA={$new}");
         }
-        $targetCpu = SPCTarget::getTargetArch();
-        if (str_starts_with($targetCpu, 'aarch')) {
-            $targetCpu = str_replace('aarch', 'arm', $targetCpu);
-        }
-        if (!SystemUtil::findCommand('nasm') && !SystemUtil::findCommand('yasm')) {
-            $targetCpu = 'generic';
-        }
         UnixCMakeExecutor::create($this)
             ->setBuildDir("{$this->source_dir}/builddir")
-            ->addConfigureArgs(
-                "-DAOM_TARGET_CPU={$targetCpu}",
-                '-DCONFIG_RUNTIME_CPU_DETECT=1',
-                '-DENABLE_EXAMPLES=0',
-                '-DENABLE_TOOLS=0',
-                '-DENABLE_TESTS=0',
-                '-DENABLE_DOCS=0'
-            )
+            ->addConfigureArgs('-DAOM_TARGET_CPU=generic')
             ->build();
         f_putenv("SPC_COMPILER_EXTRA={$extra}");
         $this->patchPkgconfPrefix(['aom.pc']);

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

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

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

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

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

@@ -11,28 +11,15 @@ trait libheif
 {
     public function patchBeforeBuild(): bool
     {
-        $patched = false;
         if (!str_contains(file_get_contents($this->source_dir . '/CMakeLists.txt'), 'libbrotlienc')) {
             FileSystem::replaceFileStr(
                 $this->source_dir . '/CMakeLists.txt',
                 'list(APPEND REQUIRES_PRIVATE "libbrotlidec")',
                 'list(APPEND REQUIRES_PRIVATE "libbrotlidec")' . "\n" . '        list(APPEND REQUIRES_PRIVATE "libbrotlienc")'
             );
-            $patched = true;
+            return true;
         }
-        // libheif 1.22+ ships a C-incompatible header: `struct heif_bad_pixel`
-        $heif_properties = $this->source_dir . '/libheif/api/libheif/heif_properties.h';
-        if (file_exists($heif_properties)
-            && str_contains(file_get_contents($heif_properties), 'struct heif_bad_pixel { uint32_t row; uint32_t column; };')
-        ) {
-            FileSystem::replaceFileStr(
-                $heif_properties,
-                'struct heif_bad_pixel { uint32_t row; uint32_t column; };',
-                'typedef struct heif_bad_pixel { uint32_t row; uint32_t column; } heif_bad_pixel;'
-            );
-            $patched = true;
-        }
-        return $patched;
+        return false;
     }
 
     protected function build(): void

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

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

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

@@ -29,17 +29,13 @@ trait libjxl
             );
 
         if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            $cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
-            $has_avx512 = str_contains($cflags, '-mavx512') || str_contains($cflags, '-march=x86-64-v4');
-            if (!$has_avx512) {
-                $cmake->addConfigureArgs(
-                    '-DCXX_MAVX512F_SUPPORTED:BOOL=FALSE',
-                    '-DCXX_MAVX512DQ_SUPPORTED:BOOL=FALSE',
-                    '-DCXX_MAVX512CD_SUPPORTED:BOOL=FALSE',
-                    '-DCXX_MAVX512BW_SUPPORTED:BOOL=FALSE',
-                    '-DCXX_MAVX512VL_SUPPORTED:BOOL=FALSE'
-                );
-            }
+            $cmake->addConfigureArgs(
+                '-DCXX_MAVX512F_SUPPORTED:BOOL=FALSE',
+                '-DCXX_MAVX512DQ_SUPPORTED:BOOL=FALSE',
+                '-DCXX_MAVX512CD_SUPPORTED:BOOL=FALSE',
+                '-DCXX_MAVX512BW_SUPPORTED:BOOL=FALSE',
+                '-DCXX_MAVX512VL_SUPPORTED:BOOL=FALSE'
+            );
         }
 
         $cmake->build();

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

@@ -12,13 +12,6 @@ trait liblz4
     {
         // disable executables
         FileSystem::replaceFileStr($this->source_dir . '/programs/Makefile', 'install: lz4', "install: lz4\n\ninstallewfwef: lz4");
-        // zig-cc / clang -flto -c with multiple input files only produces an .o for the first source,
-        // leaving liblz4.a with just lz4.o. Compile sources individually so all .o files exist.
-        FileSystem::replaceFileStr(
-            $this->source_dir . '/lib/Makefile',
-            "liblz4.a: \$(SRCFILES)\nifeq (\$(BUILD_STATIC),yes)  # can be disabled on command line\n\t@echo compiling static library\n\t\$(COMPILE.c) \$^\n\t\$(AR) rcs \$@ *.o\nendif",
-            "liblz4.a: \$(SRCFILES:.c=.o)\nifeq (\$(BUILD_STATIC),yes)  # can be disabled on command line\n\t@echo compiling static library\n\t\$(AR) rcs \$@ \$^\nendif"
-        );
         return true;
     }
 
@@ -35,7 +28,7 @@ trait liblz4
 
         $this->patchPkgconfPrefix(['liblz4.pc']);
 
-        foreach (FileSystem::scanDirFiles(BUILD_LIB_PATH . '/', false, true) as $filename) {
+        foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
             if (str_starts_with($filename, 'liblz4') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) {
                 unlink(BUILD_ROOT_PATH . '/lib/' . $filename);
             }

src/SPC/builder/unix/library/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/libmpdec.php

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

src/SPC/builder/unix/library/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/libwebp.php

@@ -10,26 +10,8 @@ trait libwebp
 {
     protected function build(): void
     {
-        $code = '#include <immintrin.h>
-int main() { return _mm256_cvtsi256_si32(_mm256_setzero_si256()); }';
-        $cc = getenv('CC') ?: 'gcc';
-        [$ret] = shell()->execWithResult("printf '%s' '{$code}' | {$cc} -x c -mavx2 -o /dev/null - 2>&1");
-        $disableAvx2 = $ret !== 0 && GNU_ARCH === 'x86_64' && PHP_OS_FAMILY === 'Linux';
-
         UnixCMakeExecutor::create($this)
-            ->addConfigureArgs(
-                '-DWEBP_BUILD_EXTRAS=OFF',
-                '-DWEBP_BUILD_ANIM_UTILS=OFF',
-                '-DWEBP_BUILD_CWEBP=OFF',
-                '-DWEBP_BUILD_DWEBP=OFF',
-                '-DWEBP_BUILD_GIF2WEBP=OFF',
-                '-DWEBP_BUILD_IMG2WEBP=OFF',
-                '-DWEBP_BUILD_VWEBP=OFF',
-                '-DWEBP_BUILD_WEBPINFO=OFF',
-                '-DWEBP_BUILD_WEBPMUX=OFF',
-                '-DWEBP_BUILD_FUZZTEST=OFF',
-                $disableAvx2 ? '-DWEBP_ENABLE_SIMD=OFF' : ''
-            )
+            ->addConfigureArgs('-DWEBP_BUILD_EXTRAS=ON')
             ->build();
         // patch pkgconfig
         $this->patchPkgconfPrefix(patch_option: PKGCONF_PATCH_PREFIX | PKGCONF_PATCH_LIBDIR);

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

@@ -10,29 +10,12 @@ use SPC\util\SPCTarget;
 
 trait ncurses
 {
-    public function patchBeforeBuild(): bool
-    {
-        // MKlib_gen.sh feeds preprocessor stdout through a sed/awk pipeline into lib_gen.c.
-        // zig-cc/clang leaks the "N warning(s) generated." summary onto stdout (not stderr),
-        // and that line ends up as invalid C in the generated source. Filter it out of the pipe.
-        $mklibGen = $this->source_dir . '/ncurses/base/MKlib_gen.sh';
-        if (!str_contains((string) file_get_contents($mklibGen), "| grep -v ' generated")) {
-            FileSystem::replaceFileStr(
-                $mklibGen,
-                '$preprocessor $TMP 2>/dev/null \\',
-                "\$preprocessor \$TMP 2>/dev/null \\\n| grep -v ' generated\\.\$' \\",
-            );
-        }
-        return true;
-    }
-
     protected function build(): void
     {
         $filelist = FileSystem::scanDirFiles(BUILD_BIN_PATH, relative: true);
 
         UnixAutoconfExecutor::create($this)
             ->appendEnv([
-                'CFLAGS' => '-std=c17 -w',
                 'LDFLAGS' => SPCTarget::isStatic() ? '-static' : '',
             ])
             ->configure(
@@ -46,7 +29,7 @@ trait ncurses
                 '--without-tests',
                 '--without-dlsym',
                 '--without-debug',
-                '--enable-symlinks',
+                '-enable-symlinks',
                 "--bindir={$this->getBinDir()}",
                 "--includedir={$this->getIncludeDir()}",
                 "--libdir={$this->getLibDir()}",

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

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

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

@@ -14,8 +14,6 @@ trait qdbm
     {
         $ac = UnixAutoconfExecutor::create($this)->configure();
         FileSystem::replaceFileRegex($this->source_dir . '/Makefile', '/MYLIBS = libqdbm.a.*/m', 'MYLIBS = libqdbm.a');
-        $extra = trim((string) getenv('SPC_DEFAULT_C_FLAGS'));
-        FileSystem::replaceFileRegex($this->source_dir . '/Makefile', '/^CFLAGS = .*$/m', "CFLAGS = -Wall {$extra}");
         $ac->make($this instanceof MacOSLibraryBase ? 'mac' : '');
         $this->patchPkgconfPrefix(['qdbm.pc']);
     }

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

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace SPC\builder\unix\library;
 
 use SPC\exception\WrongUsageException;
-use SPC\store\FileSystem;
 use SPC\util\executor\UnixAutoconfExecutor;
 
 trait unixodbc
@@ -21,15 +20,7 @@ trait unixodbc
             'Linux' => '/etc',
             default => throw new WrongUsageException('Unsupported OS: ' . PHP_OS_FAMILY),
         };
-        // libltdl is incompatible with -flto (https://bugs.gentoo.org/532672)
-        $stripLto = static fn ($s) => preg_replace('/(^|\s)-flto(=\S+)?(?=\s|$)/', ' ', (string) $s);
-        $origC = $this->builder->arch_c_flags;
-        $origCxx = $this->builder->arch_cxx_flags;
-        $origLd = $this->builder->arch_ld_flags;
-        $this->builder->arch_c_flags = clean_spaces($stripLto($origC));
-        $this->builder->arch_cxx_flags = clean_spaces($stripLto($origCxx));
-        $this->builder->arch_ld_flags = clean_spaces($stripLto($origLd));
-        $make = UnixAutoconfExecutor::create($this)
+        UnixAutoconfExecutor::create($this)
             ->configure(
                 '--disable-debug',
                 '--disable-dependency-tracking',
@@ -37,27 +28,9 @@ trait unixodbc
                 '--with-included-ltdl',
                 "--sysconfdir={$sysconf_selector}",
                 '--enable-gui=no',
-            );
-
-        file_put_contents(
-            "{$this->source_dir}/exe/Makefile",
-            ".PHONY: all install clean check distclean install-strip\nall install clean check distclean install-strip:\n\t@true\n",
-        );
-
-        $make->make();
-        $this->builder->arch_c_flags = $origC;
-        $this->builder->arch_cxx_flags = $origCxx;
-        $this->builder->arch_ld_flags = $origLd;
-
-        $pkgConfigs = ['odbc.pc', 'odbccr.pc', 'odbcinst.pc'];
-        $this->patchPkgconfPrefix($pkgConfigs);
-        foreach ($pkgConfigs as $file) {
-            FileSystem::replaceFileStr(
-                BUILD_LIB_PATH . "/pkgconfig/{$file}",
-                '$(top_build_prefix)libltdl/libltdlc.la',
-                ''
-            );
-        }
+            )
+            ->make();
+        $this->patchPkgconfPrefix(['odbc.pc', 'odbccr.pc', 'odbcinst.pc']);
         $this->patchLaDependencyPrefix();
     }
 }

src/SPC/builder/windows/WindowsBuilder.php

@@ -67,6 +67,21 @@ class WindowsBuilder extends BuilderBase
 
         $zts = $this->zts ? '--enable-zts=yes ' : '--enable-zts=no ';
 
+        // with-upx-pack for phpmicro
+        if ($enableMicro && version_compare($this->getMicroVersion(), '0.2.0') < 0) {
+            $makefile = FileSystem::convertPath(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.w32');
+            if ($this->getOption('with-upx-pack', false)) {
+                if (!file_exists($makefile . '.originfile')) {
+                    copy($makefile, $makefile . '.originfile');
+                    FileSystem::replaceFileStr($makefile, '$(MICRO_SFX):', '_MICRO_UPX = ' . getenv('UPX_EXEC') . " --best $(MICRO_SFX)\n$(MICRO_SFX):");
+                    FileSystem::replaceFileStr($makefile, '@$(_MICRO_MT)', "@$(_MICRO_MT)\n\t@$(_MICRO_UPX)");
+                }
+            } elseif (file_exists($makefile . '.originfile')) {
+                copy($makefile . '.originfile', $makefile);
+                unlink($makefile . '.originfile');
+            }
+        }
+
         $opcache_jit = !$this->getOption('disable-opcache-jit', false);
         $opcache_jit_arg = $opcache_jit ? '--enable-opcache-jit=yes ' : '--enable-opcache-jit=no ';
 
@@ -130,7 +145,7 @@ class WindowsBuilder extends BuilderBase
         }
     }
 
-    public function testPHP(int $build_target = BUILD_TARGET_NONE): void
+    public function testPHP(int $build_target = BUILD_TARGET_NONE)
     {
         $this->sanityCheck($build_target);
     }
@@ -141,27 +156,12 @@ class WindowsBuilder extends BuilderBase
 
         $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
 
-        // Add debug symbols for release build if --no-strip is specified
-        // We need to modify CFLAGS to replace /Ox with /Zi and add /DEBUG to LDFLAGS
-        $debug_overrides = '';
-        if ($this->getOption('no-strip', false)) {
-            // Read current CFLAGS from Makefile and replace optimization flags
-            $makefile_content = file_get_contents(SOURCE_PATH . '\php-src\Makefile');
-            if (preg_match('/^CFLAGS=(.+?)$/m', $makefile_content, $matches)) {
-                $cflags = $matches[1];
-                // Replace /Ox (full optimization) with /Zi (debug info) and /Od (disable optimization)
-                // Keep optimization for speed: /O2 /Zi instead of /Od /Zi
-                $cflags = str_replace('/Ox ', '/O2 /Zi ', $cflags);
-                $debug_overrides = '"CFLAGS=' . $cflags . '" "LDFLAGS=/DEBUG /LTCG /INCREMENTAL:NO" "LDFLAGS_CLI=/DEBUG" ';
-            }
-        }
-
         // add nmake wrapper
-        FileSystem::writeFile(SOURCE_PATH . '\php-src\nmake_cli_wrapper.bat', "nmake /nologo {$debug_overrides}LIBS_CLI=\"ws2_32.lib shell32.lib {$extra_libs}\" EXTRA_LD_FLAGS_PROGRAM= %*");
+        FileSystem::writeFile(SOURCE_PATH . '\php-src\nmake_cli_wrapper.bat', "nmake /nologo LIBS_CLI=\"ws2_32.lib shell32.lib {$extra_libs}\" EXTRA_LD_FLAGS_PROGRAM= %*");
 
         cmd()->cd(SOURCE_PATH . '\php-src')->exec("{$this->sdk_prefix} nmake_cli_wrapper.bat --task-args php.exe");
 
-        $this->deploySAPIBinary(BUILD_TARGET_CLI);
+        $this->deployBinary(BUILD_TARGET_CLI);
     }
 
     public function buildCgi(): void
@@ -170,23 +170,12 @@ class WindowsBuilder extends BuilderBase
 
         $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
 
-        // Add debug symbols for release build if --no-strip is specified
-        $debug_overrides = '';
-        if ($this->getOption('no-strip', false)) {
-            $makefile_content = file_get_contents(SOURCE_PATH . '\php-src\Makefile');
-            if (preg_match('/^CFLAGS=(.+?)$/m', $makefile_content, $matches)) {
-                $cflags = $matches[1];
-                $cflags = str_replace('/Ox ', '/O2 /Zi ', $cflags);
-                $debug_overrides = '"CFLAGS=' . $cflags . '" "LDFLAGS=/DEBUG /LTCG /INCREMENTAL:NO" "LDFLAGS_CGI=/DEBUG" ';
-            }
-        }
-
         // add nmake wrapper
-        FileSystem::writeFile(SOURCE_PATH . '\php-src\nmake_cgi_wrapper.bat', "nmake /nologo {$debug_overrides}LIBS_CGI=\"ws2_32.lib kernel32.lib advapi32.lib {$extra_libs}\" EXTRA_LD_FLAGS_PROGRAM= %*");
+        FileSystem::writeFile(SOURCE_PATH . '\php-src\nmake_cgi_wrapper.bat', "nmake /nologo LIBS_CGI=\"ws2_32.lib kernel32.lib advapi32.lib {$extra_libs}\" EXTRA_LD_FLAGS_PROGRAM= %*");
 
         cmd()->cd(SOURCE_PATH . '\php-src')->exec("{$this->sdk_prefix} nmake_cgi_wrapper.bat --task-args php-cgi.exe");
 
-        $this->deploySAPIBinary(BUILD_TARGET_CGI);
+        $this->deployBinary(BUILD_TARGET_CGI);
     }
 
     public function buildEmbed(): void
@@ -213,20 +202,9 @@ class WindowsBuilder extends BuilderBase
 
         $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
 
-        // Add debug symbols for release build if --no-strip is specified
-        $debug_overrides = '';
-        if ($this->getOption('no-strip', false) && !$this->getOption('debug', false)) {
-            $makefile_content = file_get_contents(SOURCE_PATH . '\php-src\Makefile');
-            if (preg_match('/^CFLAGS=(.+?)$/m', $makefile_content, $matches)) {
-                $cflags = $matches[1];
-                $cflags = str_replace('/Ox ', '/O2 /Zi ', $cflags);
-                $debug_overrides = '"CFLAGS=' . $cflags . '" "LDFLAGS=/DEBUG /LTCG /INCREMENTAL:NO" "LDFLAGS_MICRO=/DEBUG" ';
-            }
-        }
-
         // add nmake wrapper
         $fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' /DPHP_MICRO_FAKE_CLI" ' : '';
-        $wrapper = "nmake /nologo {$debug_overrides}LIBS_MICRO=\"ws2_32.lib shell32.lib {$extra_libs}\" CFLAGS_MICRO=\"/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1{$fake_cli}\" %*";
+        $wrapper = "nmake /nologo LIBS_MICRO=\"ws2_32.lib shell32.lib {$extra_libs}\" CFLAGS_MICRO=\"/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1{$fake_cli}\" %*";
         FileSystem::writeFile(SOURCE_PATH . '\php-src\nmake_micro_wrapper.bat', $wrapper);
 
         // phar patch for micro
@@ -243,7 +221,7 @@ class WindowsBuilder extends BuilderBase
             }
         }
 
-        $this->deploySAPIBinary(BUILD_TARGET_MICRO);
+        $this->deployBinary(BUILD_TARGET_MICRO);
     }
 
     public function proveLibs(array $sorted_libraries): void
@@ -357,53 +335,28 @@ class WindowsBuilder extends BuilderBase
      *
      * @param int $type Deploy type
      */
-    public function deploySAPIBinary(int $type): void
+    public function deployBinary(int $type): bool
     {
-        logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');
-
-        $debug_dir = BUILD_ROOT_PATH . '\debug';
-        $bin_path = BUILD_BIN_PATH;
-
-        // create dirs
-        FileSystem::createDir($debug_dir);
-        FileSystem::createDir($bin_path);
-
-        // determine source path for different SAPI
-        $rel_type = 'Release'; // TODO: Debug build support
         $ts = $this->zts ? '_TS' : '';
         $src = match ($type) {
-            BUILD_TARGET_CLI => [SOURCE_PATH . "\\php-src\\x64\\{$rel_type}{$ts}", 'php.exe', 'php.pdb'],
-            BUILD_TARGET_MICRO => [SOURCE_PATH . "\\php-src\\x64\\{$rel_type}{$ts}", 'micro.sfx', 'micro.pdb'],
-            BUILD_TARGET_CGI => [SOURCE_PATH . "\\php-src\\x64\\{$rel_type}{$ts}", 'php-cgi.exe', 'php-cgi.pdb'],
+            BUILD_TARGET_CLI => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\php.exe",
+            BUILD_TARGET_MICRO => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\micro.sfx",
+            BUILD_TARGET_CGI => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\php-cgi.exe",
             default => throw new SPCInternalException("Deployment does not accept type {$type}"),
         };
 
-        $src = "{$src[0]}\\{$src[1]}";
-        $dst = BUILD_BIN_PATH . '\\' . basename($src);
-
-        // file must exists
-        if (!file_exists($src)) {
-            throw new SPCInternalException("Deploy failed. Cannot find file: {$src}");
-        }
-        // dst dir must exists
-        FileSystem::createDir(dirname($dst));
-
-        // copy file
-        if (realpath($src) !== realpath($dst)) {
-            cmd()->exec('copy ' . escapeshellarg($src) . ' ' . escapeshellarg($dst));
-        }
-
-        // extract debug info in buildroot/debug
-        if ($this->getOption('no-strip', false) && file_exists("{$src[0]}\\{$src[2]}")) {
-            cmd()->exec('copy ' . escapeshellarg("{$src[0]}\\{$src[2]}") . ' ' . escapeshellarg($debug_dir));
-        }
-
         // with-upx-pack for cli and micro
         if ($this->getOption('with-upx-pack', false)) {
             if ($type === BUILD_TARGET_CLI || $type === BUILD_TARGET_CGI || ($type === BUILD_TARGET_MICRO && version_compare($this->getMicroVersion(), '0.2.0') >= 0)) {
-                cmd()->exec(getenv('UPX_EXEC') . ' --best ' . escapeshellarg($dst));
+                cmd()->exec(getenv('UPX_EXEC') . ' --best ' . escapeshellarg($src));
             }
         }
+
+        logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');
+        FileSystem::createDir(BUILD_BIN_PATH);
+
+        cmd()->exec('copy ' . escapeshellarg($src) . ' ' . escapeshellarg(BUILD_BIN_PATH . '\\'));
+        return true;
     }
 
     /**

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/SPC/command/BuildLibsCommand.php

@@ -19,7 +19,7 @@ class BuildLibsCommand extends BuildCommand
     {
         $this->addArgument('libraries', InputArgument::REQUIRED, 'The libraries will be compiled, comma separated');
         $this->addOption('clean', null, null, 'Clean old download cache and source before fetch');
-        $this->addOption('all', 'A', null, 'Build all libs that static-php-cli has');
+        $this->addOption('all', 'A', null, 'Build all libs that static-php-cli needed');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output): void

src/SPC/command/BuildPHPCommand.php

@@ -39,7 +39,6 @@ class BuildPHPCommand extends BuildCommand
         $this->addOption('disable-opcache-jit', null, null, 'disable opcache jit');
         $this->addOption('with-config-file-path', null, InputOption::VALUE_REQUIRED, 'Set the path in which to look for php.ini', $isWindows ? null : '/usr/local/etc/php');
         $this->addOption('with-config-file-scan-dir', null, InputOption::VALUE_REQUIRED, 'Set the directory to scan for .ini files after reading php.ini', $isWindows ? null : '/usr/local/etc/php/conf.d');
-        $this->addOption('with-sysconfdir', null, InputOption::VALUE_REQUIRED, 'Set the sysconfdir (e.g. /etc/php-zts) used by configure (not available on Windows)');
         $this->addOption('with-hardcoded-ini', 'I', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Patch PHP source code, inject hardcoded INI');
         $this->addOption('with-micro-fake-cli', null, null, 'Let phpmicro\'s PHP_SAPI use "cli" instead of "micro"');
         $this->addOption('with-suggested-libs', 'L', null, 'Build with suggested libs for selected exts and libs');
@@ -49,10 +48,6 @@ class BuildPHPCommand extends BuildCommand
         $this->addOption('with-upx-pack', null, null, 'Compress / pack binary using UPX tool (linux/windows only)');
         $this->addOption('with-micro-logo', null, InputOption::VALUE_REQUIRED, 'Use custom .ico for micro.sfx (windows only)');
         $this->addOption('enable-micro-win32', null, null, 'Enable win32 mode for phpmicro (Windows only)');
-        $this->addOption('with-frankenphp-app', null, InputOption::VALUE_REQUIRED, 'Path to a folder to be embedded in FrankenPHP');
-        $this->addOption('pgi', null, null, 'Build instrumented binaries (-fprofile-generate). Run them to collect .profraw files, then re-run with --pgo.');
-        $this->addOption('cs-pgi', null, null, 'Build cs-instrumented binaries (-fprofile-use=<existing.profdata> -fcs-profile-generate). Requires a prior --pgi+--pgo cycle.');
-        $this->addOption('pgo', null, null, 'Build optimised binaries (-fprofile-use) from .profraw collected by a previous --pgi run.');
     }
 
     public function handle(): int
@@ -181,7 +176,7 @@ class BuildPHPCommand extends BuildCommand
         // compile libraries
         $builder->proveLibs($libraries);
         // check extensions
-        $builder->proveExts($static_extensions, $shared_extensions, build_target: $rule);
+        $builder->proveExts($static_extensions, $shared_extensions);
         // validate libs and extensions
         $builder->validateLibsAndExts();
 
@@ -214,8 +209,9 @@ class BuildPHPCommand extends BuildCommand
 
         // clean old modules that may conflict with the new php build
         FileSystem::removeDir(BUILD_MODULES_PATH);
-
+        // start to build
         $builder->buildPHP($rule);
+
         $builder->testPHP($rule);
 
         // compile stopwatch :P