phpstan

.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,14 +42,6 @@ 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
@@ -84,9 +73,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,14 +86,6 @@ 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
@@ -174,19 +152,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 }}"
@@ -210,12 +177,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 +199,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
@@ -305,22 +245,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:

config/env.ini

@@ -79,6 +79,7 @@ SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime
 SPC_LIBC=musl
 ; uncomment to link libc dynamically on musl
 ; SPC_MUSL_DYNAMIC=true
+SPC_LINK_STATIC=true
 
 ; Recommended: specify your target here. Zig toolchain will be used.
 ; examples:
@@ -97,7 +98,7 @@ LD=${SPC_LINUX_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
 SPC_DEFAULT_C_FLAGS="-fPIC -Os"
 SPC_DEFAULT_CXX_FLAGS="-fPIC -Os"
-SPC_DEFAULT_LD_FLAGS=""
+SPC_DEFAULT_LD_FLAGS="-Wl,--as-needed"
 ; upx executable path
 UPX_EXEC=${PKG_ROOT_PATH}/bin/upx
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
@@ -115,7 +116,7 @@ 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 -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=""
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS="-Wl,--as-needed"
 
 ; 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
@@ -148,8 +149,6 @@ SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-
 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
 

config/ext.json

@@ -63,8 +63,7 @@
         ],
         "ext-depends-windows": [
             "zlib",
-            "openssl",
-            "brotli"
+            "openssl"
         ]
     },
     "dba": {
@@ -74,19 +73,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"
@@ -266,7 +252,6 @@
         "arg-type-unix": "enable-path",
         "cpp-extension": true,
         "lib-depends": [
-            "grpc",
             "zlib",
             "openssl",
             "libcares"

config/lib.json

@@ -109,7 +109,8 @@
             "krb5"
         ],
         "lib-suggests-windows": [
-            "brotli"
+            "brotli",
+            "zstd"
         ],
         "frameworks": [
             "CoreFoundation",
@@ -142,7 +143,9 @@
             "zlib"
         ],
         "lib-suggests": [
-            "libpng"
+            "libpng",
+            "bzip2",
+            "brotli"
         ]
     },
     "gettext": {
@@ -300,6 +303,9 @@
     },
     "krb5": {
         "source": "krb5",
+        "target": [
+            "static"
+        ],
         "pkg-configs": [
             "krb5-gssapi"
         ],
@@ -352,9 +358,6 @@
         "static-libs-unix": [
             "libaom.a"
         ],
-        "static-libs-windows": [
-            "aom.lib"
-        ],
         "cpp-library": true
     },
     "libargon2": {
@@ -493,7 +496,7 @@
         "static-libs-windows": [
             "libjpeg_a.lib"
         ],
-        "lib-depends": [
+        "lib-suggests-windows": [
             "zlib"
         ]
     },
@@ -528,18 +531,6 @@
             "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,
@@ -774,6 +765,7 @@
             "xz"
         ],
         "lib-suggests-windows": [
+            "zstd",
             "openssl"
         ]
     },
