v3 base

.github/workflows/release-build.yml

@@ -120,7 +120,7 @@ jobs:
         with:
           files: dist/${{ matrix.operating-system.filename }}
 
-      - name: "Deploy to self-hosted OSS (nightly)"
+      - name: "Deploy to self-hosted OSS"
         # only run this step if the repository is static-php-cli and the branch is main
         if: github.repository == 'crazywhalecc/static-php-cli' && github.ref == 'refs/heads/main'
         uses: static-php/upload-s3-action@v1.0.0
@@ -132,18 +132,6 @@ jobs:
           destination_dir: static-php-cli/spc-bin/nightly/
           endpoint: ${{ secrets.AWS_ENDPOINT }}
 
-      - name: "Deploy to self-hosted OSS (release)"
-        # only run this step if the repository is static-php-cli and release tag
-        if: github.repository == 'crazywhalecc/static-php-cli' && startsWith(github.ref, 'refs/tags/')
-        uses: static-php/upload-s3-action@v1.0.0
-        with:
-          aws_key_id: ${{ secrets.AWS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws_bucket: ${{ secrets.AWS_BUCKET }}
-          source_dir: "dist/"
-          destination_dir: static-php-cli/spc-bin/${{ github.event.release.tag_name }}/
-          endpoint: ${{ secrets.AWS_ENDPOINT }}
-
       - name: "Upload Artifact"
         uses: actions/upload-artifact@v4
         with:

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

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

config/env.ini

@@ -75,10 +75,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:
@@ -117,10 +115,6 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE
 ; 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.
@@ -148,8 +142,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}"
-; minimum compatible macOS version (LLVM vars, availability not guaranteed)
-MACOSX_DEPLOYMENT_TARGET=12.0
 
 [freebsd]
 ; compiler environments

config/ext.json

@@ -43,14 +43,6 @@
     "calendar": {
         "type": "builtin"
     },
-    "com_dotnet": {
-        "support": {
-            "BSD": "no",
-            "Linux": "no",
-            "Darwin": "no"
-        },
-        "type": "builtin"
-    },
     "ctype": {
         "type": "builtin"
     },
@@ -135,14 +127,6 @@
             "sockets"
         ]
     },
-    "excimer": {
-        "support": {
-            "Windows": "wip",
-            "BSD": "wip"
-        },
-        "type": "external",
-        "source": "ext-excimer"
-    },
     "exif": {
         "type": "builtin"
     },
@@ -248,13 +232,11 @@
             "BSD": "wip"
         },
         "type": "external",
