forward ld flags to php configure

Co-authored-by: Marc <m@pyc.ac>

.github/workflows/build-unix.yml

@@ -46,6 +46,10 @@ on:
         description: Prefer pre-built binaries (reduce build time)
         type: boolean
         default: true
+      with-suggested-libs:
+        description: Build with suggested libs
+        type: boolean
+        default: false
       debug:
         description: Show full build logs
         type: boolean
@@ -86,6 +90,10 @@ on:
         description: Prefer pre-built binaries (reduce build time)
         type: boolean
         default: true
+      with-suggested-libs:
+        description: Include suggested libs
+        type: boolean
+        default: false
       debug:
         description: Show full build logs
         type: boolean
@@ -157,6 +165,9 @@ jobs:
           if [ ${{ inputs.prefer-pre-built }} == true ]; then
               DOWN_CMD="$DOWN_CMD --prefer-pre-built"
           fi
+          if [ ${{ inputs.with-suggested-libs }} == true ]; then
+              BUILD_CMD="$BUILD_CMD --with-suggested-libs"
+          fi
           if [ ${{ inputs.build-cli }} == true ]; then
               BUILD_CMD="$BUILD_CMD --build-cli"
           fi
@@ -202,6 +213,14 @@ jobs:
 #        if: ${{ failure() }}
 #        uses: mxschmitt/action-tmate@v3
 
