Merge branch 'main' into feature/shared-exts

.github/workflows/build-unix.yml

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

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

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

.github/workflows/release-build.yml

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

README.md

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

config/env.ini

@@ -34,7 +34,6 @@
 ;   SPC_LINUX_DEFAULT_CC:                   the default compiler for linux. (For alpine linux: `gcc`, default: `$GNU_ARCH-linux-musl-gcc`)
 ;   SPC_LINUX_DEFAULT_CXX:                  the default c++ compiler for linux. (For alpine linux: `g++`, default: `$GNU_ARCH-linux-musl-g++`)
 ;   SPC_LINUX_DEFAULT_AR:                   the default archiver for linux. (For alpine linux: `ar`, default: `$GNU_ARCH-linux-musl-ar`)
-;   SPC_EXTRA_PHP_VARS:                     the extra vars for building php, used in `configure` and `make` command.
 
 [global]
 ; Build concurrency for make -jN, default is CPU_COUNT, this value are used in every libs.

config/ext.json

@@ -759,9 +759,11 @@
         },
         "type": "builtin",
         "arg-type": "custom",
-        "ext-depends": [
-            "libxml",
-            "session"
+        "lib-depends": [
+            "libxml2"
+        ],
+        "ext-depends-windows": [
+            "xml"
         ]
     },
     "sockets": {
@@ -1149,13 +1151,33 @@
         ]
     },
     "zip": {
+        "support": {
+            "BSD": "wip"
+        },
+        "type": "builtin",
+        "arg-type": "with-path",
+        "arg-type-windows": "enable",
+        "lib-depends-unix": [
+            "libzip"
+        ],
+        "ext-depends-windows": [
+            "zlib",
+            "bz2"
+        ],
+        "lib-depends-windows": [
+            "libzip",
+            "zlib",
+            "bzip2",
+            "xz"
+        ]
+    },
+    "zip-shared": {
         "support": {
             "BSD": "wip"
         },
         "type": "external",
         "source": "ext-zip",
-        "arg-type": "custom",
-        "arg-type-windows": "enable",
+        "arg-type": "enable",
         "lib-depends-unix": [
             "libzip"
         ],

config/lib.json

@@ -202,7 +202,6 @@
             "openssl",
             "libcares"
         ],