-        "source": "ext-grpc",
+        "source": "grpc",
         "arg-type-unix": "enable-path",
         "cpp-extension": true,
         "lib-depends": [
-            "zlib",
+            "grpc"
-            "openssl",
-            "libcares"
         ]
     },
     "iconv": {
@@ -426,7 +408,8 @@
         "ext-depends": [
             "zlib",
             "session"
-        ]
+        ],
+        "build-with-php": true
     },
     "memcached": {
         "support": {
@@ -504,40 +487,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": {
@@ -618,13 +567,6 @@
         "type": "builtin",
         "unix-only": true
     },
-    "pcov": {
-        "type": "external",
-        "source": "pcov",
-        "target": [
-            "shared"
-        ]
-    },
     "pdo": {
         "type": "builtin"
     },

config/lib.json

@@ -361,9 +361,6 @@
         "source": "libargon2",
         "static-libs-unix": [
             "libargon2.a"
-        ],
-        "lib-suggests": [
-            "libsodium"
         ]
     },
     "libavif": {

config/source.json

@@ -126,23 +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-glfw": {
         "type": "git",
         "url": "https://github.com/mario-deluna/php-glfw",
@@ -161,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",
@@ -692,10 +670,9 @@
         }
     },
     "libpng": {
-        "type": "ghtagtar",
+        "type": "git",
-        "repo": "pnggroup/libpng",
+        "url": "https://github.com/glennrp/libpng.git",
-        "match": "v1\\.6\\.\\d+",
+        "rev": "libpng16",
-        "query": "?per_page=150",
         "provide-pre-built": true,
         "license": {
             "type": "file",
@@ -703,9 +680,9 @@
         }
     },
     "librabbitmq": {
-        "type": "ghtar",
+        "type": "git",
-        "repo": "alanxz/rabbitmq-c",
+        "url": "https://github.com/alanxz/rabbitmq-c.git",
-        "prefer-stable": true,
+        "rev": "master",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -722,7 +699,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": {
@@ -794,9 +771,8 @@
         ]
     },
     "libwebp": {
-        "type": "ghtagtar",
+        "type": "url",
-        "repo": "webmproject/libwebp",
+        "url": "https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.2.tar.gz",
-        "match": "v1\\.\\d+\\.\\d+$",
         "provide-pre-built": true,
         "license": {
             "type": "file",
@@ -804,10 +780,8 @@
         }
     },
     "libxml2": {
-        "type": "ghtagtar",
+        "type": "url",
-        "repo": "GNOME/libxml2",
+        "url": "https://github.com/GNOME/libxml2/archive/refs/tags/v2.12.5.tar.gz",
-        "match": "v2\\.\\d+\\.\\d+$",
-        "provide-pre-built": false,
         "license": {
             "type": "file",
             "path": "Copyright"
@@ -894,24 +868,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/",
@@ -1007,15 +963,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",
@@ -1213,8 +1160,9 @@
         }
     },
     "xdebug": {
-        "type": "pie",
+        "type": "url",
-        "repo": "xdebug/xdebug",
+        "url": "https://pecl.php.net/get/xdebug",
+        "filename": "xdebug.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"

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                                                                                  |
+| Event name                   | Event description                                                                                  |
-|---------------------------------|----------------------------------------------------------------------------------------------------|
+|------------------------------|----------------------------------------------------------------------------------------------------|
-| before-libs-extract             | Triggered before the dependent libraries extracted                                                 |
+| before-libs-extract          | Triggered before the dependent libraries extracted                                                 |
-| after-libs-extract              | Triggered after the compiled dependent libraries extracted                                         |
+| after-libs-extract           | Triggered after the compiled dependent libraries extracted                                         |
-| before-php-extract              | Triggered before PHP source code extracted                                                         |
+| before-php-extract           | Triggered before PHP source code extracted                                                         |
-| after-php-extract               | Triggered after PHP source code extracted                                                          |
+| after-php-extract            | Triggered after PHP source code extracted                                                          |
-| before-micro-extract            | Triggered before phpmicro extract                                                                  |
+| before-micro-extract         | Triggered before phpmicro extract                                                                  |
-| after-micro-extract             | Triggered after phpmicro extracted                                                                 |
+| after-micro-extract          | Triggered after phpmicro extracted                                                                 |
-| before-exts-extract             | Triggered before the extension (to be compiled) extracted to the PHP source directory              |
+| 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                                |
+| 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`) |
+| 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-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-php-buildconf         | Triggered before compiling PHP command `./buildconf`                                               |
-| before-shared-ext[*name*]-build | Triggered before the shared extension named `name` is compiled                                     |
+| before-php-configure         | Triggered before compiling PHP command `./configure`                                               |
-| before-php-buildconf            | Triggered before compiling PHP command `./buildconf`                                               |
+| before-php-make              | Triggered before compiling PHP command `make`                                                      |
-| before-php-configure            | Triggered before compiling PHP command `./configure`                                               |
+| before-sanity-check          | Triggered after compiling PHP but before running extended checks                                   |
-| 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/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` 前触发                                     |

src/SPC/ConsoleApplication.php

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

src/SPC/builder/Extension.php

@@ -385,9 +385,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) {
@@ -398,12 +395,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;
@@ -454,17 +452,12 @@ class Extension
 
         // 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);
+        $builder->deployBinary($soFile, $soFile, false);
     }
 
     /**
@@ -542,7 +535,7 @@ class Extension
      */
     protected function getSharedExtensionEnv(): array
     {
-        $config = (new SPCConfigUtil($this->builder, ['no_php' => true]))->getExtensionConfig($this);
+        $config = (new SPCConfigUtil($this->builder))->getExtensionConfig($this);
         [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
         $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
         $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
@@ -550,7 +543,6 @@ class Extension
             'CFLAGS' => $config['cflags'],
             'CXXFLAGS' => $config['cflags'],
             'LDFLAGS' => $config['ldflags'],
-            'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),
             'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ];

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,19 +346,19 @@ 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");
             }
         }
     }
@@ -375,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;
+            if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$name}.pc")) {
-            foreach ($search_paths as $path) {
-                if (file_exists($path . "/{$name}.pc")) {
-                    $found = true;
-                    break;
-                }
-            }
-            if (!$found) {
                 return false;
             }
         }

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