+      # Upload debug logs
+      - if: ${{ inputs.debug && failure() }}
+        name: "Upload build logs on failure"
+        uses: actions/upload-artifact@v4
+        with:
+          name: spc-logs-${{ inputs.php-version }}-${{ inputs.os }}
+          path: log/*.log
+
       # Upload cli executable
       - if: ${{ inputs.build-cli == true }}
         name: "Upload PHP cli SAPI"

bin/spc-alpine-docker

@@ -108,8 +108,7 @@ RUN apk update; \
         wget \
         xz \
         gettext-dev \
-        binutils-gold \
-        patchelf
+        binutils-gold
 
 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,11 +92,6 @@ 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,8 +75,10 @@ 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.
 
-; LEGACY option to specify the target
+; option to specify the target, superceded by SPC_TARGET if set
 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:
@@ -115,6 +117,10 @@ 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.
@@ -142,6 +148,8 @@ 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,6 +43,14 @@
     "calendar": {
         "type": "builtin"
     },
+    "com_dotnet": {
+        "support": {
+            "BSD": "no",
+            "Linux": "no",
+            "Darwin": "no"
+        },
+        "type": "builtin"
+    },
     "ctype": {
         "type": "builtin"
     },
@@ -127,6 +135,14 @@
             "sockets"
         ]
     },
+    "excimer": {
+        "support": {
+            "Windows": "wip",
+            "BSD": "wip"
+        },
+        "type": "external",
+        "source": "ext-excimer"
+    },
     "exif": {
         "type": "builtin"
     },
@@ -410,8 +426,7 @@
         "ext-depends": [
             "zlib",
             "session"
-        ],
-        "build-with-php": true
+        ]
     },
     "memcached": {
         "support": {
@@ -500,7 +515,9 @@
             "mysqlnd"
         ],
         "lib-depends": [
-            "libsodium",
+            "libsodium"
+        ],
+        "lib-suggests": [
             "openssl"
         ]
     },
@@ -515,7 +532,9 @@
             "mysqlnd"
         ],
         "lib-depends": [
-            "libsodium",
+            "libsodium"
+        ],
+        "lib-suggests": [
             "openssl"
         ]
     },

config/lib.json

@@ -58,9 +58,6 @@
             "brotlicommon.lib",
             "brotlienc.lib",
             "brotlidec.lib"
-        ],
-        "headers": [
-            "brotli"
         ]
     },
     "bzip2": {
@@ -361,6 +358,9 @@
         "source": "libargon2",
         "static-libs-unix": [
             "libargon2.a"
+        ],
+        "lib-suggests": [
+            "libsodium"
         ]
     },
     "libavif": {
@@ -370,6 +370,15 @@
         ],
         "static-libs-windows": [
             "avif.lib"
+        ],
+        "lib-depends": [
+            "libaom"
+        ],
+        "lib-suggests": [
+            "libwebp",
+            "libjpeg",
+            "libxml2",
+            "libpng"
         ]
     },
     "libcares": {
@@ -850,17 +859,13 @@
     },
     "openssl": {
         "source": "openssl",
-        "static-libs-unix": [
-            "libssl.a",
-            "libcrypto.a"
+        "pkg-configs": [
+            "openssl"
         ],
         "static-libs-windows": [
             "libssl.lib",
             "libcrypto.lib"
         ],
-        "headers": [
-            "openssl"
-        ],
         "lib-depends": [
             "zlib"
         ]
@@ -962,10 +967,10 @@
     },
     "unixodbc": {
         "source": "unixodbc",
-        "static-libs-unix": [
-            "libodbc.a",
-            "libodbccr.a",
-            "libodbcinst.a"
+        "pkg-configs": [
+            "odbc",
+            "odbccr",
+            "odbcinst"
         ],
         "lib-depends": [
             "libiconv"

config/source.json

@@ -126,13 +126,23 @@
     },
     "ext-event": {
         "type": "url",
-        "url": "https://bitbucket.org/osmanov/pecl-event/get/3.0.8.tar.gz",
+        "url": "https://bitbucket.org/osmanov/pecl-event/get/3.1.4.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",
@@ -516,7 +526,7 @@
     "libavif": {
         "type": "ghtar",
         "repo": "AOMediaCodec/libavif",
-        "provide-pre-built": true,
+        "provide-pre-built": false,
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -712,7 +722,7 @@
     "libsodium": {
         "type": "ghrel",
         "repo": "jedisct1/libsodium",
-        "match": "libsodium-\\d+(\\.\\d+)*\\.tar\\.gz",
+        "match": "libsodium-(?!1\\.0\\.21)\\d+(\\.\\d+)*\\.tar\\.gz",
         "prefer-stable": true,
         "provide-pre-built": true,
         "license": {

docs/en/guide/manual-build.md

@@ -549,22 +549,24 @@ otherwise it will be executed repeatedly in other events.
 
 The following are the supported `patch_point` event names and corresponding locations:
 
-| Event name                   | Event description                                                                                  |
-|------------------------------|----------------------------------------------------------------------------------------------------|
-| before-libs-extract          | Triggered before the dependent libraries extracted                                                 |
-| after-libs-extract           | Triggered after the compiled dependent libraries extracted                                         |
-| before-php-extract           | Triggered before PHP source code extracted                                                         |
-| after-php-extract            | Triggered after PHP source code extracted                                                          |
-| before-micro-extract         | Triggered before phpmicro extract                                                                  |
-| after-micro-extract          | Triggered after phpmicro extracted                                                                 |
-| before-exts-extract          | Triggered before the extension (to be compiled) extracted to the PHP source directory              |
-| after-exts-extract           | Triggered after the extension extracted to the PHP source directory                                |
-| before-library[*name*]-build | Triggered before the library named `name` is compiled (such as `before-library[postgresql]-build`) |
-| after-library[*name*]-build  | Triggered after the library named `name` is compiled                                               |
-| before-php-buildconf         | Triggered before compiling PHP command `./buildconf`                                               |
-| before-php-configure         | Triggered before compiling PHP command `./configure`                                               |
-| before-php-make              | Triggered before compiling PHP command `make`                                                      |
-| before-sanity-check          | Triggered after compiling PHP but before running extended checks                                   |
+| Event name                      | Event description                                                                                  |
+|---------------------------------|----------------------------------------------------------------------------------------------------|
+| before-libs-extract             | Triggered before the dependent libraries extracted                                                 |
+| after-libs-extract              | Triggered after the compiled dependent libraries extracted                                         |
+| before-php-extract              | Triggered before PHP source code extracted                                                         |
+| after-php-extract               | Triggered after PHP source code extracted                                                          |
+| before-micro-extract            | Triggered before phpmicro extract                                                                  |
+| after-micro-extract             | Triggered after phpmicro extracted                                                                 |
+| before-exts-extract             | Triggered before the extension (to be compiled) extracted to the PHP source directory              |
+| after-exts-extract              | Triggered after the extension extracted to the PHP source directory                                |
+| before-library[*name*]-build    | Triggered before the library named `name` is compiled (such as `before-library[postgresql]-build`) |
+| after-library[*name*]-build     | Triggered after the library named `name` is compiled                                               |
+| after-shared-ext[*name*]-build  | Triggered after the shared extension named `name` is compiled                                      |
+| before-shared-ext[*name*]-build | Triggered before the shared extension named `name` is compiled                                     |
+| before-php-buildconf            | Triggered before compiling PHP command `./buildconf`                                               |
+| before-php-configure            | Triggered before compiling PHP command `./configure`                                               |
+| before-php-make                 | Triggered before compiling PHP command `make`                                                      |
+| before-sanity-check             | Triggered after compiling PHP but before running extended checks                                   |
 
 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,6 +500,8 @@ 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.7.11';
+    public const string VERSION = '2.8.3';
 
     public function __construct()
     {

src/SPC/builder/Extension.php

@@ -398,13 +398,12 @@ class Extension
                     $dependency->buildShared([...$visited, $this->getName()]);
                 }
             }
-            if (Config::getExt($this->getName(), 'type') === 'addon') {
-                return;
-            }
+            $this->builder->emitPatchPoint('before-shared-ext[' . $this->getName() . ']-build');
             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;
@@ -455,12 +454,17 @@ 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, $soFile, false);
+        $builder->deployBinary($soFile, $soDest, false);
     }
 
     /**
@@ -538,7 +542,7 @@ class Extension
      */
     protected function getSharedExtensionEnv(): array
     {
-        $config = (new SPCConfigUtil($this->builder))->getExtensionConfig($this);
+        $config = (new SPCConfigUtil($this->builder, ['no_php' => true]))->getExtensionConfig($this);
         [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
         $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
         $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
@@ -546,6 +550,7 @@ 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

@@ -177,18 +177,19 @@ abstract class LibraryBase
         if (file_exists($this->source_dir . '/.spc.patched')) {
             $this->patched = true;
         }
+
+        // extract first if not exists, needed for licenses of shared libraries
+        if (!is_dir($this->source_dir)) {
+            $this->getBuilder()->emitPatchPoint('before-library[' . static::NAME . ']-extract');
+            SourceManager::initSource(libs: [static::NAME], source_only: true);
+            $this->getBuilder()->emitPatchPoint('after-library[' . static::NAME . ']-extract');
+        }
+
         // force means just build
         if ($force_build) {
             $type = Config::getLib(static::NAME, 'type', 'lib');
             logger()->info('Building required ' . $type . ' [' . static::NAME . ']');
 
-            // extract first if not exists
-            if (!is_dir($this->source_dir)) {
-                $this->getBuilder()->emitPatchPoint('before-library[' . static::NAME . ']-extract');
-                SourceManager::initSource(libs: [static::NAME], source_only: true);
-                $this->getBuilder()->emitPatchPoint('after-library[' . static::NAME . ']-extract');
-            }
-
             if (!$this->patched && $this->patchBeforeBuild()) {
                 file_put_contents($this->source_dir . '/.spc.patched', 'PATCHED!!!');
             }

src/SPC/builder/extension/com_dotnet.php

@@ -0,0 +1,17 @@
+<?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/memcache.php

@@ -18,6 +18,9 @@ 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',
@@ -44,6 +47,24 @@ 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/password_argon2.php

@@ -24,25 +24,6 @@ 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/spx.php

@@ -45,4 +45,11 @@ 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/linux/LinuxBuilder.php

@@ -93,7 +93,7 @@ class LinuxBuilder extends UnixBuilderBase
         $php_configure_env = SystemUtil::makeEnvVarString([
             'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, // . ' -Dsomethinghere', // . $musl_flag,
-            'LDFLAGS' => '-L' . BUILD_LIB_PATH,
+            'LDFLAGS' => clean_spaces("{$this->arch_ld_flags} -L" . BUILD_LIB_PATH),
             // 'LIBS' => SPCTarget::getRuntimeLibs(), // do not pass static libraries here yet, they may contain polyfills for libc functions!
         ]);
 
@@ -283,11 +283,14 @@ 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
-            $this->deployBinary($libphpSo, $libphpSo, false);
+            preg_match('/-release\s+(\S*)/', getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $matches);
+            if (!empty($matches[1])) {
+                $libphpSoDest = str_replace('.so', '-' . $matches[1] . '.so', $libphpSo);
+            }
+            $this->deployBinary($libphpSo, $libphpSoDest, false);
         }
 
         // process shared extensions build-with-php
@@ -324,74 +327,6 @@ 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/openssl.php

@@ -21,6 +21,7 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
+use SPC\builder\linux\SystemUtil;
 use SPC\store\FileSystem;
 
 class openssl extends LinuxLibraryBase
@@ -51,6 +52,9 @@ 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)
@@ -58,7 +62,7 @@ class openssl extends LinuxLibraryBase
                 "{$env} ./Configure no-shared {$extra} " .
                 '--prefix=' . BUILD_ROOT_PATH . ' ' .
                 '--libdir=' . BUILD_LIB_PATH . ' ' .
-                '--openssldir=/etc/ssl ' .
+                "--openssldir={$openssl_dir} " .
                 "{$zlib_extra}" .
                 'enable-pie ' .
                 'no-legacy ' .

src/SPC/builder/traits/UnixSystemUtilTrait.php

@@ -72,12 +72,8 @@ 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.");
         }