-        "cpp-library": true,
         "provide-pre-built": true,
         "frameworks": [
             "CoreFoundation"
@@ -231,7 +230,6 @@
     },
     "imagemagick": {
         "source": "imagemagick",
-        "cpp-library": true,
         "pkg-configs": [
             "Magick++-7.Q16HDRI",
             "MagickCore-7.Q16HDRI",
@@ -824,7 +822,6 @@
     },
     "snappy": {
         "source": "snappy",
-        "cpp-library": true,
         "static-libs-unix": [
             "libsnappy.a"
         ],
@@ -870,7 +867,6 @@
     },
     "watcher": {
         "source": "watcher",
-        "cpp-library": true,
         "static-libs-unix": [
             "libwatcher-c.a"
         ],

config/source.json

@@ -266,6 +266,7 @@
     "ext-zip": {
         "type": "url",
         "url": "https://pecl.php.net/get/zip",
+        "path": "php-src/ext/zip-shared",
         "filename": "ext-zip.tgz",
         "license": {
             "type": "file",
@@ -333,7 +334,7 @@
     },
     "grpc": {
         "type": "git",
-        "rev": "v1.75.x",
+        "rev": "v1.68.x",
         "url": "https://github.com/grpc/grpc.git",
         "provide-pre-built": true,
         "license": {
@@ -889,7 +890,7 @@
     "postgresql": {
         "type": "ghtagtar",
         "repo": "postgres/postgres",
-        "match": "REL_18_\\d+",
+        "match": "REL_16_\\d+",
         "license": {
             "type": "file",
             "path": "COPYRIGHT"

src/SPC/ConsoleApplication.php

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

src/SPC/builder/BuilderBase.php

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

src/SPC/builder/Extension.php

@@ -5,11 +5,16 @@ declare(strict_types=1);
 namespace SPC\builder;
 
 use SPC\exception\EnvironmentException;
+use SPC\exception\FileSystemException;
 use SPC\exception\SPCException;
 use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
+use SPC\toolchain\ClangNativeToolchain;
+use SPC\toolchain\GccNativeToolchain;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;
 
@@ -76,7 +81,7 @@ class Extension
     {
         $escapedPath = str_replace("'", '', escapeshellarg(BUILD_ROOT_PATH)) !== BUILD_ROOT_PATH || str_contains(BUILD_ROOT_PATH, ' ') ? escapeshellarg(BUILD_ROOT_PATH) : BUILD_ROOT_PATH;
         $_name = str_replace('_', '-', $this->name);
-        return match ($arg_type = Config::getExt($this->name, 'arg-type', 'enable')) {
+        $arg = match ($arg_type = Config::getExt($this->name, 'arg-type', 'enable')) {
             'enable' => '--enable-' . $_name . ($shared ? '=shared' : '') . ' ',
             'enable-path' => '--enable-' . $_name . '=' . ($shared ? 'shared,' : '') . $escapedPath . ' ',
             'with' => '--with-' . $_name . ($shared ? '=shared' : '') . ' ',
@@ -84,6 +89,7 @@ class Extension
             'none', 'custom' => '',
             default => throw new WrongUsageException("argType does not accept {$arg_type}, use [enable/with/with-path] ."),
         };
+        return str_replace('-shared', '', $arg);
     }
 
     /**
@@ -125,7 +131,7 @@ class Extension
 
     public function getName(): string
     {
-        return $this->name;
+        return str_replace('-shared', '', $this->name);
     }
 
     /**
@@ -133,7 +139,7 @@ class Extension
      */
     public function getDistName(): string
     {
-        return $this->name;
+        return str_replace('-shared', '', $this->name);
     }
 
     public function getWindowsConfigureArg(bool $shared = false): string
@@ -221,24 +227,12 @@ class Extension
     public function patchBeforeSharedMake(): bool
     {
         $config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs()));
-        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
-        $lstdcpp = str_contains($sharedLibs, '-l:libstdc++.a') ? '-l:libstdc++.a' : null;
-        $lstdcpp ??= str_contains($sharedLibs, '-lstdc++') ? '-lstdc++' : '';
-
-        $makefileContent = file_get_contents($this->source_dir . '/Makefile');
-        if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
-            $prefix = $matches[1];
-            $currentLibs = trim($matches[2]);
-            $newLibs = trim("{$currentLibs} {$staticLibs} {$lstdcpp}");
-            $deduplicatedLibs = deduplicate_flags($newLibs);
-
-            FileSystem::replaceFileRegex(
-                $this->source_dir . '/Makefile',
-                '/^(.*_SHARED_LIBADD\s*=.*)$/m',
-                $prefix . $deduplicatedLibs
-            );
-        }
-
+        [$staticLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
+        FileSystem::replaceFileRegex(
+            $this->source_dir . '/Makefile',
+            '/^(.*_SHARED_LIBADD\s*=.*)$/m',
+            '$1 ' . trim($staticLibs)
+        );
         if ($objs = getenv('SPC_EXTRA_RUNTIME_OBJECTS')) {
             FileSystem::replaceFileRegex(
                 $this->source_dir . '/Makefile',
@@ -412,7 +406,42 @@ class Extension
      */
     public function buildUnixShared(): void
     {
-        $env = $this->getSharedExtensionEnv();
+        $config = (new SPCConfigUtil($this->builder))->config(
+            [$this->getName()],
+            array_map(fn ($l) => $l->getName(), $this->getLibraryDependencies(recursive: true)),
+            $this->builder->getOption('with-suggested-exts'),
+            $this->builder->getOption('with-suggested-libs'),
+        );
+        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
+        $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
+        $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
+        $env = [
+            'CFLAGS' => $config['cflags'],
+            'CXXFLAGS' => $config['cflags'],
+            'LDFLAGS' => $config['ldflags'],
+            'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
+            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
+        ];
+        if (str_contains($env['LIBS'], '-lstdc++') && SPCTarget::getTargetOS() === 'Linux') {
+            if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+                $env['SPC_COMPILER_EXTRA'] = '-lstdc++';
+            } elseif (ToolchainManager::getToolchainClass() === GccNativeToolchain::class || ToolchainManager::getToolchainClass() === ClangNativeToolchain::class) {
+                try {
+                    $content = FileSystem::readFile($this->source_dir . '/config.m4');
+                    if ($content && !str_contains($content, 'PHP_ADD_LIBRARY(stdc++')) {
+                        $pattern = '/(PHP_NEW_EXTENSION\(' . $this->name . ',.*\))/m';
+                        $replacement = "$1\nPHP_ADD_LIBRARY(stdc++, 1, " . strtoupper($this->name) . '_SHARED_LIBADD)';
+                        FileSystem::replaceFileRegex(
+                            $this->source_dir . '/config.m4',
+                            $pattern,
+                            $replacement
+                        );
+                    }
+                } catch (FileSystemException) {
+                }
+            }
+        }
+
         if ($this->patchBeforeSharedPhpize()) {
             logger()->info("Extension [{$this->getName()}] patched before shared phpize");
         }
@@ -427,15 +456,13 @@ class Extension
             logger()->info("Extension [{$this->getName()}] patched before shared configure");
         }
 
-        $phpvars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
-
         shell()->cd($this->source_dir)
             ->setEnv($env)
             ->appendEnv($this->getExtraEnv())
             ->exec(
                 './configure ' . $this->getUnixConfigureArg(true) .
                 ' --with-php-config=' . BUILD_BIN_PATH . '/php-config ' .
-                "--enable-shared --disable-static {$phpvars}"
+                '--enable-shared --disable-static'
             );
 
         if ($this->patchBeforeSharedMake()) {
@@ -486,30 +513,6 @@ class Extension
         return $this->build_static;
     }
 
-    /**
-     * Returns the environment variables a shared extension needs to be built.
-     * CFLAGS, CXXFLAGS, LDFLAGS and so on.
-     */
-    protected function getSharedExtensionEnv(): array
-    {
-        $config = (new SPCConfigUtil($this->builder))->config(
-            [$this->getName()],
-            array_map(fn ($l) => $l->getName(), $this->getLibraryDependencies(recursive: true)),
-            $this->builder->getOption('with-suggested-exts'),
-            $this->builder->getOption('with-suggested-libs'),
-        );
-        [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
-        $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';
-        $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group ';
-        return [
-            'CFLAGS' => $config['cflags'],
-            'CXXFLAGS' => $config['cflags'],
-            'LDFLAGS' => $config['ldflags'],
-            'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"),
-            'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
-        ];
-    }
-
     protected function addLibraryDependency(string $name, bool $optional = false): void
     {
         $depLib = $this->builder->getLib($name);
@@ -582,12 +585,12 @@ class Extension
             $added = 0;
             foreach ($ret as $depName => $dep) {
                 foreach ($dep->getDependencies(true) as $depdepName => $depdep) {
-                    if (!array_key_exists($depdepName, $deps)) {
+                    if (!in_array($depdepName, array_keys($deps), true)) {
                         $deps[$depdepName] = $depdep;
                         ++$added;
                     }
                 }
-                if (!array_key_exists($depName, $deps)) {
+                if (!in_array($depName, array_keys($deps), true)) {
                     $deps[$depName] = $dep;
                 }
             }

src/SPC/builder/extension/grpc.php

@@ -56,11 +56,4 @@ class grpc extends Extension
         GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -Wno-strict-prototypes');
         return true;
     }
-
-    protected function getSharedExtensionEnv(): array
-    {
-        $env = parent::getSharedExtensionEnv();
-        $env['CPPFLAGS'] = $env['CXXFLAGS'] . ' -Wno-attributes';
-        return $env;
-    }
 }

src/SPC/builder/extension/simdjson.php

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

src/SPC/builder/extension/zip.php

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

src/SPC/builder/linux/LinuxBuilder.php

@@ -95,8 +95,6 @@ class LinuxBuilder extends UnixBuilderBase
             // 'LIBS' => SPCTarget::getRuntimeLibs(), // do not pass static libraries here yet, they may contain polyfills for libc functions!
         ]);
 
-        $phpvars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
-
         $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
         if ($embed_type !== 'static' && SPCTarget::isStatic()) {
             throw new WrongUsageException(
@@ -118,7 +116,6 @@ class LinuxBuilder extends UnixBuilderBase
                 $json_74 .
                 $zts .
                 $maxExecutionTimers .
-                "{$phpvars} " .
                 $this->makeStaticExtensionArgs() . ' '
         ));
 
@@ -156,14 +153,7 @@ class LinuxBuilder extends UnixBuilderBase
         }
         $shared_extensions = array_map('trim', array_filter(explode(',', $this->getOption('build-shared'))));
         if (!empty($shared_extensions)) {
-            if (SPCTarget::isStatic()) {
-                throw new WrongUsageException(
-                    "You're building against musl libc statically (the default on Linux), but you're trying to build shared extensions.\n" .
-                    'Static musl libc does not implement `dlopen`, so your php binary is not able to load shared extensions.' . "\n" .
-                    'Either use SPC_LIBC=glibc to link against glibc on a glibc OS, or use SPC_TARGET="native-native-musl -dynamic" to link against musl libc dynamically using `zig cc`.'
-                );
-            }
-            logger()->info('Building shared extensions...');
+            logger()->info('Building shared extensions ...');
             $this->buildSharedExts();
         }
     }
@@ -179,19 +169,12 @@ class LinuxBuilder extends UnixBuilderBase
      */
     protected function buildCli(): void
     {
-        if ($this->getExt('readline')) {
-            SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src');
-        }
         $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
         $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
             ->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cli");
 
-        if ($this->getExt('readline')) {
-            SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src', true);
-        }
-
         if (!$this->getOption('no-strip', false)) {
             shell()->cd(SOURCE_PATH . '/php-src/sapi/cli')->exec('strip --strip-unneeded php');
         }

src/SPC/builder/unix/UnixBuilderBase.php

@@ -291,11 +291,11 @@ abstract class UnixBuilderBase extends BuilderBase
             }
         }
         $debugFlags = $this->getOption('no-strip') ? '-w -s ' : '';
-        $extLdFlags = "-extldflags '-pie{$dynamic_exports} {$this->arch_ld_flags}'";
+        $extLdFlags = "-extldflags '-pie{$dynamic_exports}'";
         $muslTags = '';
         $staticFlags = '';
         if (SPCTarget::isStatic()) {
-            $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000{$dynamic_exports} {$this->arch_ld_flags}'";
+            $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000{$dynamic_exports}'";
             $muslTags = 'static_build,';
             $staticFlags = '-static-pie';
         }
@@ -303,6 +303,7 @@ abstract class UnixBuilderBase extends BuilderBase
         $config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list);
         $cflags = "{$this->arch_c_flags} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS');
         $libs = $config['libs'];
+        $libs .= PHP_OS_FAMILY === 'Linux' ? ' -lrt' : '';
         // Go's gcc driver doesn't automatically link against -lgcov or -lrt. Ugly, but necessary fix.
         if ((str_contains((string) getenv('SPC_DEFAULT_C_FLAGS'), '-fprofile') ||
                 str_contains((string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'), '-fprofile')) &&

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

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

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

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

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

@@ -4,83 +4,93 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\builder\linux\library\LinuxLibraryBase;
+use SPC\exception\BuildFailureException;
 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
-        FileSystem::replaceFileStr(
-            "{$this->source_dir}/src/Makefile.shlib",
-            [
-                '$(LINK.shared) -o $@ $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)',
-                '$(INSTALL_SHLIB) $< \'$(DESTDIR)$(pkglibdir)/$(shlib)\'',
-                '$(INSTALL_SHLIB) $< \'$(DESTDIR)$(libdir)/$(shlib)\'',
-                '$(INSTALL_SHLIB) $< \'$(DESTDIR)$(bindir)/$(shlib)\'',
-            ],
-            ''
-        );
-        return true;
-    }
-
     protected function build(): void
     {
-        $libs = array_map(fn ($x) => $x->getName(), $this->getDependencies());
-        $spc = new SPCConfigUtil($this->getBuilder(), ['no_php' => true, 'libs_only_deps' => true]);
-        $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs'));
-
-        $env_vars = [
-            'CFLAGS' => $config['cflags'],
-            'CPPFLAGS' => '-DPIC',
-            'LDFLAGS' => $config['ldflags'],
-            'LIBS' => $config['libs'],
+        $builddir = BUILD_ROOT_PATH;
+        $envs = '';
+        $packages = 'zlib openssl readline libxml-2.0';
+        $optional_packages = [
+            'zstd' => 'libzstd',
+            'ldap' => 'ldap',
+            'libxslt' => 'libxslt',
+            'icu' => 'icu-i18n',
         ];
+        $error_exec_cnt = 0;
 
-        if ($ldLibraryPath = getenv('SPC_LD_LIBRARY_PATH')) {
-            $env_vars['LD_LIBRARY_PATH'] = $ldLibraryPath;
+        foreach ($optional_packages as $lib => $pkg) {
+            if ($this->getBuilder()->getLib($lib)) {
+                $packages .= ' ' . $pkg;
+                $output = shell()->execWithResult("pkg-config --static {$pkg}");
+                $error_exec_cnt += $output[0] === 0 ? 0 : 1;
+                logger()->info(var_export($output[1], true));
+            }
+        }
+
+        $output = shell()->execWithResult("pkg-config --cflags-only-I --static {$packages}");
+        $error_exec_cnt += $output[0] === 0 ? 0 : 1;
+        $macos_15_bug_cflags = PHP_OS_FAMILY === 'Darwin' ? ' -Wno-unguarded-availability-new' : '';
+        $cflags = '';
+        if (!empty($output[1][0])) {
+            $cflags = $output[1][0];
+            $envs .= ' CPPFLAGS="-DPIC"';
+            $cflags = "{$cflags} -fno-ident{$macos_15_bug_cflags}";
+        }
+        $output = shell()->execWithResult("pkg-config --libs-only-L --static {$packages}");
+        $error_exec_cnt += $output[0] === 0 ? 0 : 1;
+        if (!empty($output[1][0])) {
+            $ldflags = $output[1][0];
+            $envs .= SPCTarget::isStatic() ? " LDFLAGS=\"{$ldflags} -static\" " : " LDFLAGS=\"{$ldflags}\" ";
+        }
+        $output = shell()->execWithResult("pkg-config --libs-only-l --static {$packages}");
+        $error_exec_cnt += $output[0] === 0 ? 0 : 1;
+        if (!empty($output[1][0])) {
+            $libs = $output[1][0];
+            $libcpp = '';
+            if ($this->builder->getLib('icu')) {
+                $libcpp = $this instanceof LinuxLibraryBase ? ' -lstdc++' : ' -lc++';
+            }
+            $envs .= " LIBS=\"{$libs}{$libcpp}\" ";
+        }
+        if ($error_exec_cnt > 0) {
+            throw new BuildFailureException('Failed to get pkg-config information!');
         }
 
         FileSystem::resetDir($this->source_dir . '/build');
 
-        // php source relies on the non-private encoding functions in libpgcommon.a
-        FileSystem::replaceFileStr(
-            "{$this->source_dir}/src/common/Makefile",
-            '$(OBJS_FRONTEND): CPPFLAGS += -DUSE_PRIVATE_ENCODING_FUNCS',
-            '$(OBJS_FRONTEND): CPPFLAGS += -UUSE_PRIVATE_ENCODING_FUNCS -DFRONTEND',
-        );
+        $version = $this->getVersion();
+        // 16.1 workaround
+        if (version_compare($version, '16.1') >= 0) {
+            # 有静态链接配置  参考文件： src/interfaces/libpq/Makefile
+            shell()->cd($this->source_dir . '/build')
+                ->exec('sed -i.backup "s/invokes exit\'; exit 1;/invokes exit\';/"  ../src/interfaces/libpq/Makefile')
+                ->exec('sed -i.backup "278 s/^/# /"  ../src/Makefile.shlib')
+                ->exec('sed -i.backup "402 s/^/# /"  ../src/Makefile.shlib');
+        } else {
+            throw new BuildFailureException('Unsupported version for postgresql: ' . $version . ' !');
+        }
 
         // configure
-        $shell = shell()->cd("{$this->source_dir}/build")->initializeEnv($this)
-            ->appendEnv($env_vars)
+        shell()->cd($this->source_dir . '/build')->initializeEnv($this)
+            ->appendEnv(['CFLAGS' => $cflags])
             ->exec(
-                '../configure ' .
-                "--prefix={$this->getBuildRootPath()} " .
+                "{$envs} ../configure " .
+                "--prefix={$builddir} " .
+                ($this->builder->getOption('enable-zts') ? '--enable-thread-safety ' : '--disable-thread-safety ') .
                 '--enable-coverage=no ' .
                 '--with-ssl=openssl ' .
                 '--with-readline ' .
                 '--with-libxml ' .
                 ($this->builder->getLib('icu') ? '--with-icu ' : '--without-icu ') .
                 ($this->builder->getLib('ldap') ? '--with-ldap ' : '--without-ldap ') .
+                // '--without-ldap ' .
                 ($this->builder->getLib('libxslt') ? '--with-libxslt ' : '--without-libxslt ') .
                 ($this->builder->getLib('zstd') ? '--with-zstd ' : '--without-zstd ') .
                 '--without-lz4 ' .
@@ -89,29 +99,32 @@ trait postgresql
                 '--without-pam ' .
                 '--without-bonjour ' .
                 '--without-tcl '
-            );
-
-        // patch ldap lib
-        if ($this->builder->getLib('ldap')) {
-            $libs = PkgConfigUtil::getLibsArray('ldap');
-            $libs = clean_spaces(implode(' ', $libs));
-            FileSystem::replaceFileStr($this->source_dir . '/build/config.status', '-lldap', $libs);
-            FileSystem::replaceFileStr($this->source_dir . '/build/src/Makefile.global', '-lldap', $libs);
-        }
-
-        $shell
-            ->exec('make -C src/bin/pg_config install')
-            ->exec('make -C src/include install')
-            ->exec('make -C src/common install')
-            ->exec('make -C src/port install')
-            ->exec('make -C src/interfaces/libpq install');
+            )
+            ->exec($envs . ' make -C src/bin/pg_config install')
+            ->exec($envs . ' make -C src/include install')
+            ->exec($envs . ' make -C src/common install')
+            ->exec($envs . ' make -C src/port install')
+            ->exec($envs . ' make -C src/interfaces/libpq install');
 
         // remove dynamic libs
         shell()->cd($this->source_dir . '/build')
-            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.so.*")
-            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.so")
-            ->exec("rm -rf {$this->getBuildRootPath()}/lib/*.dylib");
+            ->exec("rm -rf {$builddir}/lib/*.so.*")
+            ->exec("rm -rf {$builddir}/lib/*.so")
+            ->exec("rm -rf {$builddir}/lib/*.dylib");
 
-        FileSystem::replaceFileStr("{$this->getLibDir()}/pkgconfig/libpq.pc", '-lldap', '-lldap -llber');
+        FileSystem::replaceFileStr(BUILD_LIB_PATH . '/pkgconfig/libpq.pc', '-lldap', '-lldap -llber');
+    }
+
+    private function getVersion(): string
+    {
+        try {
+            $file = FileSystem::readFile($this->source_dir . '/meson.build');
+            if (preg_match("/^\\s+version:\\s?'(.*)'/m", $file, $match)) {
+                return $match[1];
+            }
+            return 'unknown';
+        } catch (FileSystemException) {
+            return 'unknown';
+        }
     }
 }

src/SPC/command/BuildPHPCommand.php

@@ -56,6 +56,12 @@ class BuildPHPCommand extends BuildCommand
         $libraries = array_map('trim', array_filter(explode(',', $this->getOption('with-libs'))));
         // transform string to array
         $shared_extensions = array_map('trim', array_filter(explode(',', $this->getOption('build-shared'))));
+        foreach ($shared_extensions as &$ext) {
+            if (array_key_exists($ext . '-shared', Config::getExts())) {
+                $ext .= '-shared';
+            }
+        }
+        unset($ext);
         // transform string to array
         $static_extensions = $this->parseExtensionList($this->getArgument('extensions'));
 
@@ -205,7 +211,7 @@ class BuildPHPCommand extends BuildCommand
         }
 
         // add static-php-cli.version to main.c, in order to debug php failure more easily
-        SourcePatcher::patchSPCVersionToPHP($this->getApplication()->getVersion());
+        SourcePatcher::patchSPCVersionToPHP($this->getApplication()?->getVersion());
 
         // clean old modules that may conflict with the new php build
         FileSystem::removeDir(BUILD_MODULES_PATH);
@@ -244,6 +250,7 @@ class BuildPHPCommand extends BuildCommand
         }
         if (!empty($shared_extensions)) {
             foreach ($shared_extensions as $ext) {
+                $ext = str_replace('-shared', '', $ext);
                 $path = FileSystem::convertPath("{$build_root_path}/modules/{$ext}.so");
                 if (file_exists(BUILD_MODULES_PATH . "/{$ext}.so")) {
                     logger()->info("Shared extension [{$ext}] path{$fixed}: {$path}");

src/SPC/command/DownloadCommand.php

@@ -106,7 +106,7 @@ class DownloadCommand extends BaseCommand
         }
 
         // retry
-        $retry = (int) $this->getOption('retry');
+        $retry = intval($this->getOption('retry'));
         f_putenv('SPC_DOWNLOAD_RETRIES=' . $retry);
 
         // Use shallow-clone can reduce git resource download
@@ -265,7 +265,7 @@ class DownloadCommand extends BaseCommand
             f_passthru((PHP_OS_FAMILY === 'Windows' ? 'rmdir /s /q ' : 'rm -rf ') . DOWNLOAD_PATH);
         }
         // unzip command check
-        if (PHP_OS_FAMILY !== 'Windows' && !self::findCommand('unzip')) {
+        if (PHP_OS_FAMILY !== 'Windows' && !$this->findCommand('unzip')) {
             $this->output->writeln('Missing unzip command, you need to install it first !');
             $this->output->writeln('You can use "bin/spc doctor" command to check and install required tools');
             return static::FAILURE;
@@ -295,6 +295,11 @@ class DownloadCommand extends BaseCommand
      */
     private function calculateSourcesByExt(array $extensions, bool $include_suggests = true): array
     {
+        foreach ($extensions as $ext) {
+            if (array_key_exists($ext . '-shared', Config::getExts())) {
+                $extensions[] = $ext . '-shared';
+            }
+        }
         [$extensions, $libraries] = $include_suggests ? DependencyUtil::getExtsAndLibs($extensions, [], true, true) : DependencyUtil::getExtsAndLibs($extensions);
         $sources = [];
         foreach ($extensions as $extension) {

src/SPC/store/Downloader.php

@@ -65,19 +65,19 @@ class Downloader
             url: "https://api.github.com/repos/{$source['repo']}/{$type}",
             hooks: [[CurlHook::class, 'setupGithubToken']],
             retries: self::getRetryAttempts()
-        ), true, 512, JSON_THROW_ON_ERROR);
+        ), true);
 
         $url = null;
-        foreach ($data as $rel) {
-            if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
+        for ($i = 0; $i < count($data); ++$i) {
+            if (($data[$i]['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
                 continue;
             }
             if (!($source['match'] ?? null)) {
-                $url = $rel['tarball_url'] ?? null;
+                $url = $data[$i]['tarball_url'] ?? null;
                 break;
             }
-            if (preg_match('|' . $source['match'] . '|', $rel['tarball_url'])) {
-                $url = $rel['tarball_url'];
+            if (preg_match('|' . $source['match'] . '|', $data[$i]['tarball_url'])) {
+                $url = $data[$i]['tarball_url'];
                 break;
             }
         }
@@ -232,8 +232,7 @@ class Downloader
         $quiet = !defined('DEBUG_MODE') ? '-q --quiet' : '';
         $git = SPC_GIT_EXEC;
         $shallow = defined('GIT_SHALLOW_CLONE') ? '--depth 1 --single-branch' : '';
-        $recursive = ($submodules === null && defined('GIT_SHALLOW_CLONE')) ? '--recursive --shallow-submodules' : null;
-        $recursive ??= $submodules === null ? '--recursive' : '';
+        $recursive = ($submodules === null) ? '--recursive' : '';
 
         try {
             self::registerCancelEvent(function () use ($download_path) {
@@ -244,9 +243,8 @@ class Downloader
             });
             f_passthru("{$git} clone {$quiet} --config core.autocrlf=false --branch \"{$branch}\" {$shallow} {$recursive} \"{$url}\" \"{$download_path}\"");
             if ($submodules !== null) {
-                $depth_flag = defined('GIT_SHALLOW_CLONE') ? '--depth 1' : '';
                 foreach ($submodules as $submodule) {
-                    f_passthru("cd \"{$download_path}\" && {$git} submodule update --init {$depth_flag} " . escapeshellarg($submodule));
+                    f_passthru("cd \"{$download_path}\" && {$git} submodule update --init " . escapeshellarg($submodule));
                 }
             }
         } catch (SPCException $e) {
@@ -401,7 +399,7 @@ class Downloader
      * Download source
      *
      * @param string $name source name
-     * @param null|array{
+     * @param  null|array{
      *     type: string,
      *     repo: ?string,
      *     url: ?string,
@@ -416,7 +414,7 @@ class Downloader
      *         path: ?string,
      *         text: ?string
      *     }
-     * } $source source meta info: [type, path, rev, url, filename, regex, license]
+     * }          $source  source meta info: [type, path, rev, url, filename, regex, license]
      * @param bool $force       Whether to force download (default: false)
      * @param int  $download_as Lock source type (default: SPC_LOCK_SOURCE)
      */

src/SPC/store/SourceManager.php

@@ -27,6 +27,11 @@ class SourceManager
         }
         // ext check source exist
         if (is_array($exts)) {
+            foreach ($exts as $ext) {
+                if (in_array($ext . '-shared', Config::getExts())) {
+                    $exts[] = $ext . '-shared';
+                }
+            }
             foreach ($exts as $ext) {
                 // get source name for ext
                 if (Config::getExt($ext, 'type') !== 'external') {

src/SPC/store/scripts/zig-cc.sh

@@ -19,15 +19,9 @@ while [[ $# -gt 0 ]]; do
             ARG_ABS="$(realpath "$ARG" 2>/dev/null || true)"
             [[ "$ARG_ABS" == "$BUILDROOT_ABS" ]] && PARSED_ARGS+=("-I$ARG") || PARSED_ARGS+=("-isystem$ARG")
             ;;
-        -march=*|-mcpu=*)
+        -march=*|-mcpu=*) # replace -march=x86-64 with -march=x86_64
             OPT_NAME="${1%%=*}"
             OPT_VALUE="${1#*=}"
-            # Skip armv8- flags entirely as Zig doesn't support them
-            if [[ "$OPT_VALUE" == armv8-* ]]; then
-                shift
-                continue
-            fi
-            # replace -march=x86-64 with -march=x86_64
             OPT_VALUE="${OPT_VALUE//-/_}"
             PARSED_ARGS+=("${OPT_NAME}=${OPT_VALUE}")
             shift

src/SPC/store/source/PhpSource.php

@@ -16,11 +16,11 @@ class PhpSource extends CustomSourceBase
     {
         $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
         if ($major === '8.5') {
-            Downloader::downloadSource('php-src', ['type' => 'url', 'url' => 'https://github.com/php/php-src/archive/refs/tags/php-8.5.0RC2.tar.gz'], $force);
+            Downloader::downloadSource('php-src', ['type' => 'url', 'url' => 'https://downloads.php.net/~edorian/php-8.5.0beta1.tar.xz'], $force);
         } elseif ($major === 'git') {
             Downloader::downloadSource('php-src', ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
         } else {
-            Downloader::downloadSource('php-src', $this->getLatestPHPInfo($major), $force);
+            Downloader::downloadSource('php-src', self::getLatestPHPInfo($major), $force);
         }
     }
 
@@ -33,7 +33,7 @@ class PhpSource extends CustomSourceBase
         // 查找最新的小版本号
         $info = json_decode(Downloader::curlExec(
             url: "https://www.php.net/releases/index.php?json&version={$major_version}",
-            retries: (int) getenv('SPC_DOWNLOAD_RETRIES') ?: 0
+            retries: intval(getenv('SPC_DOWNLOAD_RETRIES') ?: 0)
         ), true);
         if (!isset($info['version'])) {
             throw new DownloaderException("Version {$major_version} not found.");

src/SPC/toolchain/ZigToolchain.php

@@ -64,11 +64,6 @@ class ZigToolchain implements ToolchainInterface
             $extra_libs = trim($extra_libs . ' -lunwind');
             GlobalEnvManager::putenv("SPC_EXTRA_LIBS={$extra_libs}");
         }
-        $cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
-        $has_avx512 = str_contains($cflags, '-mavx512') || str_contains($cflags, '-march=x86-64-v4');
-        if (!$has_avx512) {
-            GlobalEnvManager::putenv('SPC_EXTRA_PHP_VARS=php_cv_have_avx512=no php_cv_have_avx512vbmi=no');
-        }
     }
 
     public function getCompilerInfo(): ?string

src/SPC/util/GlobalEnvManager.php

@@ -40,12 +40,7 @@ class GlobalEnvManager
         if (is_unix()) {
             self::addPathIfNotExists(BUILD_BIN_PATH);
             self::addPathIfNotExists(PKG_ROOT_PATH . '/bin');
-            $pkgConfigPath = getenv('PKG_CONFIG_PATH');
-            if ($pkgConfigPath !== false) {
-                self::putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . "/pkgconfig:{$pkgConfigPath}");
-            } else {
-                self::putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
-            }
+            self::putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
         }
 
         $ini = self::readIniFile();

src/SPC/util/LicenseDumper.php

@@ -50,7 +50,13 @@ class LicenseDumper
             logger()->warning('Target dump directory is not empty, be aware!');
         }
         FileSystem::createDir($target_dir);
+        $exts = $this->exts;
         foreach ($this->exts as $ext) {
+            if (array_key_exists($ext . '-shared', Config::getExts())) {
+                $exts[] = $ext . '-shared';
+            }
+        }
+        foreach ($exts as $ext) {
             if (Config::getExt($ext, 'type') !== 'external') {
                 continue;
             }

src/SPC/util/SPCConfigUtil.php

@@ -6,7 +6,6 @@ namespace SPC\util;
 
 use SPC\builder\BuilderBase;
 use SPC\builder\BuilderProvider;
-use SPC\builder\Extension;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use Symfony\Component\Console\Input\ArgvInput;
@@ -88,7 +87,7 @@ class SPCConfigUtil
         if (SPCTarget::getTargetOS() === 'Darwin') {
             $libs .= " {$this->getFrameworksString($extensions)}";
         }
-        if ($this->hasCpp($extensions, $libraries)) {
+        if ($this->builder->hasCpp()) {
             $libcpp = SPCTarget::getTargetOS() === 'Darwin' ? '-lc++' : '-lstdc++';
             $libs = str_replace($libcpp, '', $libs) . " {$libcpp}";
         }
@@ -124,27 +123,6 @@ class SPCConfigUtil
         ];
     }
 
-    private function hasCpp(array $extensions, array $libraries): bool
-    {
-        // judge cpp-extension
-        $builderExtNames = array_keys($this->builder->getExts(false));
-        $exts = array_unique([...$builderExtNames, ...$extensions]);
-
-        foreach ($exts as $ext) {
-            if (Config::getExt($ext, 'cpp-extension', false) === true) {
-                return true;
-            }
-        }
-        $builderLibNames = array_keys($this->builder->getLibs());
-        $libs = array_unique([...$builderLibNames, ...$libraries]);
-        foreach ($libs as $lib) {
-            if (Config::getLib($lib, 'cpp-library', false) === true) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     private function getIncludesString(array $libraries): string
     {
         $base = BUILD_INCLUDE_PATH;

src/globals/functions.php

@@ -245,23 +245,6 @@ function clean_spaces(string $string): string
     return trim(preg_replace('/\s+/', ' ', $string));
 }
 
-/**
- * Deduplicate flags in a string. Only the last occurence of each flag will be kept.
- *                        E.g. `-lintl -lstdc++ -lphp -lstdc++` becomes `-lintl -lphp -lstdc++`
- *
- * @param  string $flags the string containing flags to deduplicate
- * @return string the deduplicated string with no duplicate flags
- */
-function deduplicate_flags(string $flags): string
-{
-    $tokens = preg_split('/\s+/', trim($flags));
-
-    // Reverse, unique, reverse back - keeps last occurrence of duplicates
-    $deduplicated = array_reverse(array_unique(array_reverse($tokens)));
-
-    return implode(' ', $deduplicated);
-}
-
 /**
  * Register a callback function to handle keyboard interrupts (Ctrl+C).
  *

src/globals/patch/musl_static_readline.patch

@@ -1,26 +0,0 @@
-diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c
-index 31212999..d80a21c3 100644
---- a/ext/readline/readline_cli.c
-+++ b/ext/readline/readline_cli.c
-@@ -739,8 +739,8 @@ typedef cli_shell_callbacks_t *(__cdecl *get_cli_shell_callbacks)(void);
- 	} while(0)
- 
- #else
--/*
- #ifdef COMPILE_DL_READLINE
-+/*
- This dlsym() is always used as even the CGI SAPI is linked against "CLI"-only
- extensions. If that is being changed dlsym() should only be used when building
- this extension sharedto offer compatibility.
-@@ -754,9 +754,9 @@ this extension sharedto offer compatibility.
- 			(cb) = get_callbacks(); \
- 		} \
- 	} while(0)
--/*#else
-+#else
- #define GET_SHELL_CB(cb) (cb) = php_cli_get_shell_callbacks()
--#endif*/
-+#endif
- #endif
- 
- PHP_MINIT_FUNCTION(cli_readline)

src/globals/test-extensions.php

@@ -21,20 +21,21 @@ $test_php_version = [
     // 'git',
 ];
 
-// test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
+// test os (macos-13, macos-14, macos-15, ubuntu-latest, windows-latest are available)
 $test_os = [
-    'macos-15-intel', // bin/spc for x86_64
+    'macos-13', // bin/spc for x86_64
+    // 'macos-14',  // bin/spc for arm64
     'macos-15', // bin/spc for arm64
-    // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
-    // 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
+    'ubuntu-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-22.04-arm', // bin/spc-gnu-docker for arm64
     // 'ubuntu-24.04-arm', // bin/spc for arm64
     // 'windows-latest', // .\bin\spc.ps1
 ];
 
 // whether enable thread safe
-$zts = false;
+$zts = true;
 
 $no_strip = false;
 
@@ -49,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' => 'pdo_pgsql',
+    'Linux', 'Darwin' => 'bcmath',
     'Windows' => 'bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pdo,pdo_mysql,pdo_sqlite,phar,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip',
 };
 
 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
 $shared_extensions = match (PHP_OS_FAMILY) {
-    'Linux' => '',
+    'Linux' => 'zip',
     'Darwin' => '',
     'Windows' => '',
 };
@@ -155,13 +156,17 @@ if ($shared_extensions) {
     switch ($argv[2] ?? null) {
         case 'ubuntu-22.04':
         case 'ubuntu-22.04-arm':
-        case 'macos-15':
-        case 'macos-15-intel':
             $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
             break;
         case 'ubuntu-24.04':
         case 'ubuntu-24.04-arm':
             break;
+        case 'macos-13':
+        case 'macos-14':
+        case 'macos-15':
+            $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
+            $no_strip = true;
+            break;
         default:
             $shared_cmd = '';
             break;

tests/SPC/builder/BuilderTest.php

@@ -62,6 +62,12 @@ class BuilderTest extends TestCase
         $this->assertInstanceOf(Extension::class, $this->builder->getExt('mbregex'));
     }
 
+    public function testHasCpp()
+    {
+        // mbregex doesn't have cpp
+        $this->assertFalse($this->builder->hasCpp());
+    }
+
     public function testMakeExtensionArgs()
     {
         $this->assertStringContainsString('--enable-mbstring', $this->builder->makeStaticExtensionArgs());