@@ -21,14 +21,18 @@ class grpc extends Extension
         if ($this->builder instanceof WindowsBuilder) {
             throw new ValidationException('grpc extension does not support windows yet');
         }
-        FileSystem::replaceFileStr(
+        if (file_exists(SOURCE_PATH . '/php-src/ext/grpc')) {
-            $this->source_dir . '/src/php/ext/grpc/call.c',
+            return false;
-            'zend_exception_get_default(TSRMLS_C),',
+        }
-            'zend_ce_exception,',
+        // 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(
-                $this->source_dir . '/config.m4',
+                SOURCE_PATH . '/php-src/ext/grpc/config.m4',
                 '/GRPC_LIBDIR=.*$/m',
                 'GRPC_LIBDIR=' . BUILD_LIB_PATH . "\n" . 'LDFLAGS="$LDFLAGS -framework CoreFoundation"'
             );

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 &&
+        if (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
-            (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/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

@@ -24,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/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/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/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';

src/SPC/builder/linux/LinuxBuilder.php

@@ -283,14 +283,11 @@ class LinuxBuilder extends UnixBuilderBase
 
         // process libphp.so for shared embed
         $libphpSo = BUILD_LIB_PATH . '/libphp.so';
-        $libphpSoDest = BUILD_LIB_PATH . '/libphp.so';
         if (file_exists($libphpSo)) {
+            // post actions: rename libphp.so to libphp-<release>.so if -release is set in LDFLAGS
+            $this->processLibphpSoFile($libphpSo);
             // deploy libphp.so
-            preg_match('/-release\s+(\S*)/', getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $matches);
+            $this->deployBinary($libphpSo, $libphpSo, false);
-            if (!empty($matches[1])) {
-                $libphpSoDest = str_replace('.so', '-' . $matches[1] . '.so', $libphpSo);
-            }
-            $this->deployBinary($libphpSo, $libphpSoDest, false);
         }
 
         // process shared extensions build-with-php
@@ -327,6 +324,74 @@ class LinuxBuilder extends UnixBuilderBase
         ]);
     }
 