-        // https://github.com/ziglang/zig/issues/24662
-        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            return '-Wl,--export-dynamic';
-        }
-        // macOS
-        if (SPCTarget::getTargetOS() !== 'Linux') {
+        // macOS/zig
+        if (SPCTarget::getTargetOS() !== 'Linux' || ToolchainManager::getToolchainClass() === ZigToolchain::class) {
             return "-Wl,-exported_symbols_list,{$symbol_file}";
         }
         return "-Wl,--dynamic-list={$symbol_file}";

src/SPC/builder/unix/UnixBuilderBase.php

@@ -235,8 +235,10 @@ 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 {
@@ -255,18 +257,19 @@ 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 sanity check: build failed. Error message: ' . implode("\n", $out),
-                    validation_module: 'static libphp.a sanity check'
+                    'embed failed to build. Error message: ' . implode("\n", $out),
+                    validation_module: $embedType . ' libphp embed build 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 sanity check: run failed. Error message: ' . implode("\n", $output),
-                    validation_module: 'static libphp.a sanity check'
+                    'embed failed to run. Error message: ' . implode("\n", $output),
+                    validation_module: $embedType . ' libphp embed run sanity check'
                 );
             }
         }
@@ -362,6 +365,7 @@ abstract class UnixBuilderBase extends BuilderBase
         $frankenphpAppPath = $this->getOption('with-frankenphp-app');
 
         if ($frankenphpAppPath) {
+            $frankenphpAppPath = trim($frankenphpAppPath, "\"'");
             if (!is_dir($frankenphpAppPath)) {
                 throw new WrongUsageException("The path provided to --with-frankenphp-app is not a valid directory: {$frankenphpAppPath}");
             }

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

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

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

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

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

@@ -4,29 +4,14 @@ 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
@@ -50,7 +35,7 @@ trait postgresql
         $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));
 
         $env_vars = [
-            'CFLAGS' => $config['cflags'],
+            'CFLAGS' => $config['cflags'] . ' -std=c17',
             'CPPFLAGS' => '-DPIC',
             'LDFLAGS' => $config['ldflags'],
             'LIBS' => $config['libs'],

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

@@ -30,7 +30,6 @@ 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
@@ -42,9 +41,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(
@@ -53,5 +52,7 @@ 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,11 +29,16 @@ 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)',
+            'PHP major version (supported: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5)',
             null,
-            fn () => ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+            fn () => ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
         );
         $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'])) {