@@ -1010,9 +1002,6 @@
         ],
         "headers": [
             "wtr/watcher-c.h"
-        ],
-        "frameworks": [
-            "CoreServices"
         ]
     },
     "xz": {
@@ -1040,7 +1029,7 @@
         "pkg-configs": [
             "zlib"
         ],
-        "static-libs-unix": [
+        "static-libs": [
             "libz.a"
         ],
         "static-libs-windows": [
@@ -1060,10 +1049,8 @@
             "libzstd.a"
         ],
         "static-libs-windows": [
-            [
-                "zstd.lib",
-                "zstd_static.lib"
-            ]
+            "zstd.lib",
+            "zstd_static.lib"
         ],
         "headers-unix": [
             "zdict.h",

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",
@@ -481,8 +462,10 @@
         }
     },
     "krb5": {
-        "type": "url",
-        "url": "https://web.mit.edu/kerberos/dist/krb5/1.22/krb5-1.22.2.tar.gz",
+        "type": "ghtagtar",
+        "repo": "krb5/krb5",
+        "match": "krb5.+-final",
+        "prefer-stable": true,
         "license": {
             "type": "file",
             "path": "NOTICE"
@@ -658,7 +641,6 @@
     "libjpeg": {
         "type": "ghtar",
         "repo": "libjpeg-turbo/libjpeg-turbo",
-        "prefer-stable": true,
         "license": {
             "type": "file",
             "path": "LICENSE.md"
@@ -700,14 +682,6 @@
             "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",
@@ -1000,7 +974,7 @@
     "openssl": {
         "type": "ghrel",
         "repo": "openssl/openssl",
-        "match": "openssl-3.+\\.tar\\.gz",
+        "match": "openssl.+\\.tar\\.gz",
         "prefer-stable": true,
         "alt": {
             "type": "filelist",
@@ -1080,7 +1054,7 @@
     },
     "protobuf": {
         "type": "url",
-        "url": "https://pecl.php.net/get/protobuf-5.34.1.tgz",
+        "url": "https://pecl.php.net/get/protobuf",
         "path": "php-src/ext/protobuf",
         "filename": "protobuf.tgz",
         "license": {

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/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`，则会在构建时输出所有日志，包括编译的日志，以供排查错误。
 

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.5';
+    public const string VERSION = '2.8.3';
 
     public function __construct()
     {

src/SPC/builder/Extension.php

@@ -11,9 +11,6 @@ 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;
 
@@ -234,7 +231,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(
@@ -546,11 +543,6 @@ class Extension
      */
     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);
         [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
         $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';

src/SPC/builder/LibraryBase.php

@@ -365,7 +365,8 @@ abstract class LibraryBase
 
     protected function isLibraryInstalled(): bool
     {
-        if ($pkg_configs = Config::getLib(static::NAME, 'pkg-configs', [])) {
+        $pkg_configs = Config::getLib(static::NAME, 'pkg-configs', []);
+        if (count($pkg_configs) !== 0) {
             $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
             $search_paths = array_unique(array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path)));
 
@@ -381,13 +382,14 @@ abstract class LibraryBase
                     return false;
                 }
             }
-            // allow using system dependencies if pkg_config_path is explicitly defined
-            if (count($search_paths) > 1) {
-                return true;
-            }
+            return true; // allow using system dependencies if pkg_config_path is explicitly defined
         }
         foreach (Config::getLib(static::NAME, 'static-libs', []) as $name) {
             if (!file_exists(BUILD_LIB_PATH . "/{$name}")) {
+                $sharedLib = str_replace('.a', '.so', $name);
+                if (!getenv('SPC_LINK_STATIC') && file_exists(BUILD_LIB_PATH . "/{$sharedLib}")) {
+                    continue;
+                }
                 return false;
             }
         }
@@ -396,20 +398,6 @@ 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) {
-                return false;
-            }
-        }
         foreach (Config::getLib(static::NAME, 'bin', []) as $name) {
             if (!file_exists(BUILD_BIN_PATH . "/{$name}")) {
                 return false;

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/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,59 +21,18 @@ 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",
+            $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 (SPCTarget::getTargetOS() === 'Darwin') {
+            FileSystem::replaceFileRegex(
+                $this->source_dir . '/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;
     }
 
@@ -88,6 +48,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/pgsql.php

@@ -25,8 +25,8 @@ class pgsql extends Extension
     {
         if ($this->builder->getPHPVersionID() >= 80400) {
             $libfiles = $this->getLibFilesString();
-            $libfiles = str_replace(BUILD_LIB_PATH . '/lib', '-l', $libfiles);
-            $libfiles = str_replace('.a', '', $libfiles);
+            $libfiles = deduplicate_flags($libfiles);
+            $libfiles = clean_spaces($libfiles);
             return '--with-pgsql' . ($shared ? '=shared' : '') .
                 ' PGSQL_CFLAGS=-I' . BUILD_INCLUDE_PATH .
                 ' PGSQL_LIBS="-L' . BUILD_LIB_PATH . ' ' . $libfiles . '"';

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

@@ -50,16 +50,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
@@ -71,7 +74,6 @@ class swoole extends Extension
             $config = (new SPCConfigUtil($this->builder))->getLibraryConfig($this->builder->getLib('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/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/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/freebsd/library/openssl.php

@@ -42,7 +42,7 @@ class openssl extends BSDLibraryBase
 
         shell()->cd($this->source_dir)->initializeEnv($this)
             ->exec(
-                "./Configure no-shared {$extra} " .
+                "./Configure {$extra} " .
                 '--prefix=/ ' . // use prefix=/
                 "--libdir={$lib} " .
                 '--openssldir=/etc/ssl ' .

src/SPC/builder/linux/LinuxBuilder.php

@@ -11,8 +11,6 @@ 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\SPCConfigUtil;
 use SPC\util\SPCTarget;
@@ -67,8 +65,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)) {
@@ -97,6 +94,7 @@ class LinuxBuilder extends UnixBuilderBase
             'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, // . ' -Dsomethinghere', // . $musl_flag,
             'LDFLAGS' => '-L' . BUILD_LIB_PATH,
+            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
             // 'LIBS' => SPCTarget::getRuntimeLibs(), // do not pass static libraries here yet, they may contain polyfills for libc functions!
         ]);
 
@@ -165,7 +163,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...');
@@ -269,11 +267,6 @@ 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;
@@ -324,7 +317,7 @@ class LinuxBuilder extends UnixBuilderBase
      */
     private function getMakeExtraVars(): array
     {
-        $config = (new SPCConfigUtil($this, ['libs_only_deps' => true, 'absolute_libs' => true]))->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
+        $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'));
         $static = SPCTarget::isStatic() ? '-all-static' : '';
         $lib = BUILD_LIB_PATH;
         return array_filter([

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

@@ -35,10 +35,13 @@ class liburing extends LinuxLibraryBase
             ]);
         }
 
+        $shared = getenv('SPC_LINK_STATIC') ? 'ENABLE_SHARED=0' : 'ENABLE_SHARED=1';
         $make
             ->removeConfigureArgs(
-                '--disable-shared',
                 '--enable-static',
+                '--disable-static',
+                '--enable-shared',
+                '--disable-shared',
                 '--with-pic',
                 '--enable-pic',
             )
@@ -46,7 +49,7 @@ class liburing extends LinuxLibraryBase
                 $use_libc ? '--use-libc' : '',
             )
             ->configure()
-            ->make('library ENABLE_SHARED=0', 'install ENABLE_SHARED=0', with_clean: false);
+            ->make("library {$shared}", "install {$shared}", with_clean: false);
 
         $this->patchPkgconfPrefix();
     }

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

@@ -56,10 +56,11 @@ class openssl extends LinuxLibraryBase
         // 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);
+        $noShared = getenv('SPC_LINK_STATIC') ? 'no-shared' : '';
 
         shell()->cd($this->source_dir)->initializeEnv($this)
             ->exec(
-                "{$env} ./Configure no-shared {$extra} " .
+                "./Configure {$noShared} {$extra} " .
                 '--prefix=' . BUILD_ROOT_PATH . ' ' .
                 '--libdir=' . BUILD_LIB_PATH . ' ' .
                 "--openssldir={$openssl_dir} " .

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

@@ -43,7 +43,7 @@ class openssl extends MacOSLibraryBase
 
         shell()->cd($this->source_dir)->initializeEnv($this)
             ->exec(
-                "./Configure no-shared {$extra} " .
+                "./Configure {$extra} " .
                 '--prefix=' . BUILD_ROOT_PATH . ' ' . // use prefix=/
                 '--libdir=lib ' .
                 '--openssldir=/etc/ssl ' .

src/SPC/builder/traits/UnixLibraryTrait.php

@@ -15,7 +15,7 @@ trait UnixLibraryTrait
     {
         $libs = $include_self ? [$this] : [];
         array_unshift($libs, ...array_values($this->getDependencies(recursive: true)));
-        $config = new SPCConfigUtil($this->builder, options: ['libs_only_deps' => true, 'absolute_libs' => true]);
+        $config = new SPCConfigUtil($this->builder, options: ['libs_only_deps' => true]);
         $res = $config->config(libraries: array_map(fn ($x) => $x->getName(), $libs));
         return $res['libs'];
     }

src/SPC/builder/traits/UnixSystemUtilTrait.php

@@ -7,6 +7,7 @@ namespace SPC\builder\traits;
 use SPC\exception\ExecutionException;
 use SPC\exception\SPCInternalException;
 use SPC\exception\WrongUsageException;
+use SPC\store\pkg\Zig;
 use SPC\toolchain\ToolchainManager;
 use SPC\toolchain\ZigToolchain;
 use SPC\util\SPCTarget;
@@ -50,7 +51,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");
@@ -73,6 +74,10 @@ trait UnixSystemUtilTrait
             throw new SPCInternalException("The symbol file {$symbol_file} does not exist, please check if nm command is available.");
         }
         // macOS/zig
+        // https://github.com/ziglang/zig/issues/24662
+        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            return '-Wl,--export-dynamic'; // needs release 0.16, can be removed then
+        }
         if (SPCTarget::getTargetOS() !== 'Linux' || ToolchainManager::getToolchainClass() === ZigToolchain::class) {
             return "-Wl,-exported_symbols_list,{$symbol_file}";
         }

src/SPC/builder/unix/UnixBuilderBase.php

@@ -457,7 +457,6 @@ abstract class UnixBuilderBase extends BuilderBase
             '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\' ' .
                 '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .
                 "v{$frankenPhpVersion} PHP {$libphpVersion} Caddy'\\\" " .
                 "-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",

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

@@ -20,11 +20,6 @@ trait brotli
         FileSystem::replaceFileLineContainsString(BUILD_LIB_PATH . '/pkgconfig/libbrotlidec.pc', 'Libs: -L${libdir} -lbrotlidec', 'Libs: -L${libdir} -lbrotlidec -lbrotlicommon');
         FileSystem::replaceFileLineContainsString(BUILD_LIB_PATH . '/pkgconfig/libbrotlienc.pc', 'Libs: -L${libdir} -lbrotlienc', 'Libs: -L${libdir} -lbrotlienc -lbrotlicommon');
         shell()->cd(BUILD_ROOT_PATH . '/lib')->exec('ln -sf libbrotlicommon.a libbrotli.a');
-        foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
-            if (str_starts_with($filename, 'libbrotli') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) {
-                unlink(BUILD_ROOT_PATH . '/lib/' . $filename);
-            }
-        }
 
         if (file_exists(BUILD_BIN_PATH . '/brotli')) {
             unlink(BUILD_BIN_PATH . '/brotli');

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\unix\library;
 
 use SPC\util\executor\UnixCMakeExecutor;
+use SPC\util\SPCConfigUtil;
 
 trait curl
 {
@@ -12,6 +13,13 @@ trait curl
     {
         shell()->cd($this->source_dir)->exec('sed -i.save s@\${CMAKE_C_IMPLICIT_LINK_LIBRARIES}@@ ./CMakeLists.txt');
 
+        $linkerFlags = null;
+        if ($this->builder->getLib('krb5') && !getenv('SPC_LINK_STATIC')) {
+            $util = new SPCConfigUtil($this->builder, ['libs_only_deps' => true]);
+            $config = $util->config(libraries: ['krb5']);
+            $linkerFlags = $config['ldflags'] . ' -Wl,--whole-archive -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lkrb5support -Wl,--no-whole-archive -Wl,--no-undefined';
+        }
+
         UnixCMakeExecutor::create($this)
             ->optionalLib('openssl', '-DCURL_USE_OPENSSL=ON -DCURL_CA_BUNDLE=OFF -DCURL_CA_PATH=OFF -DCURL_CA_FALLBACK=ON', '-DCURL_USE_OPENSSL=OFF -DCURL_ENABLE_SSL=OFF')
             ->optionalLib('brotli', ...cmake_boolean_args('CURL_BROTLI'))
@@ -29,6 +37,7 @@ trait curl
             ->addConfigureArgs(
                 '-DBUILD_CURL_EXE=OFF',
                 '-DBUILD_LIBCURL_DOCS=OFF',
+                $linkerFlags ? "-DCMAKE_SHARED_LINKER_FLAGS='{$linkerFlags}'" : null
             )
             ->build();
 

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

@@ -4,8 +4,6 @@ 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;
 
@@ -15,10 +13,7 @@ trait krb5
     {
         $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');
-        }
+        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));
@@ -41,16 +36,22 @@ trait krb5
             $extraEnv['LDFLAGS'] = '-framework Kerberos';
             $args[] = 'ac_cv_func_secure_getenv=no';
         }
-        $make = UnixAutoconfExecutor::create($this)
+        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();
+            ->removeConfigureArgs(
+                '--enable-static',
+                '--disable-static',
+                '--enable-shared',
+                '--disable-shared'
+            )
+            ->addConfigureArgs(
+                '--enable-static',
+                '--disable-shared'
+            )
+            ->configure(...$args)
+            ->make();
         $this->patchPkgconfPrefix([
             'krb5-gssapi.pc',
             'krb5.pc',

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

@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\store\FileSystem;
-
 trait libargon2
 {
     protected function build()
@@ -17,12 +15,6 @@ trait libargon2
 
         $this->patchPkgconfPrefix(['libargon2.pc']);
 
-        foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
-            if (str_starts_with($filename, 'libargon2') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) {
-                unlink(BUILD_ROOT_PATH . '/lib/' . $filename);
-            }
-        }
-
         if (file_exists(BUILD_BIN_PATH . '/argon2')) {
             unlink(BUILD_BIN_PATH . '/argon2');
         }

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

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

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

@@ -27,11 +27,5 @@ trait liblz4
             ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH);
 
         $this->patchPkgconfPrefix(['liblz4.pc']);
-
-        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/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/libuuid.php

@@ -13,6 +13,7 @@ trait libuuid
     {
         UnixCMakeExecutor::create($this)->toStep(2)->build();
         copy($this->source_dir . '/build/libuuid.a', BUILD_LIB_PATH . '/libuuid.a');
+        copy($this->source_dir . '/build/libuuid.so', BUILD_LIB_PATH . '/libuuid.so');
         FileSystem::createDir(BUILD_INCLUDE_PATH . '/uuid');
         copy($this->source_dir . '/uuid.h', BUILD_INCLUDE_PATH . '/uuid/uuid.h');
         $pc = FileSystem::readFile($this->source_dir . '/uuid.pc.in');

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

@@ -11,7 +11,7 @@ trait libuv
     protected function build(): void
     {
         UnixCMakeExecutor::create($this)
-            ->addConfigureArgs('-DLIBUV_BUILD_SHARED=OFF')
+            ->addConfigureArgs('-DLIBUV_BUILD_SHARED=' . (getenv('SPC_LINK_STATIC') ? 'OFF' : 'ON'))
             ->build();
         // patch pkgconfig
         $this->patchPkgconfPrefix(['libuv-static.pc']);

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

@@ -6,10 +6,29 @@ namespace SPC\builder\unix\library;
 
 use SPC\builder\linux\library\LinuxLibraryBase;
 use SPC\store\FileSystem;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
 use SPC\util\executor\UnixCMakeExecutor;
 
 trait libxml2
 {
+    public function patchBeforeBuild(): bool
+    {
+        if (ToolchainManager::getToolchainClass() !== ZigToolchain::class) {
+            return false;
+        }
+        $patched = (bool) FileSystem::replaceFileStr(
+            $this->source_dir . '/configure.ac',
+            'AX_APPEND_FLAG([-Wl,--version-script=], [VERSION_SCRIPT_FLAGS])',
+            '',
+        );
+        return $patched || FileSystem::replaceFileStr(
+            $this->source_dir . '/CMakeLists.txt',
+            'target_link_options(LibXml2 PRIVATE "LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libxml2.syms")',
+            '',
+        );
+    }
+
     public function build(): void
     {
         $cmake = UnixCMakeExecutor::create($this)
@@ -20,7 +39,6 @@ trait libxml2
                 "-DZLIB_INCLUDE_DIR={$this->getIncludeDir()}",
                 '-DLIBXML2_WITH_ZLIB=OFF',
             )
-            ->optionalLib('xz', ...cmake_boolean_args('LIBXML2_WITH_LZMA'))
             ->addConfigureArgs(
                 '-DLIBXML2_WITH_ICONV=ON',
                 '-DLIBXML2_WITH_ICU=OFF', // optional, but discouraged: https://gitlab.gnome.org/GNOME/libxml2/-/blob/master/README.md

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

@@ -13,7 +13,7 @@ trait mimalloc
     {
         $cmake = UnixCMakeExecutor::create($this)
             ->addConfigureArgs(
-                '-DMI_BUILD_SHARED=OFF',
+                '-DMI_BUILD_SHARED=' . (getenv('SPC_LINK_STATIC') ? 'OFF' : 'ON'),
                 '-DMI_BUILD_OBJECT=OFF',
                 '-DMI_INSTALL_TOPLEVEL=ON',
             );

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

@@ -12,6 +12,9 @@ trait postgresql
 {
     public function patchBeforeBuild(): bool
     {
+        if (!getenv('SPC_LINK_STATIC')) {
+            return false;
+        }
         // 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
@@ -92,10 +95,11 @@ trait postgresql
             ->exec('make -C src/interfaces/libpq install');
 
         // remove dynamic libs
-        shell()->cd($this->source_dir . '/build')
-            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.so*")
-            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.dylib");
-
+        if (getenv('SPC_LINK_STATIC')) {
+            shell()->cd($this->source_dir . '/build')
+                ->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/tidy.php

@@ -14,7 +14,7 @@ trait tidy
             ->setBuildDir("{$this->source_dir}/build-dir")
             ->addConfigureArgs(
                 '-DSUPPORT_CONSOLE_APP=OFF',
-                '-DBUILD_SHARED_LIB=OFF'
+                '-DBUILD_SHARED_LIB=' . (getenv('SPC_LINK_STATIC') ? 'OFF' : 'ON')
             );
         if (version_compare(get_cmake_version(), '4.0.0', '>=')) {
             $cmake->addConfigureArgs('-DCMAKE_POLICY_VERSION_MINIMUM=3.5');

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
@@ -31,15 +30,7 @@ trait unixodbc
                 '--enable-gui=no',
             )
             ->make();
-        $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',
-                ''
-            );
-        }
+        $this->patchPkgconfPrefix(['odbc.pc', 'odbccr.pc', 'odbcinst.pc']);
         $this->patchLaDependencyPrefix();
     }
 }

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

@@ -10,7 +10,14 @@ trait xz
 {
     public function build(): void
     {
-        UnixAutoconfExecutor::create($this)
+        $make = UnixAutoconfExecutor::create($this);
+        if (!getenv('SPC_LINK_STATIC')) {
+            // liblzma can only build one of static or shared at a time
+            $make
+                ->removeConfigureArgs('--enable-static')
+                ->addConfigureArgs('--disable-static');
+        }
+        $make
             ->configure(
                 '--disable-scripts',
                 '--disable-doc',

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

@@ -10,7 +10,8 @@ trait zlib
 {
     protected function build(): void
     {
-        UnixAutoconfExecutor::create($this)->exec("./configure --static --prefix={$this->getBuildRootPath()}")->make();
+        $static = getenv('SPC_LINK_STATIC') ? '--static' : '';
+        UnixAutoconfExecutor::create($this)->exec("./configure {$static} --prefix={$this->getBuildRootPath()}")->make();
         $this->patchPkgconfPrefix(['zlib.pc']);
     }
 }

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

@@ -14,9 +14,9 @@ trait zstd
             ->setBuildDir("{$this->source_dir}/build/cmake/build")
             ->addConfigureArgs(
                 '-DZSTD_BUILD_STATIC=ON',
-                '-DZSTD_BUILD_SHARED=OFF',
+                '-DZSTD_BUILD_SHARED=' . (getenv('SPC_LINK_STATIC') ? 'OFF' : 'ON'),
             )
             ->build();
-        $this->patchPkgconfPrefix(['libzstd.pc']);
+        $this->patchPkgconfPrefix();
     }
 }

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

@@ -33,7 +33,6 @@ class openssl extends WindowsLibraryBase
             ->execWithWrapper(
                 $this->builder->makeSimpleWrapper($this->perl),
                 'Configure zlib VC-WIN64A ' .
-                'no-shared ' .
                 '--prefix=' . quote(BUILD_ROOT_PATH) . ' ' .
                 '--with-zlib-lib=' . quote(BUILD_LIB_PATH) . ' ' .
                 '--with-zlib-include=' . quote(BUILD_INCLUDE_PATH) . ' ' .

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

@@ -30,7 +30,7 @@ class DownloadCommand extends BaseCommand
         $this->addArgument('sources', InputArgument::REQUIRED, 'The sources will be compiled, comma separated');
         $this->addOption('shallow-clone', null, null, 'Clone shallow');
         $this->addOption('with-openssl11', null, null, 'Use openssl 1.1');
-        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format (default 8.5)', '8.5');
+        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format (default 8.4)', '8.4');
         $this->addOption('clean', null, null, 'Clean old download cache and source before fetch');
         $this->addOption('all', 'A', null, 'Fetch all sources that static-php-cli needed');
         $this->addOption('custom-url', 'U', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Specify custom source download url, e.g "php-src:https://downloads.php.net/~eric/php-8.3.0beta1.tar.gz"');

src/SPC/command/SPCConfigCommand.php

@@ -39,7 +39,6 @@ class SPCConfigCommand extends BaseCommand
         $util = new SPCConfigUtil(options: [
             'no_php' => $this->getOption('no-php'),
             'libs_only_deps' => $this->getOption('libs-only-deps'),
-            'absolute_libs' => $this->getOption('absolute-libs'),
         ]);
         $config = $util->config($extensions, $libraries, $include_suggest_ext, $include_suggest_lib);
 

src/SPC/doctor/item/LinuxToolCheckList.php

@@ -109,7 +109,7 @@ class LinuxToolCheckList
     public function fixBuildTools(array $distro, array $missing): bool
     {
         $install_cmd = match ($distro['dist']) {
-            'ubuntu', 'debian', 'linuxmint', 'Deepin' => 'apt-get install -y',
+            'ubuntu', 'debian', 'Deepin' => 'apt-get install -y',
             'alpine' => 'apk add',
             'redhat' => 'dnf install -y',
             'centos' => 'yum install -y',

src/SPC/store/FileSystem.php

@@ -152,7 +152,7 @@ class FileSystem
         $src_path = FileSystem::convertPath($from);
         switch (PHP_OS_FAMILY) {
             case 'Windows':
-                f_passthru('xcopy "' . $src_path . '" "' . $dst_path . '" /s/e/y/i');
+                f_passthru('xcopy "' . $src_path . '" "' . $dst_path . '" /s/e/v/y/i');
                 break;
             case 'Linux':
             case 'Darwin':

src/SPC/store/SourcePatcher.php

@@ -634,13 +634,7 @@ class SourcePatcher
                 FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/gd/libgd/gdft.c', '#ifndef MSWIN32', '#ifndef _WIN32');
             }
             // custom config.w32, because official config.w32 is hard-coded many things
-            if ($ver_id >= 80500) {
-                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_85.w32');
-            } elseif ($ver_id >= 80100) {
-                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32');
-            } else {
-                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
-            }
+            $origin = $ver_id >= 80100 ? file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32') : file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
             file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32.bak', file_get_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32'));
             return file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32', $origin) !== false;
         }

src/SPC/store/source/PhpSource.php

@@ -20,7 +20,7 @@ class PhpSource extends CustomSourceBase
 
     public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_DOWNLOAD_SOURCE): void
     {
-        $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.5';
+        $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
         if ($major === 'git') {
             Downloader::downloadSource('php-src', ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
         } else {

src/SPC/toolchain/ZigToolchain.php

@@ -58,6 +58,10 @@ class ZigToolchain implements ToolchainInterface
         GlobalEnvManager::putenv("SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS={$extraCflags}");
         GlobalEnvManager::putenv('RANLIB=zig-ranlib');
         GlobalEnvManager::putenv('OBJCOPY=zig-objcopy');
+        $defaultLdFlags = getenv('SPC_DEFAULT_LD_FLAGS') ?: '';
+        if (!str_contains($defaultLdFlags, '-Wl,--undefined-version') && !getenv('SPC_LINK_STATIC')) {
+            GlobalEnvManager::putenv("SPC_DEFAULT_LD_FLAGS={$defaultLdFlags} -Wl,--undefined-version");
+        }
         $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
         if (!str_contains($extra_libs, '-lunwind')) {
             // Add unwind library if not already present

src/SPC/util/ConfigValidator.php

@@ -393,7 +393,7 @@ class ConfigValidator
         }
         // check php-version
         if (isset($craft['php-version'])) {
-            // validate version, accept 8.x, 7.x, 8.x.x, 7.x.x, 8, 7
+            // validdate version, accept 8.x, 7.x, 8.x.x, 7.x.x, 8, 7
             $version = strval($craft['php-version']);
             if (!preg_match('/^(\d+)(\.\d+)?(\.\d+)?$/', $version, $matches)) {
                 throw new ValidationException('Craft file php-version is invalid');

src/SPC/util/GlobalEnvManager.php

@@ -38,6 +38,13 @@ class GlobalEnvManager
 
         // Define env vars for unix
         if (is_unix()) {
+            if (!getenv('SPC_LINK_STATIC')) {
+                $ldLibPath = getenv('LD_LIBRARY_PATH=' . BUILD_LIB_PATH);
+                if ($ldLibPath) {
+                    $ldLibPath = ":{$ldLibPath}";
+                }
+                self::putenv('LD_LIBRARY_PATH=' . BUILD_LIB_PATH . $ldLibPath);
+            }
             self::addPathIfNotExists(BUILD_BIN_PATH);
             self::addPathIfNotExists(PKG_ROOT_PATH . '/bin');
             $pkgConfigPath = getenv('PKG_CONFIG_PATH');

src/SPC/util/PkgConfigUtil.php

@@ -59,10 +59,10 @@ class PkgConfigUtil
      * @param  string $pkg_config_str .pc file string, accepts multiple files
      * @return string CFLAGS string, e.g. "-Wno-implicit-int-float-conversion ..."
      */
-    public static function getCflags(string $pkg_config_str): string
+    public static function getCflags(string $pkg_config_str, string $extra = '--static'): string
     {
         // get other things
-        $result = self::execWithResult("pkg-config --static --cflags-only-other {$pkg_config_str}");
+        $result = self::execWithResult("pkg-config {$extra} --cflags-only-other {$pkg_config_str}");
         return trim($result);
     }
 
@@ -75,14 +75,14 @@ class PkgConfigUtil
      * @param  string $pkg_config_str .pc file string, accepts multiple files
      * @return array  Unique libs array, e.g. [-lz, -lxml, ...]
      */
-    public static function getLibsArray(string $pkg_config_str): array
+    public static function getLibsArray(string $pkg_config_str, string $extra = '--static'): array
     {
         // Use this instead of shell() to avoid unnecessary outputs
-        $result = self::execWithResult("pkg-config --static --libs-only-l {$pkg_config_str}");
+        $result = self::execWithResult("pkg-config {$extra} --libs-only-l {$pkg_config_str}");
         $libs = explode(' ', trim($result));
 
         // get other things
-        $result = self::execWithResult("pkg-config --static --libs-only-other {$pkg_config_str}");
+        $result = self::execWithResult("pkg-config {$extra} --libs-only-other {$pkg_config_str}");
         // convert libxxx.a to -L{path} -lxxx
         $exp = explode(' ', trim($result));
         foreach ($exp as $item) {

src/SPC/util/SPCConfigUtil.php

@@ -20,13 +20,10 @@ class SPCConfigUtil
 
     private bool $libs_only_deps;
 
-    private bool $absolute_libs;
-
     /**
      * @param array{
      *     no_php?: bool,
-     *     libs_only_deps?: bool,
-     *     absolute_libs?: bool
+     *     libs_only_deps?: bool
      * } $options Options pass to spc-config
      */
     public function __construct(?BuilderBase $builder = null, array $options = [])
@@ -36,7 +33,6 @@ class SPCConfigUtil
         }
         $this->no_php = $options['no_php'] ?? false;
         $this->libs_only_deps = $options['libs_only_deps'] ?? false;
-        $this->absolute_libs = $options['absolute_libs'] ?? false;
     }
 
     /**
@@ -77,7 +73,7 @@ class SPCConfigUtil
         ob_get_clean();
         $ldflags = $this->getLdflagsString();
         $cflags = $this->getIncludesString($libraries);
-        $libs = $this->getLibsString($libraries, !$this->absolute_libs);
+        $libs = $this->getLibsString($libraries);
 
         // additional OS-specific libraries (e.g. macOS -lresolv)
         if ($extra_libs = SPCTarget::getRuntimeLibs()) {
@@ -239,7 +235,8 @@ class SPCConfigUtil
                 }
             }
             $pc_cflags = implode(' ', $pc);
-            if ($pc_cflags !== '' && ($pc_cflags = PkgConfigUtil::getCflags($pc_cflags)) !== '') {
+            $static = getenv('SPC_LINK_STATIC') ? '--static' : '';
+            if ($pc_cflags !== '' && ($pc_cflags = PkgConfigUtil::getCflags($pc_cflags, $static)) !== '') {
                 $arr = explode(' ', $pc_cflags);
                 $arr = array_unique($arr);
                 $arr = array_filter($arr, fn ($x) => !str_starts_with($x, 'SHELL:-Xarch_'));
@@ -256,7 +253,7 @@ class SPCConfigUtil
         return '-L' . BUILD_LIB_PATH;
     }
 
-    private function getLibsString(array $libraries, bool $use_short_libs = true): string
+    private function getLibsString(array $libraries): string
     {
         $lib_names = [];
         $frameworks = [];
@@ -264,6 +261,11 @@ class SPCConfigUtil
         foreach ($libraries as $library) {
             // add pkg-configs libs
             $pkg_configs = Config::getLib($library, 'pkg-configs', []);
+            $static = getenv('SPC_LINK_STATIC') ? '--static' : null;
+            if (!$static) {
+                $target = Config::getLib($library, 'target');
+                $static = $target && !in_array('shared', $target) ? '--static' : '';
+            }
             $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
             $search_paths = array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path));
             foreach ($pkg_configs as $file) {
@@ -280,14 +282,14 @@ class SPCConfigUtil
             $pkg_configs = implode(' ', $pkg_configs);
             if ($pkg_configs !== '') {
                 // static libs with dependencies come in reverse order, so reverse this too
-                $pc_libs = array_reverse(PkgConfigUtil::getLibsArray($pkg_configs));
+                $pc_libs = array_reverse(PkgConfigUtil::getLibsArray($static, $pkg_configs));
                 $lib_names = [...$lib_names, ...$pc_libs];
             }
             // convert all static-libs to short names
             $libs = array_reverse(Config::getLib($library, 'static-libs', []));
             foreach ($libs as $lib) {
                 // check file existence
-                if (!file_exists(BUILD_LIB_PATH . "/{$lib}")) {
+                if (!file_exists(BUILD_LIB_PATH . "/{$lib}") && getenv('SPC_LINK_STATIC')) {
                     throw new WrongUsageException("Library file '{$lib}' for lib [{$library}] does not exist in '" . BUILD_LIB_PATH . "'. Please build it first.");
                 }
                 $lib_names[] = $this->getShortLibName($lib);
@@ -316,8 +318,8 @@ class SPCConfigUtil
         if (in_array('imap', $libraries) && SPCTarget::getLibc() === 'glibc') {
             $lib_names[] = '-lcrypt';
         }
-        if (!$use_short_libs) {
-            $lib_names = array_map(fn ($l) => $this->getFullLibName($l), $lib_names);
+        if (getenv('SPC_LINK_STATIC')) {
+            $lib_names = array_map(fn ($l) => $this->getStaticLibname($l), $lib_names);
         }
         return implode(' ', $lib_names);
     }
@@ -331,7 +333,7 @@ class SPCConfigUtil
         return '-l' . substr($lib, 3, -2);
     }
 
-    private function getFullLibName(string $lib)
+    private function getStaticLibname(string $lib)
     {
         if (!str_starts_with($lib, '-l')) {
             return $lib;
@@ -339,7 +341,7 @@ class SPCConfigUtil
         $libname = substr($lib, 2);
         $staticLib = BUILD_LIB_PATH . '/' . "lib{$libname}.a";
         if (file_exists($staticLib)) {
-            return $staticLib;
+            return "-l:lib{$libname}.a";
         }
         return $lib;
     }

src/SPC/util/executor/UnixAutoconfExecutor.php

@@ -126,7 +126,7 @@ class UnixAutoconfExecutor extends Executor
     {
         return [
             '--enable-static',
-            '--disable-shared',
+            getenv('SPC_LINK_STATIC') ? '--disable-shared' : '--enable-shared',
             "--prefix={$this->library->getBuildRootPath()}",
             '--with-pic',
             '--enable-pic',

src/SPC/util/executor/UnixCMakeExecutor.php

@@ -151,7 +151,7 @@ class UnixCMakeExecutor extends Executor
             '-DCMAKE_INSTALL_LIBDIR=lib',
             '-DCMAKE_INSTALL_INCLUDEDIR=include',
             '-DPOSITION_INDEPENDENT_CODE=ON',
-            '-DBUILD_SHARED_LIBS=OFF',
+            '-DBUILD_SHARED_LIBS=' . (getenv('SPC_LINK_STATIC') ? 'OFF' : 'ON'),
             "-DCMAKE_TOOLCHAIN_FILE={$this->makeCmakeToolchainFile()}",
         ]);
     }
@@ -183,7 +183,6 @@ class UnixCMakeExecutor extends Executor
         $cflags = getenv('SPC_DEFAULT_C_FLAGS');
         $cc = getenv('CC');
         $cxx = getenv('CCX');
-        $include = BUILD_INCLUDE_PATH;
         logger()->debug("making cmake tool chain file for {$os} {$target_arch} with CFLAGS='{$cflags}'");
         $root = BUILD_ROOT_PATH;
         $pkgConfigExecutable = PkgConfigUtil::findPkgConfig();
@@ -211,8 +210,6 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES "{$include}")
-set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES "{$include}")
 set(CMAKE_EXE_LINKER_FLAGS "-ldl -lpthread -lm -lutil")
 CMAKE;
         // Whoops, linux may need CMAKE_AR sometimes

src/globals/common-tests/embed.c

@@ -1,12 +1,17 @@
 #include <sapi/embed/php_embed.h>
 
-int main(int argc, char **argv) {
-    PHP_EMBED_START_BLOCK(argc, argv)
+int main(int argc,char **argv){
+
+    PHP_EMBED_START_BLOCK(argc,argv)
+
     zend_file_handle file_handle;
-    zend_stream_init_filename(&file_handle, "embed.php");
-    if(!php_execute_script(&file_handle)) {
+
+    zend_stream_init_filename(&file_handle,"embed.php");
+
+    if(!php_execute_script(&file_handle)){
         php_printf("Failed to execute PHP script.\n");
     }
+
     PHP_EMBED_END_BLOCK()
     return 0;
 }

src/globals/ext-tests/decimal.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-assert(class_exists('Decimal\Decimal'));
-assert(method_exists('Decimal\Decimal', 'valueOf'));
-assert(0.1 + 0.2 !== 0.3);
-$result = Decimal\Decimal::valueOf('0.1') + Decimal\Decimal::valueOf('0.2');
-$expected = Decimal\Decimal::valueOf('0.3');
-assert($result == $expected);

src/globals/ext-tests/openssl.php

@@ -31,6 +31,6 @@ if (file_exists('/etc/ssl/openssl.cnf')) {
     }
     assert($valid);
 }
-if (PHP_VERSION_ID >= 80500 && (!PHP_ZTS || PHP_OS_FAMILY !== 'Windows') && defined('OPENSSL_VERSION_NUMBER') && OPENSSL_VERSION_NUMBER >= 0x30200000) {
+if (PHP_VERSION_ID >= 80500 && defined('OPENSSL_VERSION_NUMBER') && OPENSSL_VERSION_NUMBER >= 0x30200000) {
     assert(function_exists('openssl_password_hash'));
 }

src/globals/extra/gd_config_85.w32

@@ -1,94 +0,0 @@
-// vim:ft=javascript
-
-ARG_WITH("gd", "Bundled GD support", "yes");
-
-if (PHP_GD != "no") {
-    // check for gd.h (required)
-    if (!CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd")) {
-        ERROR("gd not enabled; libraries and headers not found");
-    }
-
-    // zlib ext support (required)
-    if (!CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD)) {
-        ERROR("gd not enabled; zlib not enabled");
-    }
-
-    // libjpeg lib support
-    if (CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("jpeglib.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include")) {
-        AC_DEFINE("HAVE_LIBJPEG", 1, "JPEG support");
-        AC_DEFINE("HAVE_GD_JPG", 1, "JPEG support");
-    }
-
-    // libpng16 lib support
-    if (CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + PHP_PHP_BUILD + "\\include\\libpng16")) {
-        AC_DEFINE("HAVE_LIBPNG", 1, "PNG support");
-        AC_DEFINE("HAVE_GD_PNG", 1, "PNG support");
-    }
-
-    // freetype lib support
-    if (CHECK_LIB("libfreetype_a.lib;libfreetype.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("ft2build.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\freetype2;" + PHP_PHP_BUILD + "\\include\\freetype")) {
-        AC_DEFINE("HAVE_LIBFREETYPE", 1, "FreeType support");
-        AC_DEFINE("HAVE_GD_FREETYPE", 1, "FreeType support");
-    }
-
-    // xpm lib support
-    if (CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\X11")) {
-        AC_DEFINE("HAVE_LIBXPM", 1, "XPM support");
-        AC_DEFINE("HAVE_GD_XPM", 1, "XPM support");
-    }
-
-    // iconv lib support
-    if ((CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
-        CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD)) {
-        AC_DEFINE("HAVE_LIBICONV", 1, "Iconv support");
-    }
-
-    // libwebp lib support
-    if ((CHECK_LIB("libwebp_a.lib", "gd", PHP_GD) || CHECK_LIB("libwebp.lib", "gd", PHP_GD)) &&
-        CHECK_LIB("libsharpyuv.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("decode.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp") &&
-        CHECK_HEADER_ADD_INCLUDE("encode.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp")) {
-        AC_DEFINE("HAVE_LIBWEBP", 1, "WebP support");
-        AC_DEFINE("HAVE_GD_WEBP", 1, "WebP support");
-    }
-
-    // libavif lib support
-    if (CHECK_LIB("avif_a.lib", "gd", PHP_GD) &&
-        CHECK_LIB("aom_a.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("avif.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\avif")) {
-        ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBAVIF /D HAVE_GD_AVIF");
-    } else if (CHECK_LIB("avif.lib", "gd", PHP_GD) &&
-        CHECK_HEADER_ADD_INCLUDE("avif.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\avif")) {
-        ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBAVIF /D HAVE_GD_AVIF");
-    }
-
-    CHECK_LIB("User32.lib", "gd", PHP_GD);
-    CHECK_LIB("Gdi32.lib", "gd", PHP_GD);
-
-    EXTENSION("gd", "gd.c", null, "-Iext/gd/libgd");
-    ADD_SOURCES("ext/gd/libgd", "gd.c \
-        gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \
-        gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c gdhelpers.c gd_io.c gd_io_dp.c \
-        gd_io_file.c gd_io_ss.c gd_jpeg.c gdkanji.c gd_png.c gd_ss.c \
-        gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c gd_xbm.c gd_security.c gd_transform.c \
-        gd_filter.c gd_rotate.c gd_color_match.c gd_webp.c gd_avif.c \
-        gd_crop.c gd_interpolation.c gd_matrix.c gd_bmp.c gd_tga.c", "gd");
-
-    AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
-    AC_DEFINE('HAVE_GD_BUNDLED', 1, "Bundled GD");
-    AC_DEFINE('HAVE_GD_BMP', 1, "BMP support");
-    AC_DEFINE('HAVE_GD_TGA', 1, "TGA support");
-    ADD_FLAG("CFLAGS_GD", " \
-/D PHP_GD_EXPORTS=1 \
-/D HAVE_GD_GET_INTERPOLATION \
-    ");
-    if (ICC_TOOLSET) {
-        ADD_FLAG("LDFLAGS_GD", "/nodefaultlib:libcmt");
-    }
-
-    PHP_INSTALL_HEADERS("", "ext/gd ext/gd/libgd");
-}

src/globals/test-extensions.php

@@ -24,12 +24,12 @@ $test_php_version = [
 // test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
 $test_os = [
     // 'macos-15-intel', // bin/spc for x86_64
-    'macos-15', // bin/spc for arm64
+    // 'macos-15', // bin/spc for arm64
     // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
     'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
-    // 'ubuntu-24.04', // bin/spc for x86_64
+    'ubuntu-24.04', // bin/spc for x86_64
     'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
-    // 'ubuntu-24.04-arm', // bin/spc for arm64
+    'ubuntu-24.04-arm', // bin/spc for arm64
     // 'windows-2022', // .\bin\spc.ps1
     // 'windows-2025',
 ];
@@ -42,31 +42,31 @@ $no_strip = false;
 // compress with upx
 $upx = false;
 
-// whether to test frankenphp build, only available for macOS and linux
-$frankenphp = true;
+// whether to test frankenphp build, only available for macos and linux
+$frankenphp = false;
 
 // prefer downloading pre-built packages to speed up the build process
-$prefer_pre_built = true;
+$prefer_pre_built = false;
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'openssl,brotli',
-    'Windows' => 'bcmath,brotli,bz2,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,iconv,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_pgsql,pgsql,session,simdjson,simplexml,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,zip,zlib',
+    'Linux', 'Darwin' => 'pgsql',
+    'Windows' => 'com_dotnet',
 };
 
 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
 $shared_extensions = match (PHP_OS_FAMILY) {
-    'Linux' => 'zstd',
+    'Linux' => '',
     'Darwin' => '',
     'Windows' => '',
 };
 
 // If you want to test lib-suggests for all extensions and libraries, set it to true.
-$with_suggested_libs = true;
+$with_suggested_libs = false;
 
 // If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true.
 $with_libs = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'krb5',
+    'Linux', 'Darwin' => '',
     'Windows' => '',
 };