+    private function processLibphpSoFile(string $libphpSo): void
+    {
+        $ldflags = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') ?: '';
+        $libDir = BUILD_LIB_PATH;
+        $modulesDir = BUILD_MODULES_PATH;
+        $realLibName = 'libphp.so';
+        $cwd = getcwd();
+
+        if (preg_match('/-release\s+(\S+)/', $ldflags, $matches)) {
+            $release = $matches[1];
+            $realLibName = "libphp-{$release}.so";
+            $libphpRelease = "{$libDir}/{$realLibName}";
+            if (!file_exists($libphpRelease) && file_exists($libphpSo)) {
+                rename($libphpSo, $libphpRelease);
+            }
+            if (file_exists($libphpRelease)) {
+                chdir($libDir);
+                if (file_exists($libphpSo)) {
+                    unlink($libphpSo);
+                }
+                symlink($realLibName, 'libphp.so');
+                shell()->exec(sprintf(
+                    'patchelf --set-soname %s %s',
+                    escapeshellarg($realLibName),
+                    escapeshellarg($libphpRelease)
+                ));
+            }
+            if (is_dir($modulesDir)) {
+                chdir($modulesDir);
+                foreach ($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);
+        }
+
+        $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)
+                    ));
+                }
+            }
+        }
+    }
+
     /**
      * Patch micro.sfx after UPX compression.
      * micro needs special section handling in LinuxBuilder.

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()) {
+        if (!SystemUtil::isMuslDist()) {
-            FileSystem::replaceFileStr($this->source_dir . '/configure', 'realpath -s', 'realpath');
+            return false;
-            return true;
         }
-        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,9 +51,6 @@ 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);
 
         shell()->cd($this->source_dir)->initializeEnv($this)
@@ -62,11 +58,10 @@ class openssl extends LinuxLibraryBase
                 "{$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}"
             )
             ->exec('make clean')

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

@@ -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
+        // https://github.com/ziglang/zig/issues/24662
-        if (SPCTarget::getTargetOS() !== 'Linux' || ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+        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

@@ -145,10 +145,11 @@ abstract class UnixBuilderBase extends BuilderBase
             throw new SPCInternalException("Deploy failed. Cannot find file after copy: {$dst}");
         }
 
+        // extract debug info
+        $this->extractDebugInfo($dst);
+
+        // strip
         if (!$this->getOption('no-strip')) {
-            // extract debug info
-            $this->extractDebugInfo($dst);
-            // extra strip
             $this->stripBinary($dst);
         }
 
@@ -235,10 +236,8 @@ abstract class UnixBuilderBase extends BuilderBase
                 $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 +256,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),
+                    'embed failed sanity check: build failed. Error message: ' . implode("\n", $out),
-                    validation_module: $embedType . ' libphp embed build sanity check'
+                    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),
+                    'embed failed sanity check: run failed. Error message: ' . implode("\n", $output),
-                    validation_module: $embedType . ' libphp embed run sanity check'
+                    validation_module: 'static libphp.a sanity check'
                 );
             }
         }

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

@@ -16,11 +16,7 @@ trait gettext
             ->addConfigureArgs(
                 '--disable-java',
                 '--disable-c++',
-                '--disable-d',
+                '--with-included-gettext',
-                '--disable-rpath',
-                '--disable-modula2',
-                '--disable-libasprintf',
-                '--with-included-libintl',
                 "--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)
+        UnixAutoconfExecutor::create($this)->configure()->make();
-            ->appendEnv([
-                'CFLAGS' => '-std=c17',
-            ])
-            ->configure(
-                '--enable-fat'
-            )
-            ->make();
         $this->patchPkgconfPrefix(['gmp.pc']);
     }
 }

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') ?: '';
+            $cmake->addConfigureArgs(
-            $has_avx512 = str_contains($cflags, '-mavx512') || str_contains($cflags, '-march=x86-64-v4');
+                '-DCXX_MAVX512F_SUPPORTED:BOOL=FALSE',
-            if (!$has_avx512) {
+                '-DCXX_MAVX512DQ_SUPPORTED:BOOL=FALSE',
-                $cmake->addConfigureArgs(
+                '-DCXX_MAVX512CD_SUPPORTED:BOOL=FALSE',
-                    '-DCXX_MAVX512F_SUPPORTED:BOOL=FALSE',
+                '-DCXX_MAVX512BW_SUPPORTED:BOOL=FALSE',
-                    '-DCXX_MAVX512DQ_SUPPORTED:BOOL=FALSE',
+                '-DCXX_MAVX512VL_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/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(
+            ->addConfigureArgs('-DWEBP_BUILD_EXTRAS=ON')
-                '-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' : ''
-            )
             ->build();
         // patch pkgconfig
         $this->patchPkgconfPrefix(patch_option: PKGCONF_PATCH_PREFIX | PKGCONF_PATCH_LIBDIR);

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

@@ -16,7 +16,6 @@ trait ncurses
 
         UnixAutoconfExecutor::create($this)
             ->appendEnv([
-                'CFLAGS' => '-std=c17',
                 'LDFLAGS' => SPCTarget::isStatic() ? '-static' : '',
             ])
             ->configure(
@@ -30,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
@@ -35,7 +50,7 @@ trait postgresql
         $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));
 
         $env_vars = [
-            'CFLAGS' => $config['cflags'] . ' -std=c17',
+            'CFLAGS' => $config['cflags'],
             'CPPFLAGS' => '-DPIC',
             'LDFLAGS' => $config['ldflags'],
             'LIBS' => $config['libs'],

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/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 . ' ' .
+                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
-                '-DENABLE_STATIC_CRT=ON ' .
-                '-DENABLE_DOC=OFF ' .
-                '-DBUILD_TESTING=OFF '
             )
             ->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/command/SwitchPhpVersionCommand.php

@@ -20,9 +20,9 @@ class SwitchPhpVersionCommand extends BaseCommand
         $this->addArgument(
             'php-major-version',
             InputArgument::REQUIRED,
-            'PHP major version (supported: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5)',
+            'PHP major version (supported: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4)',
             null,
-            fn () => ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
+            fn () => ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         );
         $this->no_motd = true;
 
@@ -32,7 +32,7 @@ class SwitchPhpVersionCommand extends BaseCommand
     public function handle(): int
     {
         $php_ver = $this->input->getArgument('php-major-version');
-        if (!in_array($php_ver, ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'])) {
+        if (!in_array($php_ver, ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'])) {
             // match x.y.z
             preg_match('/^\d+\.\d+\.\d+$/', $php_ver, $matches);
             if (!$matches) {

src/SPC/doctor/item/LinuxToolCheckList.php

@@ -22,6 +22,7 @@ class LinuxToolCheckList
         'bzip2', 'cmake', 'gcc',
         'g++', 'patch', 'binutils-gold',
         'libtoolize', 'which',
+        'patchelf',
     ];
 
     public const TOOLS_DEBIAN = [
@@ -30,6 +31,7 @@ class LinuxToolCheckList
         'tar', 'unzip', 'gzip', 'gcc', 'g++',
         'bzip2', 'cmake', 'patch',
         'xz', 'libtoolize', 'which',
+        'patchelf',
     ];
 
     public const TOOLS_RHEL = [
@@ -37,7 +39,8 @@ class LinuxToolCheckList
         'git', 'autoconf', 'automake',
         'tar', 'unzip', 'gzip', 'gcc', 'g++',
         'bzip2', 'cmake', 'patch', 'which',
-        'xz', 'libtool', 'gettext-devel', 'file',
+        'xz', 'libtool', 'gettext-devel',
+        'patchelf', 'file',
     ];
 
     public const TOOLS_ARCH = [

src/SPC/store/Downloader.php

@@ -97,9 +97,8 @@ class Downloader
     public static function getLatestGithubTarball(string $name, array $source, string $type = 'releases'): array
     {
         logger()->debug("finding {$name} source from github {$type} tarball");
-        $source['query'] ??= '';
         $data = json_decode(self::curlExec(
-            url: "https://api.github.com/repos/{$source['repo']}/{$type}{$source['query']}",
+            url: "https://api.github.com/repos/{$source['repo']}/{$type}",
             hooks: [[CurlHook::class, 'setupGithubToken']],
             retries: self::getRetryAttempts()
         ), true, 512, JSON_THROW_ON_ERROR);
@@ -109,9 +108,6 @@ class Downloader
             if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
                 continue;
             }
-            if (($rel['draft'] ?? false) === true && (($source['prefer-stable'] ?? false) || !$rel['tarball_url'])) {
-                continue;
-            }
             if (!($source['match'] ?? null)) {
                 $url = $rel['tarball_url'] ?? null;
                 break;

src/SPC/store/FileSystem.php

@@ -408,15 +408,15 @@ class FileSystem
                 continue;
             }
             $sub_file = self::convertPath($dir . '/' . $v);
-            if (is_link($sub_file) || is_file($sub_file)) {
+            if (is_dir($sub_file)) {
-                if (!unlink($sub_file)) {
-                    return false;
-                }
-            } elseif (is_dir($sub_file)) {
                 # 如果是 目录 且 递推 , 则递推添加下级文件
                 if (!self::removeDir($sub_file)) {
                     return false;
                 }
+            } elseif (is_link($sub_file) || is_file($sub_file)) {
+                if (!unlink($sub_file)) {
+                    return false;
+                }
             }
         }
         if (is_link($dir)) {
@@ -572,44 +572,6 @@ class FileSystem
         return file_put_contents($file, implode('', $lines));
     }
 
-    /**
-     * Move file or directory, handling cross-device scenarios
-     * Uses rename() if possible, falls back to copy+delete for cross-device moves
-     *
-     * @param string $source Source path
-     * @param string $dest   Destination path
-     */
-    public static function moveFileOrDir(string $source, string $dest): void
-    {
-        $source = self::convertPath($source);
-        $dest = self::convertPath($dest);
-
-        // Check if source and dest are on the same device to avoid cross-device rename errors
-        $source_stat = @stat($source);
-        $dest_parent = dirname($dest);
-        $dest_stat = @stat($dest_parent);
-
-        // Only use rename if on same device
-        if ($source_stat !== false && $dest_stat !== false && $source_stat['dev'] === $dest_stat['dev']) {
-            if (@rename($source, $dest)) {
-                return;
-            }
-        }
-
-        // Fall back to copy + delete for cross-device moves or if rename failed
-        if (is_dir($source)) {
-            self::copyDir($source, $dest);
-            self::removeDir($source);
-        } else {
-            if (!copy($source, $dest)) {
-                throw new FileSystemException("Failed to copy file from {$source} to {$dest}");
-            }
-            if (!unlink($source)) {
-                throw new FileSystemException("Failed to remove source file: {$source}");
-            }
-        }
-    }
-
     private static function extractArchive(string $filename, string $target): void
     {
         // Create base dir
@@ -686,6 +648,36 @@ class FileSystem
         };
     }
 