+        if (!in_array($php_ver, ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'])) {
             // match x.y.z
             preg_match('/^\d+\.\d+\.\d+$/', $php_ver, $matches);
             if (!$matches) {

src/SPC/doctor/item/LinuxToolCheckList.php

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

src/SPC/store/pkg/GoXcaddy.php

@@ -30,8 +30,8 @@ class GoXcaddy extends CustomPackage
     public function fetch(string $name, bool $force = false, ?array $config = null): void
     {
         $pkgroot = PKG_ROOT_PATH;
-        $go_exec = "{$pkgroot}/{$name}/bin/go";
-        $xcaddy_exec = "{$pkgroot}/{$name}/bin/xcaddy";
+        $go_exec = "{$pkgroot}/go-xcaddy/bin/go";
+        $xcaddy_exec = "{$pkgroot}/go-xcaddy/bin/xcaddy";
         if ($force) {
             FileSystem::removeDir("{$pkgroot}/{$name}");
         }

src/SPC/util/SPCConfigUtil.php

@@ -80,7 +80,6 @@ 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}";
         }

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();
+            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist() && !getenv('SPC_MUSL_DYNAMIC');
         }
         if (ToolchainManager::getToolchainClass() === ClangNativeToolchain::class) {
-            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist();
+            return PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist() && !getenv('SPC_MUSL_DYNAMIC');
         }
         // 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

@@ -14,20 +14,20 @@ declare(strict_types=1);
 // test php version (8.1 ~ 8.4 available, multiple for matrix)
 $test_php_version = [
     // '8.1',
-    '8.2',
-    '8.3',
-    '8.4',
+    // '8.2',
+    // '8.3',
+    // '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', // 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
+    // 'macos-15-intel', // bin/spc for x86_64
+    // '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-22.04-arm', // bin/spc-gnu-docker for arm64
     // 'ubuntu-24.04-arm', // bin/spc for arm64
     // 'windows-2022', // .\bin\spc.ps1
@@ -50,13 +50,13 @@ $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' => 'mysqli,gmp',
-    'Windows' => 'bcmath',
+    'Linux', 'Darwin' => '',
+    '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' => 'grpc,mysqlnd_parsec,mysqlnd_ed25519',
+    'Linux' => '',
     'Darwin' => '',
     'Windows' => '',
 };
@@ -66,7 +66,7 @@ $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' => 'libwebp',
+    'Linux', 'Darwin' => '',
     'Windows' => '',
 };