+    /**
+     * Move file or directory, handling cross-device scenarios
+     * Uses rename() if possible, falls back to copy+delete for cross-device moves
+     *
+     * @param string $source Source path
+     * @param string $dest   Destination path
+     */
+    private static function moveFileOrDir(string $source, string $dest): void
+    {
+        $source = self::convertPath($source);
+        $dest = self::convertPath($dest);
+
+        // Try rename first (fast, atomic)
+        if (@rename($source, $dest)) {
+            return;
+        }
+
+        if (is_dir($source)) {
+            self::copyDir($source, $dest);
+            self::removeDir($source);
+        } else {
+            if (!copy($source, $dest)) {
+                throw new FileSystemException("Failed to copy file from {$source} to {$dest}");
+            }
+            if (!unlink($source)) {
+                throw new FileSystemException("Failed to remove source file: {$source}");
+            }
+        }
+    }
+
     /**
      * Unzip file with stripping top-level directory
      */

src/SPC/store/SourcePatcher.php

@@ -25,7 +25,6 @@ class SourcePatcher
         FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchFfiCentos7FixO3strncmp']);
         FileSystem::addSourceExtractHook('sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
         FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVWin32']);
-        FileSystem::addSourceExtractHook('pdo_sqlsrv', [__CLASS__, 'patchSQLSRVPhp85']);
         FileSystem::addSourceExtractHook('yaml', [__CLASS__, 'patchYamlWin32']);
         FileSystem::addSourceExtractHook('libyaml', [__CLASS__, 'patchLibYaml']);
         FileSystem::addSourceExtractHook('php-src', [__CLASS__, 'patchImapLicense']);
@@ -433,23 +432,6 @@ class SourcePatcher
         return false;
     }
 
-    /**
-     * Fix the compilation issue of pdo_sqlsrv with php 8.5
-     */
-    public static function patchSQLSRVPhp85(): bool
-    {
-        $source_dir = SOURCE_PATH . '/php-src/ext/pdo_sqlsrv';
-        if (!file_exists($source_dir . '/config.m4') && is_dir($source_dir . '/source/pdo_sqlsrv')) {
-            FileSystem::moveFileOrDir($source_dir . '/LICENSE', $source_dir . '/source/pdo_sqlsrv/LICENSE');
-            FileSystem::moveFileOrDir($source_dir . '/source/shared', $source_dir . '/source/pdo_sqlsrv/shared');
-            FileSystem::moveFileOrDir($source_dir . '/source/pdo_sqlsrv', SOURCE_PATH . '/pdo_sqlsrv');
-            FileSystem::removeDir($source_dir);
-            FileSystem::moveFileOrDir(SOURCE_PATH . '/pdo_sqlsrv', $source_dir);
-            return true;
-        }
-        return false;
-    }
-
     public static function patchYamlWin32(): bool
     {
         FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/yaml/config.w32', "lib.substr(lib.length - 6, 6) == '_a.lib'", "lib.substr(lib.length - 6, 6) == '_a.lib' || 'yes' == 'yes'");

src/SPC/store/pkg/GoXcaddy.php

@@ -48,10 +48,10 @@ class GoXcaddy extends CustomPackage
             'macos' => 'darwin',
             default => throw new \InvalidArgumentException('Unsupported OS: ' . $name),
         };
-        [$go_version] = explode("\n", Downloader::curlExec('https://go.dev/VERSION?m=text'));
+        $go_version = '1.25.0';
         $config = [
             'type' => 'url',
-            'url' => "https://go.dev/dl/{$go_version}.{$os}-{$arch}.tar.gz",
+            'url' => "https://go.dev/dl/go{$go_version}.{$os}-{$arch}.tar.gz",
         ];
         Downloader::downloadPackage($name, $config, $force);
     }

src/SPC/store/pkg/Zig.php

@@ -72,11 +72,8 @@ class Zig extends CustomPackage
 
         $latest_version = null;
         foreach ($index_json as $version => $data) {
-            // Skip the master branch, get the latest stable release
+            $latest_version = $version;
-            if ($version !== 'master') {
+            break;
-                $latest_version = $version;
-                break;
-            }
         }
 
         if (!$latest_version) {

src/SPC/toolchain/ZigToolchain.php

@@ -67,8 +67,7 @@ class ZigToolchain implements ToolchainInterface
         $cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
         $has_avx512 = str_contains($cflags, '-mavx512') || str_contains($cflags, '-march=x86-64-v4');
         if (!$has_avx512) {
-            $extra_vars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
+            GlobalEnvManager::putenv('SPC_EXTRA_PHP_VARS=php_cv_have_avx512=no php_cv_have_avx512vbmi=no');
-            GlobalEnvManager::putenv("SPC_EXTRA_PHP_VARS=php_cv_have_avx512=no php_cv_have_avx512vbmi=no {$extra_vars}");
         }
     }
 

src/SPC/util/SPCConfigUtil.php

@@ -80,6 +80,7 @@ class SPCConfigUtil
         $libs = $this->getLibsString($libraries, !$this->absolute_libs);
 
         // additional OS-specific libraries (e.g. macOS -lresolv)
+        // embed
         if ($extra_libs = SPCTarget::getRuntimeLibs()) {
             $libs .= " {$extra_libs}";
         }
@@ -225,17 +226,9 @@ class SPCConfigUtil
         // parse pkg-configs
         foreach ($libraries as $library) {
             $pc = Config::getLib($library, 'pkg-configs', []);
-            $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
-            $search_paths = array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path));
             foreach ($pc as $file) {
-                $found = false;
+                if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$file}.pc")) {
-                foreach ($search_paths as $path) {
+                    throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$library}] does not exist in '" . BUILD_LIB_PATH . "/pkgconfig'. Please build it first.");
-                    if (file_exists($path . "/{$file}.pc")) {
-                        $found = true;
-                    }
-                }
-                if (!$found) {
-                    throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$library}] does not exist. Please build it first.");
                 }
             }
             $pc_cflags = implode(' ', $pc);
@@ -264,17 +257,9 @@ class SPCConfigUtil
         foreach ($libraries as $library) {
             // add pkg-configs libs
             $pkg_configs = Config::getLib($library, 'pkg-configs', []);
-            $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
+            foreach ($pkg_configs as $pkg_config) {
-            $search_paths = array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path));
+                if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$pkg_config}.pc")) {
-            foreach ($pkg_configs as $file) {
+                    throw new WrongUsageException("pkg-config file '{$pkg_config}.pc' for lib [{$library}] does not exist in '" . BUILD_LIB_PATH . "/pkgconfig'. Please build it first.");
-                $found = false;
-                foreach ($search_paths as $path) {
-                    if (file_exists($path . "/{$file}.pc")) {
-                        $found = true;
-                    }
-                }
-                if (!$found) {
-                    throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$library}] does not exist. Please build it first.");
                 }
             }
             $pkg_configs = implode(' ', $pkg_configs);

src/SPC/util/SPCTarget.php

@@ -27,10 +27,10 @@ class SPCTarget
             return true;
         }
         if (ToolchainManager::getToolchainClass() === GccNativeToolchain::class) {
-            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist() && !getenv('SPC_MUSL_DYNAMIC');
+            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist();
         }
         if (ToolchainManager::getToolchainClass() === ClangNativeToolchain::class) {
-            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist() && !getenv('SPC_MUSL_DYNAMIC');
+            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist();
         }
         // if SPC_LIBC is set, it means the target is static, remove it when 3.0 is released
         if ($target = getenv('SPC_TARGET')) {

src/globals/test-extensions.php

@@ -13,19 +13,19 @@ declare(strict_types=1);
 
 // test php version (8.1 ~ 8.4 available, multiple for matrix)
 $test_php_version = [
-    // '8.1',
+    '8.1',
-    // '8.2',
+    '8.2',
-    // '8.3',
+    '8.3',
-    // '8.4',
+    '8.4',
     '8.5',
     // 'git',
 ];
 
 // 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-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-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-22.04-arm', // bin/spc-gnu-docker for arm64
@@ -35,7 +35,7 @@ $test_os = [
 ];
 
 // whether enable thread safe
-$zts = true;
+$zts = false;
 
 $no_strip = false;
 
@@ -50,8 +50,8 @@ $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' => 'pgsql',
+    'Linux', 'Darwin' => 'maxminddb',
-    'Windows' => 'com_dotnet',
+    'Windows' => 'bcmath',
 };
 
 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).