test fix 2?

no debug do I can see where it fails

config/env.ini

@@ -71,8 +71,8 @@ CXX=${SPC_LINUX_DEFAULT_CXX}
 AR=${SPC_LINUX_DEFAULT_AR}
 LD=${SPC_LINUX_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
-SPC_DEFAULT_C_FLAGS="-fPIC -Os"
-SPC_DEFAULT_CXX_FLAGS="-fPIC -Os"
+SPC_DEFAULT_C_FLAGS="-fPIC -Os -Wno-error=date-time"
+SPC_DEFAULT_CXX_FLAGS="-fPIC -Os -Wno-error=date-time"
 ; extra libs for building php executable, used in `make` command for building php (this value may changed by extension build process, space separated)
 SPC_EXTRA_LIBS=
 ; upx executable path
@@ -98,15 +98,15 @@ SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS="-I${BUILD_INCLUDE_PATH}"
 ; LDFLAGS for configuring php
 SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
 ; LIBS for configuring php
-SPC_CMD_VAR_PHP_CONFIGURE_LIBS="-ldl -lpthread -lm"
+SPC_CMD_VAR_PHP_CONFIGURE_LIBS="-ldl -lrt -lpthread -lm -lresolv -lutil"
 ; EXTRA_CFLAGS for `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE ${SPC_DEFAULT_C_FLAGS}"
 ; EXTRA_LIBS for `make` php
-SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm"
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lrt -lpthread -lm -lresolv -lutil"
 ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
 ; EXTRA_LDFLAGS_PROGRAM for `make` php
-SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-all-static -Wl,-O1 -pie"
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-all-static -pie"
 
 [macos]
 ; compiler environments

config/pkg.json

@@ -54,5 +54,20 @@
     },
     "go-xcaddy-aarch64-macos": {
         "type": "custom"
+    },
+    "zig-x86_64-linux": {
+        "type": "custom"
+    },
+    "zig-aarch64-linux": {
+        "type": "custom"
+    },
+    "zig-x86_64-macos": {
+        "type": "custom"
+    },
+    "zig-aarch64-macos": {
+        "type": "custom"
+    },
+    "zig-x86_64-win": {
+        "type": "custom"
     }
 }

docs/en/guide/extension-notes.md

@@ -48,17 +48,17 @@ This extension contains an implementation of the coroutine environment for `pdo_
 
 ## swow
 
-1. Only PHP 8.0 ~ 8.4 is supported.
+1. Only PHP 8.0+ is supported.
 
 ## imagick
 
-1. The imagick extension currently only has openmp support on musl libc. This means that multithreading is disabled on glibc or other operating systems. The extension is still fully functional.
+1. OpenMP support is disabled, this is recommended by the maintainers and also the case system packages.
 
 ## imap
 
 1. Kerberos is not supported
-2. ext-imap is not thread safe due to the underlying c-client. It's not possible to use it in --enable-zts builds.
-3. Because the extension may be dropped from php, we recommend you look for an alternative implementation, such as [Webklex/php-imap](https://github.com/Webklex/php-imap)
+2. ext-imap is not thread safe due to the underlying c-client. It's not possible to use it in `--enable-zts` builds.
+3. The extension was dropped from php 8.4, we recommend you look for an alternative implementation, such as [Webklex/php-imap](https://github.com/Webklex/php-imap)
 
 ## gd
 

docs/zh/guide/extension-notes.md

@@ -45,17 +45,17 @@ swoole-hook-sqlite 与 `pdo_sqlite` 扩展冲突。如需使用 Swoole 和 `pdo_
 
 ## swow
 
-1. swow 仅支持 PHP 8.0 ~ 8.4 版本。
+1. swow 仅支持 PHP 8.0+ 版本。
 
 ## imagick
 
-imagick 扩展目前仅在 musl libc 上支持 OpenMP（libgomp）。使用 glibc 方式构建的 imagick 扩展无法支持多线程特性。
+1. OpenMP 支持已被禁用，这是维护者推荐的做法，系统软件包也是如此配置。
 
 ## imap
 
 1. 该扩展目前不支持 Kerberos。
 2. 由于底层的 c-client、ext-imap 不是线程安全的。 无法在 `--enable-zts` 构建中使用它。
-3. 由于该扩展可能会从未来的 PHP 中删除，因此我们建议您寻找替代实现，例如 [Webklex/php-imap](https://github.com/Webklex/php-imap)。
+3. 该扩展已在 PHP 8.4 中被移除，因此我们建议您寻找替代实现，例如 [Webklex/php-imap](https://github.com/Webklex/php-imap)。
 
 ## gd
 

src/SPC/builder/Extension.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
+use SPC\builder\linux\SystemUtil;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
@@ -215,7 +216,16 @@ class Extension
      */
     public function patchBeforeSharedMake(): bool
     {
-        return false;
+        $extra = SystemUtil::getExtraRuntimeObjects();
+        if (!$extra) {
+            return false;
+        }
+        FileSystem::replaceFileRegex(
+            $this->source_dir . '/Makefile',
+            "/^(shared_objects_{$this->getName()}\\s*=.*)$/m",
+            "$1 {$extra}",
+        );
+        return true;
     }
 
     /**
@@ -387,8 +397,8 @@ class Extension
 
         // macOS ld64 doesn't understand these, while Linux and BSD do
         // use them to make sure that all symbols are picked up, even if a library has already been visited before
-        $preStatic = PHP_OS_FAMILY !== 'Darwin' ? '-Wl,-Bstatic -Wl,--start-group ' : '';
-        $postStatic = PHP_OS_FAMILY !== 'Darwin' ? ' -Wl,--end-group -Wl,-Bdynamic ' : ' ';
+        $preStatic = PHP_OS_FAMILY !== 'Darwin' ? '-Wl,--start-group ' : '';
+        $postStatic = PHP_OS_FAMILY !== 'Darwin' ? ' -Wl,--end-group ' : ' ';
         $env = [
             'CFLAGS' => $config['cflags'],
             'CXXFLAGS' => $config['cflags'],
@@ -404,6 +414,7 @@ class Extension
         // prepare configure args
         shell()->cd($this->source_dir)
             ->setEnv($env)
+            ->appendEnv($this->getExtraEnv())
             ->exec(BUILD_BIN_PATH . '/phpize');
 
         if ($this->patchBeforeSharedConfigure()) {
@@ -412,6 +423,7 @@ class Extension
 
         shell()->cd($this->source_dir)
             ->setEnv($env)
+            ->appendEnv($this->getExtraEnv())
             ->exec(
                 './configure ' . $this->getUnixConfigureArg(true) .
                 ' --with-php-config=' . BUILD_BIN_PATH . '/php-config ' .
@@ -431,6 +443,7 @@ class Extension
 
         shell()->cd($this->source_dir)
             ->setEnv($env)
+            ->appendEnv($this->getExtraEnv())
             ->exec('make clean')
             ->exec('make -j' . $this->builder->concurrency)
             ->exec('make install');
@@ -535,6 +548,11 @@ class Extension
         return [trim($staticLibString), trim($sharedLibString)];
     }
 
+    protected function getExtraEnv(): array
+    {
+        return [];
+    }
+
     private function getLibraryDependencies(bool $recursive = false): array
     {
         $ret = array_filter($this->dependencies, fn ($x) => $x instanceof LibraryBase);

src/SPC/builder/extension/imagick.php

@@ -10,31 +10,16 @@ use SPC\util\CustomExt;
 #[CustomExt('imagick')]
 class imagick extends Extension
 {
-    public function patchBeforeMake(): bool
-    {
-        if (PHP_OS_FAMILY !== 'Linux') {
-            return false;
-        }
-        if (getenv('SPC_LIBC') === 'glibc' && str_contains(getenv('CC'), 'devtoolset-10')) {
-            return false;
-        }
-        // imagick with calls omp_pause_all, which requires openmp, on non-musl we build imagick without openmp
-        $extra_libs = trim(getenv('SPC_EXTRA_LIBS') . ' -lgomp');
-        f_putenv('SPC_EXTRA_LIBS=' . $extra_libs);
-        return true;
-    }
-
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        $disable_omp = !(getenv('SPC_LIBC') === 'glibc' && str_contains(getenv('CC'), 'devtoolset-10')) ? '' : ' ac_cv_func_omp_pause_resource_all=no';
-        return '--with-imagick=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . $disable_omp;
+        return '--with-imagick=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . ' ac_cv_func_omp_pause_resource_all=no';
     }
 
     protected function getStaticAndSharedLibs(): array
     {
         // on centos 7, it will use the symbol _ZTINSt6thread6_StateE, which is not defined in system libstdc++.so.6
         [$static, $shared] = parent::getStaticAndSharedLibs();
-        if (getenv('SPC_LIBC') === 'glibc' && str_contains(getenv('CC'), 'devtoolset-10')) {
+        if (str_contains(getenv('CC'), 'devtoolset-10')) {
             $static .= ' -lstdc++';
             $shared = str_replace('-lstdc++', '', $shared);
         }

src/SPC/builder/extension/pgsql.php

@@ -57,4 +57,11 @@ class pgsql extends Extension
         }
         return '--with-pgsql=' . BUILD_ROOT_PATH;
     }
+
+    protected function getExtraEnv(): array
+    {
+        return [
+            'CFLAGS' => '-Wno-int-conversion',
+        ];
+    }
 }

src/SPC/builder/extension/swoole.php

@@ -7,6 +7,7 @@ namespace SPC\builder\extension;
 use SPC\builder\Extension;
 use SPC\builder\macos\MacOSBuilder;
 use SPC\store\FileSystem;
+use SPC\store\SourcePatcher;
 use SPC\util\CustomExt;
 
 #[CustomExt('swoole')]
@@ -14,13 +15,18 @@ class swoole extends Extension
 {
     public function patchBeforeMake(): bool
     {
+        $patched = false;
+        if (PHP_OS_FAMILY === 'Linux') {
+            SourcePatcher::patchFile('swoole_fix_date_time.patch', $this->source_dir);
+            $patched = true;
+        }
         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';
             FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/swoole/thirdparty/php/standard/proc_open.cc', 'include <util.h>', 'include "' . $util_path . '"');
-            return true;
+            $patched = true;
         }
-        return false;
+        return $patched;
     }
 
     public function getExtVersion(): ?string

src/SPC/builder/extension/uv.php

@@ -20,6 +20,7 @@ class uv extends Extension
 
     public function patchBeforeSharedMake(): bool
     {
+        parent::patchBeforeSharedMake();
         if (PHP_OS_FAMILY !== 'Linux' || arch2gnu(php_uname('m')) !== 'aarch64') {
             return false;
         }

src/SPC/builder/linux/LinuxBuilder.php

@@ -30,7 +30,7 @@ class LinuxBuilder extends UnixBuilderBase
 
         GlobalEnvManager::init();
 
-        if (getenv('SPC_LIBC') === 'musl' && !SystemUtil::isMuslDist()) {
+        if (getenv('SPC_LIBC') === 'musl' && !SystemUtil::isMuslDist() && !str_contains((string) getenv('CC'), 'zig')) {
             $this->setOptionIfNotExist('library_path', "LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\"");
             $this->setOptionIfNotExist('ld_library_path', "LD_LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\"");
             $configure = getenv('SPC_CMD_PREFIX_PHP_CONFIGURE');
@@ -80,6 +80,7 @@ class LinuxBuilder extends UnixBuilderBase
         }
         // add libstdc++, some extensions or libraries need it
         $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCpp() ? '-lstdc++ ' : '');
+        $extra_libs .= (SystemUtil::getCCType() === 'clang' ? ' -lunwind' : '');
         f_putenv('SPC_EXTRA_LIBS=' . $extra_libs);
         $cflags = $this->arch_c_flags;
         f_putenv('CFLAGS=' . $cflags);
@@ -103,6 +104,10 @@ class LinuxBuilder extends UnixBuilderBase
             $zts = '';
         }
         $disable_jit = $this->getOption('disable-opcache-jit', false) ? '--disable-opcache-jit ' : '';
+        $cc = trim(getenv('CC'));
+        if (!$disable_jit && $this->getExt('opcache') && str_contains($cc, 'zig')) {
+            f_putenv("CC={$cc} -fno-sanitize=undefined");
+        }
 
         $config_file_path = $this->getOption('with-config-file-path', false) ?
             ('--with-config-file-path=' . $this->getOption('with-config-file-path') . ' ') : '';
@@ -134,6 +139,9 @@ class LinuxBuilder extends UnixBuilderBase
         }
 
         $embed_type = getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') ?: 'static';
+        if ($embed_type !== 'static' && getenv('SPC_LIBC') === 'musl') {
+            throw new WrongUsageException('Musl libc does not support dynamic linking of PHP embed!');
+        }
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec(
                 getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
@@ -175,6 +183,9 @@ class LinuxBuilder extends UnixBuilderBase
             }
             $this->buildEmbed();
         }
+        if (!$disable_jit && $this->getExt('opcache') && str_contains($cc, 'zig')) {
+            f_putenv("CC={$cc}");
+        }
         if ($enableFrankenphp) {
             logger()->info('building frankenphp');
             $this->buildFrankenphp();
@@ -289,34 +300,48 @@ class LinuxBuilder extends UnixBuilderBase
             ->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . ' INSTALL_ROOT=' . BUILD_ROOT_PATH . " {$vars} install");
 
         $ldflags = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS');
+        $realLibName = 'libphp.so';
         if (preg_match('/-release\s+(\S+)/', $ldflags, $matches)) {
             $release = $matches[1];
             $realLibName = 'libphp-' . $release . '.so';
-            $realLib = BUILD_LIB_PATH . '/' . $realLibName;
-            rename(BUILD_LIB_PATH . '/libphp.so', $realLib);
             $cwd = getcwd();
-            chdir(BUILD_LIB_PATH);
-            symlink($realLibName, 'libphp.so');
-            chdir(BUILD_MODULES_PATH);
-            foreach ($this->getExts() as $ext) {
-                if (!$ext->isBuildShared()) {
-                    continue;
+            $libphpPath = BUILD_LIB_PATH . '/libphp.so';
+            $libphpRelease = BUILD_LIB_PATH . '/' . $realLibName;
+            if (!file_exists($libphpRelease) && file_exists($libphpPath)) {
+                rename($libphpPath, $libphpRelease);
+            }
+            if (file_exists($libphpRelease)) {
+                chdir(BUILD_LIB_PATH);
+                if (file_exists($libphpPath)) {
+                    unlink($libphpPath);
                 }
-                $name = $ext->getName();
-                $versioned = "{$name}-{$release}.so";
-                $unversioned = "{$name}.so";
-                if (is_file(BUILD_MODULES_PATH . "/{$versioned}")) {
-                    rename(BUILD_MODULES_PATH . "/{$versioned}", BUILD_MODULES_PATH . "/{$unversioned}");
-                    shell()->cd(BUILD_MODULES_PATH)
-                        ->exec(sprintf(
-                            'patchelf --set-soname %s %s',
-                            escapeshellarg($unversioned),
-                            escapeshellarg($unversioned)
-                        ));
+                symlink($realLibName, 'libphp.so');
+            }
+            if (is_dir(BUILD_MODULES_PATH)) {
+                chdir(BUILD_MODULES_PATH);
+                foreach ($this->getExts() as $ext) {
+                    if (!$ext->isBuildShared()) {
+                        continue;
+                    }
+                    $name = $ext->getName();
+                    $versioned = "{$name}-{$release}.so";
+                    $unversioned = "{$name}.so";
+                    if (is_file(BUILD_MODULES_PATH . "/{$versioned}")) {
+                        rename(BUILD_MODULES_PATH . "/{$versioned}", BUILD_MODULES_PATH . "/{$unversioned}");
+                        shell()->cd(BUILD_MODULES_PATH)
+                            ->exec(sprintf(
+                                'patchelf --set-soname %s %s',
+                                escapeshellarg($unversioned),
+                                escapeshellarg($unversioned)
+                            ));
+                    }
                 }
             }
             chdir($cwd);
         }
+        if (!$this->getOption('no-strip', false) && file_exists(BUILD_LIB_PATH . '/' . $realLibName)) {
+            shell()->cd(BUILD_LIB_PATH)->exec("strip --strip-all {$realLibName}");
+        }
         $this->patchPhpScripts();
     }
 

src/SPC/builder/linux/SystemUtil.php

@@ -13,6 +13,8 @@ class SystemUtil
 
     public static ?string $libc_version = null;
 
+    private static ?string $extra_runtime_objects = null;
+
     /** @noinspection PhpMissingBreakStatementInspection */
     public static function getOSRelease(): array
     {
@@ -78,9 +80,11 @@ class SystemUtil
     /**
      * @throws RuntimeException
      */
-    public static function getCCType(string $cc): string
+    public static function getCCType(?string $cc = null): string
     {
+        $cc ??= getenv('CC');
         return match (true) {
+            str_contains($cc, 'zig') => 'clang',
             str_ends_with($cc, 'c++'), str_ends_with($cc, 'cc'), str_ends_with($cc, 'g++'), str_ends_with($cc, 'gcc') => 'gcc',
             $cc === 'clang++', $cc === 'clang', str_starts_with($cc, 'musl-clang') => 'clang',
             default => throw new RuntimeException("unknown cc type: {$cc}"),
@@ -224,4 +228,38 @@ class SystemUtil
         }
         return null;
     }
+
+    public static function getExtraRuntimeObjects(): string
+    {
+        $cc = getenv('CC');
+        if (!$cc || !str_contains($cc, 'zig')) {
+            return '';
+        }
+
+        if (self::$extra_runtime_objects !== null) {
+            return self::$extra_runtime_objects;
+        }
+
+        $paths = ['/usr/lib/gcc', '/usr/local/lib/gcc'];
+        $objects = ['crtbeginS.o', 'crtendS.o'];
+        $found = [];
+
+        foreach ($objects as $obj) {
+            $located = null;
+            foreach ($paths as $base) {
+                $output = shell_exec("find {$base} -name {$obj} -print -quit 2>/dev/null");
+                $line = trim((string) $output);
+                if ($line !== '') {
+                    $located = $line;
+                    break;
+                }
+            }
+            if ($located) {
+                $found[] = $located;
+            }
+        }
+
+        self::$extra_runtime_objects = implode(' ', $found);
+        return implode(' ', $found);
+    }
 }

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

@@ -62,7 +62,8 @@ class openssl extends LinuxLibraryBase
 
         $ex_lib = trim($ex_lib);
 
-        $clang_postfix = SystemUtil::getCCType(getenv('CC')) === 'clang' ? '-clang' : '';
+        /* @phpstan-ignore-next-line */
+        $clang_postfix = SystemUtil::getCCType() === 'clang' && (GNU_ARCH === 'x86_64' || PHP_OS_FAMILY === 'Darwin') ? '-clang' : '';
 
         shell()->cd($this->source_dir)->initializeEnv($this)
             ->exec(

src/SPC/builder/traits/UnixLibraryTrait.php

@@ -119,9 +119,9 @@ trait UnixLibraryTrait
     {
         $env = getenv($this->getSnakeCaseName() . '_CFLAGS') ?: '';
         if (!str_contains($env, $this->builder->arch_c_flags)) {
-            $env .= $this->builder->arch_c_flags;
+            $env .= ' ' . $this->builder->arch_c_flags;
         }
-        return $env;
+        return trim($env);
     }
 
     public function getLibExtraLdFlags(): string
@@ -138,8 +138,8 @@ trait UnixLibraryTrait
     {
         $env = getenv($this->getSnakeCaseName() . '_CXXFLAGS') ?: '';
         if (!str_contains($env, $this->builder->arch_cxx_flags)) {
-            $env .= $this->builder->arch_cxx_flags;
+            $env .= ' ' . $this->builder->arch_cxx_flags;
         }
-        return $env;
+        return trim($env);
     }
 }

src/SPC/builder/unix/UnixBuilderBase.php

@@ -15,7 +15,9 @@ use SPC\store\Config;
 use SPC\store\CurlHook;
 use SPC\store\Downloader;
 use SPC\store\FileSystem;
+use SPC\store\pkg\GoXcaddy;
 use SPC\util\DependencyUtil;
+use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
 
 abstract class UnixBuilderBase extends BuilderBase
@@ -203,18 +205,20 @@ abstract class UnixBuilderBase extends BuilderBase
             if (PHP_OS_FAMILY === 'Linux' && getenv('SPC_LIBC') === 'musl') {
                 $lens .= ' -static';
             }
+            // if someone changed to EMBED_TYPE=shared, we need to add LD_LIBRARY_PATH
+            if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
+                $ext_path = 'LD_LIBRARY_PATH=' . BUILD_LIB_PATH . ':$LD_LIBRARY_PATH ';
+                FileSystem::removeFileIfExists(BUILD_LIB_PATH . '/libphp.a');
+            } else {
+                $ext_path = '';
+                foreach (glob(BUILD_LIB_PATH . '/libphp*.so') as $file) {
+                    unlink($file);
+                }
+            }
             [$ret, $out] = shell()->cd($sample_file_path)->execWithResult(getenv('CC') . ' -o embed embed.c ' . $lens);
             if ($ret !== 0) {
                 throw new RuntimeException('embed failed sanity check: build failed. Error message: ' . implode("\n", $out));
             }
-            // if someone changed to --enable-embed=shared, we need to add LD_LIBRARY_PATH
-            if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
-                $ext_path = 'LD_LIBRARY_PATH=' . BUILD_ROOT_PATH . '/lib:$LD_LIBRARY_PATH ';
-                FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '/lib/libphp.a');
-            } else {
-                $ext_path = '';
-                FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '/lib/libphp.so');
-            }
             [$ret, $output] = shell()->cd($sample_file_path)->execWithResult($ext_path . './embed');
             if ($ret !== 0 || trim(implode('', $output)) !== 'hello') {
                 throw new RuntimeException('embed failed sanity check: run failed. Error message: ' . implode("\n", $output));
@@ -301,18 +305,6 @@ abstract class UnixBuilderBase extends BuilderBase
      */
     protected function buildFrankenphp(): void
     {
-        $os = match (PHP_OS_FAMILY) {
-            'Linux' => 'linux',
-            'Windows' => 'win',
-            'Darwin' => 'macos',
-            'BSD' => 'freebsd',
-            default => throw new RuntimeException('Unsupported OS: ' . PHP_OS_FAMILY),
-        };
-        $arch = arch2gnu(php_uname('m'));
-
-        // define executables for go and xcaddy
-        $xcaddy_exec = PKG_ROOT_PATH . "/go-xcaddy-{$arch}-{$os}/bin/xcaddy";
-
         $nobrotli = $this->getLib('brotli') === null ? ',nobrotli' : '';
         $nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : '';
         $xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES');
@@ -325,7 +317,10 @@ abstract class UnixBuilderBase extends BuilderBase
             $xcaddyModules = str_replace('--with github.com/dunglas/caddy-cbrotli', '', $xcaddyModules);
         }
         $lrt = PHP_OS_FAMILY === 'Linux' ? '-lrt' : '';
-        $releaseInfo = json_decode(Downloader::curlExec('https://api.github.com/repos/php/frankenphp/releases/latest', retries: 3, hooks: [[CurlHook::class, 'setupGithubToken']]), true);
+        $releaseInfo = json_decode(Downloader::curlExec(
+            'https://api.github.com/repos/php/frankenphp/releases/latest',
+            hooks: [[CurlHook::class, 'setupGithubToken']],
+        ), true);
         $frankenPhpVersion = $releaseInfo['tag_name'];
         $libphpVersion = $this->getPHPVersion();
         if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
@@ -334,21 +329,19 @@ abstract class UnixBuilderBase extends BuilderBase
         $debugFlags = $this->getOption('no-strip') ? "'-w -s' " : '';
         $extLdFlags = "-extldflags '-pie'";
         $muslTags = '';
+        $staticFlags = '';
         if (PHP_OS_FAMILY === 'Linux' && getenv('SPC_LIBC') === 'musl') {
             $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000'";
             $muslTags = 'static_build,';
+            $staticFlags = '-static -static-pie';
         }
 
         $config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list, with_dependencies: true);
 
         $env = [
-            'PATH' => PKG_ROOT_PATH . "/go-xcaddy-{$arch}-{$os}/bin:" . getenv('PATH'),
-            'GOROOT' => PKG_ROOT_PATH . "/go-xcaddy-{$arch}-{$os}",
-            'GOBIN' => PKG_ROOT_PATH . "/go-xcaddy-{$arch}-{$os}/bin",
-            'GOPATH' => PKG_ROOT_PATH . '/go',
             'CGO_ENABLED' => '1',
             'CGO_CFLAGS' => $config['cflags'],
-            'CGO_LDFLAGS' => "{$config['ldflags']} {$config['libs']} {$lrt}",
+            'CGO_LDFLAGS' => "{$staticFlags} {$config['ldflags']} {$config['libs']} {$lrt}",
             'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
                 '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' . $debugFlags .
                 '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .
@@ -356,8 +349,19 @@ abstract class UnixBuilderBase extends BuilderBase
                 "-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ];
+        foreach (GoXcaddy::getEnvironment() as $key => $value) {
+            if ($key === 'PATH') {
+                GlobalEnvManager::addPathIfNotExists($value);
+            } else {
+                $env[$key] = $value;
+            }
+        }
         shell()->cd(BUILD_BIN_PATH)
             ->setEnv($env)
-            ->exec("{$xcaddy_exec} build --output frankenphp {$xcaddyModules}");
+            ->exec("xcaddy build --output frankenphp {$xcaddyModules}");
+
+        if (!$this->getOption('no-strip', false) && file_exists(BUILD_BIN_PATH . '/frankenphp')) {
+            shell()->cd(BUILD_BIN_PATH)->exec('strip --strip-all frankenphp');
+        }
     }
 }

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

@@ -15,6 +15,9 @@ trait attr
     protected function build(): void
     {
         UnixAutoconfExecutor::create($this)
+            ->appendEnv([
+                'CFLAGS' => '-Wno-int-conversion -Wno-implicit-function-declaration',
+            ])
             ->exec('libtoolize --force --copy')
             ->exec('./autogen.sh || autoreconf -if')
             ->configure('--disable-nls')

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

@@ -31,7 +31,7 @@ trait gettext
             $autoconf->addConfigureArgs('--disable-threads');
         }
 
-        $autoconf->configure()->make(with_clean: true);
+        $autoconf->configure()->make();
         $this->patchLaDependencyPrefix();
     }
 }

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

@@ -32,8 +32,7 @@ trait imagemagick
             ->optionalLib('freetype', ...ac_with_args('freetype'))
             ->optionalLib('bzip2', ...ac_with_args('bzlib'))
             ->addConfigureArgs(
-                // TODO: glibc rh 10 toolset's libgomp.a was built without -fPIC so we can't use openmp without depending on libgomp.so
-                getenv('SPC_LIBC') === 'glibc' && str_contains(getenv('CC'), 'devtoolset-10') ? '--disable-openmp' : '--enable-openmp',
+                '--disable-openmp',
                 '--without-jxl',
                 '--without-x',
             );

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

@@ -26,8 +26,10 @@ trait ldap
                 '--disable-slapd',
                 '--without-systemd',
                 '--without-cyrus-sasl',
+                'ac_cv_func_pthread_kill_other_threads_np=no'
             )
             ->appendEnv([
+                'CFLAGS' => '-Wno-date-time',
                 'LDFLAGS' => "-L{$this->getLibDir()}",
                 'CPPFLAGS' => "-I{$this->getIncludeDir()}",
             ])

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

@@ -16,10 +16,20 @@ trait libaom
      */
     protected function build(): void
     {
+        $cc = getenv('CC');
+        $cxx = getenv('CXX');
+        if (str_contains($cc, 'zig') && getenv('SPC_LIBC') === 'musl') {
+            putenv('CC=' . $cc . ' -D_POSIX_SOURCE');
+            putenv('CXX=' . $cxx . ' -D_POSIX_SOURCE');
+        }
         UnixCMakeExecutor::create($this)
             ->setBuildDir("{$this->source_dir}/builddir")
             ->addConfigureArgs('-DAOM_TARGET_CPU=generic')
             ->build();
+        if (str_contains($cc, 'zig') && getenv('SPC_LIBC') === 'musl') {
+            putenv('CC=' . $cc);
+            putenv('CXX=' . $cxx);
+        }
         $this->patchPkgconfPrefix(['aom.pc']);
     }
 }

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

@@ -19,7 +19,11 @@ trait liblz4
     {
         shell()->cd($this->source_dir)->initializeEnv($this)
             ->exec("make PREFIX='' clean")
-            ->exec("make -j{$this->builder->concurrency} PREFIX=''")
+            ->exec("make lib -j{$this->builder->concurrency} PREFIX=''");
+
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', '$(MAKE) -C $(PRGDIR) $@', '');
+
+        shell()->cd($this->source_dir)
             ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH);
 
         $this->patchPkgconfPrefix(['liblz4.pc']);

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

@@ -6,6 +6,7 @@ namespace SPC\builder\unix\library;
 
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
 use SPC\util\executor\UnixAutoconfExecutor;
 
 trait librdkafka
@@ -16,7 +17,18 @@ trait librdkafka
      */
     protected function build(): void
     {
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/lds-gen.py',
+            "funcs.append('rd_ut_coverage_check')",
+            ''
+        );
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/src/rd.h',
+            '#error "IOV_MAX not defined"',
+            "#define IOV_MAX 1024\n#define __GNU__"
+        );
         UnixAutoconfExecutor::create($this)
+            ->appendEnv(['CFLAGS' => '-Wno-int-conversion -Wno-unused-but-set-variable -Wno-unused-variable'])
             ->optionalLib(
                 'zstd',
                 function ($lib) {

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

@@ -14,6 +14,9 @@ trait ncurses
         $filelist = FileSystem::scanDirFiles(BUILD_BIN_PATH, relative: true);
 
         UnixAutoconfExecutor::create($this)
+            ->appendEnv([
+                'LDFLAGS' => getenv('SPC_LIBC') === 'musl' ? '-static' : '',
+            ])
             ->configure(
                 '--enable-overwrite',
                 '--with-curses-h',

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

@@ -13,7 +13,7 @@ trait pkgconfig
     {
         UnixAutoconfExecutor::create($this)
             ->appendEnv([
-                'CFLAGS' => PHP_OS_FAMILY !== 'Linux' ? '-Wimplicit-function-declaration -Wno-int-conversion' : '',
+                'CFLAGS' => '-Wimplicit-function-declaration -Wno-int-conversion',
                 'LDFLAGS' => !($this instanceof LinuxLibraryBase) || getenv('SPC_LIBC') === 'glibc' ? '' : '--static',
             ])
             ->configure(

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

@@ -18,7 +18,7 @@ trait watcher
     {
         shell()->cd($this->source_dir . '/watcher-c')
             ->initializeEnv($this)
-            ->exec(getenv('CC') . ' -c -o libwatcher-c.o ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -Wall -Wextra -fPIC')
+            ->exec(getenv('CXX') . ' -c -o libwatcher-c.o ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -Wall -Wextra -fPIC')
             ->exec(getenv('AR') . ' rcs libwatcher-c.a libwatcher-c.o');
 
         copy($this->source_dir . '/watcher-c/libwatcher-c.a', BUILD_LIB_PATH . '/libwatcher-c.a');

src/SPC/doctor/item/LinuxMuslCheck.php

@@ -29,6 +29,9 @@ class LinuxMuslCheck
         if (getenv('SPC_LIBC') === 'glibc') {
             return CheckResult::ok('Building with glibc, skipped');
         }
+        if (str_contains(getenv('CC'), 'zig')) {
+            return CheckResult::ok('Building with zig, skipped');
+        }
 
         $musl_wrapper_lib = sprintf('/lib/ld-musl-%s.so.1', php_uname('m'));
         if (file_exists($musl_wrapper_lib) && file_exists('/usr/local/musl/lib/libc.a')) {
@@ -46,6 +49,9 @@ class LinuxMuslCheck
         if (getenv('SPC_LIBC') === 'glibc') {
             return CheckResult::ok('Building with glibc, skipped');
         }
+        if (str_contains(getenv('CC'), 'zig')) {
+            return CheckResult::ok('Building with zig, skipped');
+        }
 
         $arch = arch2gnu(php_uname('m'));
         $cross_compile_lib = "/usr/local/musl/{$arch}-linux-musl/lib/libc.a";

src/SPC/store/Downloader.php

@@ -365,8 +365,8 @@ class Downloader
                             $cls = new $class();
                             if (in_array($name, $cls->getSupportName())) {
                                 (new $class())->fetch($name, $force, $pkg);
+                                break;
                             }
-                            break;
                         }
                     }
                     break;

src/SPC/store/pkg/CustomPackage.php

@@ -10,8 +10,7 @@ abstract class CustomPackage
 
     abstract public function fetch(string $name, bool $force = false, ?array $config = null): void;
 
-    public function extract(string $name): void
-    {
-        throw new \RuntimeException("Extract method not implemented for package: {$name}");
-    }
+    abstract public function extract(string $name): void;
+
+    abstract public static function getEnvironment(): array;
 }

src/SPC/store/pkg/GoXcaddy.php

@@ -73,4 +73,25 @@ class GoXcaddy extends CustomPackage
             ])
             ->exec("{$go_exec} install github.com/caddyserver/xcaddy/cmd/xcaddy@latest");
     }
+
+    public static function getEnvironment(): array
+    {
+        $arch = arch2gnu(php_uname('m'));
+        $os = match (PHP_OS_FAMILY) {
+            'Windows' => 'win',
+            'Darwin' => 'macos',
+            'BSD' => 'freebsd',
+            default => 'linux',
+        };
+
+        $packageName = "go-xcaddy-{$arch}-{$os}";
+        $pkgroot = PKG_ROOT_PATH;
+
+        return [
+            'PATH' => "{$pkgroot}/{$packageName}/bin",
+            'GOROOT' => "{$pkgroot}/{$packageName}",
+            'GOBIN' => "{$pkgroot}/{$packageName}/bin",
+            'GOPATH' => "{$pkgroot}/go",
+        ];
+    }
 }

src/SPC/store/pkg/Zig.php

@@ -0,0 +1,143 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\store\pkg;
+
+use SPC\store\CurlHook;
+use SPC\store\Downloader;
+use SPC\store\FileSystem;
+use SPC\store\LockFile;
+
+class Zig extends CustomPackage
+{
+    public function getSupportName(): array
+    {
+        return [
+            'zig-x86_64-linux',
+            'zig-aarch64-linux',
+            'zig-x86_64-macos',
+            'zig-aarch64-macos',
+            'zig-x86_64-win',
+        ];
+    }
+
+    public function fetch(string $name, bool $force = false, ?array $config = null): void
+    {
+        $pkgroot = PKG_ROOT_PATH;
+        $zig_exec = match (PHP_OS_FAMILY) {
+            'Windows' => "{$pkgroot}/{$name}/bin/zig.exe",
+            default => "{$pkgroot}/{$name}/bin/zig",
+        };
+
+        if (file_exists($zig_exec) && !$force) {
+            return;
+        }
+
+        $parts = explode('-', $name);
+        $arch = $parts[1];
+        $os = $parts[2];
+
+        $zig_arch = match ($arch) {
+            'x86_64', 'aarch64' => $arch,
+            default => throw new \InvalidArgumentException('Unsupported architecture: ' . $arch),
+        };
+
+        $zig_os = match ($os) {
+            'linux' => 'linux',
+            'macos' => 'macos',
+            'win' => 'windows',
+            default => throw new \InvalidArgumentException('Unsupported OS: ' . $os),
+        };
+
+        $index_json = json_decode(Downloader::curlExec('https://ziglang.org/download/index.json', hooks: [[CurlHook::class, 'setupGithubToken']]), true);
+
+        $latest_version = null;
+        foreach ($index_json as $version => $data) {
+            $latest_version = $version;
+            break;
+        }
+
+        if (!$latest_version) {
+            throw new \RuntimeException('Could not determine latest Zig version');
+        }
+
+        logger()->info("Installing Zig version {$latest_version}");
+
+        $platform_key = "{$zig_arch}-{$zig_os}";
+        if (!isset($index_json[$latest_version][$platform_key])) {
+            throw new \RuntimeException("No download available for {$platform_key} in Zig version {$latest_version}");
+        }
+
+        $download_info = $index_json[$latest_version][$platform_key];
+        $url = $download_info['tarball'];
+        $filename = basename($url);
+
+        $config = [
+            'type' => 'url',
+            'url' => $url,
+            'filename' => $filename,
+        ];
+
+        Downloader::downloadPackage($name, $config, $force);
+    }
+
+    public function extract(string $name): void
+    {
+        $pkgroot = PKG_ROOT_PATH;
+        $zig_bin_dir = "{$pkgroot}/{$name}";
+        $zig_exec = match (PHP_OS_FAMILY) {
+            'Windows' => "{$zig_bin_dir}/zig.exe",
+            default => "{$zig_bin_dir}/zig",
+        };
+
+        if (file_exists($zig_exec)) {
+            if (!file_exists("{$zig_bin_dir}/zig-cc")) {
+                $this->createZigCcScript($zig_bin_dir);
+                return;
+            }
+            return;
+        }
+
+        $lock = json_decode(FileSystem::readFile(LockFile::LOCK_FILE), true);
+        $source_type = $lock[$name]['source_type'];
+        $filename = DOWNLOAD_PATH . '/' . ($lock[$name]['filename'] ?? $lock[$name]['dirname']);
+        $extract = "{$pkgroot}/{$name}";
+
+        FileSystem::extractPackage($name, $source_type, $filename, $extract);
+
+        $this->createZigCcScript($zig_bin_dir);
+    }
+
+    public static function getEnvironment(): array
+    {
+        $arch = arch2gnu(php_uname('m'));
+        $os = match (PHP_OS_FAMILY) {
+            'Linux' => 'linux',
+            'Windows' => 'win',
+            'Darwin' => 'macos',
+            'BSD' => 'freebsd',
+            default => 'linux',
+        };
+
+        $packageName = "zig-{$arch}-{$os}";
+        $path = PKG_ROOT_PATH . "/{$packageName}";
+
+        return [
+            'PATH' => $path,
+        ];
+    }
+
+    private function createZigCcScript(string $bin_dir): void
+    {
+        $script_path = __DIR__ . '/../scripts/zig-cc.sh';
+        $script_content = file_get_contents($script_path);
+
+        file_put_contents("{$bin_dir}/zig-cc", $script_content);
+        chmod("{$bin_dir}/zig-cc", 0755);
+
+        $script_content = str_replace('zig cc', 'zig c++', $script_content);
+        file_put_contents("{$bin_dir}/zig-c++", $script_content);
+        chmod("{$bin_dir}/zig-c++", 0755);
+    }
+}

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

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+BUILDROOT_ABS="$(realpath "$SCRIPT_DIR/../../buildroot/include" 2>/dev/null || echo "")"
+PARSED_ARGS=()
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        -isystem)
+            shift
+            ARG="$1"
+            [[ -n "$ARG" ]] && shift || break
+            ARG_ABS="$(realpath "$ARG" 2>/dev/null || echo "")"
+            if [[ -n "$ARG_ABS" && "$ARG_ABS" == "$BUILDROOT_ABS" ]]; then
+                PARSED_ARGS+=("-I$ARG")
+            else
+                PARSED_ARGS+=("-isystem" "$ARG")
+            fi
+            ;;
+        -isystem*)
+            ARG="${1#-isystem}"
+            shift
+            ARG_ABS="$(realpath "$ARG" 2>/dev/null || echo "")"
+            if [[ -n "$ARG_ABS" && "$ARG_ABS" == "$BUILDROOT_ABS" ]]; then
+                PARSED_ARGS+=("-I$ARG")
+            else
+                PARSED_ARGS+=("-isystem$ARG")
+            fi
+            ;;
+        *)
+            PARSED_ARGS+=("$1")
+            shift
+            ;;
+    esac
+done
+
+SPC_TARGET_WAS_SET=1
+if [ -z "${SPC_TARGET+x}" ]; then
+    SPC_TARGET_WAS_SET=0
+fi
+
+UNAME_M="$(uname -m)"
+UNAME_S="$(uname -s)"
+
+case "$UNAME_M" in
+    x86_64) ARCH="x86_64" ;;
+    aarch64|arm64) ARCH="aarch64" ;;
+    *) echo "Unsupported architecture: $UNAME_M" >&2; exit 1 ;;
+esac
+
+case "$UNAME_S" in
+    Linux) OS="linux" ;;
+    Darwin) OS="macos" ;;
+    *) echo "Unsupported OS: $UNAME_S" >&2; exit 1 ;;
+esac
+
+SPC_TARGET="${SPC_TARGET:-$ARCH-$OS}"
+
+if [ "$SPC_LIBC" = "glibc" ]; then
+    SPC_LIBC="gnu"
+fi
+
+if [ "$SPC_TARGET_WAS_SET" -eq 0 ] && [ -z "$SPC_LIBC" ] && [ -z "$SPC_LIBC_VERSION" ]; then
+    exec zig cc "${PARSED_ARGS[@]}"
+elif [ -z "$SPC_LIBC" ] && [ -z "$SPC_LIBC_VERSION" ]; then
+    exec zig cc -target ${SPC_TARGET} "${PARSED_ARGS[@]}"
+else
+    TARGET="${SPC_TARGET}-${SPC_LIBC}"
+    [ -n "$SPC_LIBC_VERSION" ] && TARGET="${TARGET}.${SPC_LIBC_VERSION}"
+
+    output=$(zig cc -target "$TARGET" -lstdc++ "${PARSED_ARGS[@]}" 2>&1)
+    status=$?
+
+    filtered_output=$(echo "$output" | grep -v "version '.*' in target triple")
+
+    if [ $status -eq 0 ]; then
+        echo "$filtered_output"
+        exit 0
+    fi
+
+    if echo "$output" | grep -q "version '.*' in target triple"; then
+        TARGET_FALLBACK="${SPC_TARGET}-${SPC_LIBC}"
+        output=$(zig cc -target "$TARGET_FALLBACK" -lstdc++ "${PARSED_ARGS[@]}" 2>&1)
+        status=$?
+
+        filtered_output=$(echo "$output" | grep -v "version '.*' in target triple")
+
+        if [ $status -eq 0 ]; then
+            echo "$filtered_output"
+            exit 0
+        else
+            exec zig cc -target "$TARGET_FALLBACK" "${PARSED_ARGS[@]}"
+        fi
+    else
+        echo "$filtered_output"
+        exec zig cc -target "$TARGET" "${PARSED_ARGS[@]}"
+    fi
+fi

src/SPC/util/GlobalEnvManager.php

@@ -7,6 +7,7 @@ namespace SPC\util;
 use SPC\builder\linux\SystemUtil;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
+use SPC\store\pkg\Zig;
 
 /**
  * Environment variable manager
@@ -43,7 +44,13 @@ class GlobalEnvManager
         // Define env vars for linux
         if (PHP_OS_FAMILY === 'Linux') {
             $arch = getenv('GNU_ARCH');
-            if (SystemUtil::isMuslDist() || getenv('SPC_LIBC') === 'glibc') {
+
+            if (str_contains((string) getenv('CC'), 'zig')) {
+                self::putenv('SPC_LINUX_DEFAULT_CC=zig-cc');
+                self::putenv('SPC_LINUX_DEFAULT_CXX=zig-c++');
+                self::putenv('SPC_LINUX_DEFAULT_AR=ar');
+                self::putenv('SPC_LINUX_DEFAULT_LD=ld.lld');
+            } elseif (SystemUtil::isMuslDist() || getenv('SPC_LIBC') === 'glibc') {
                 self::putenv('SPC_LINUX_DEFAULT_CC=gcc');
                 self::putenv('SPC_LINUX_DEFAULT_CXX=g++');
                 self::putenv('SPC_LINUX_DEFAULT_AR=ar');
@@ -100,6 +107,14 @@ class GlobalEnvManager
                 self::putenv("{$k}={$v}");
             }
         }
+        if (str_contains((string) getenv('CC'), 'zig') || str_contains((string) getenv('CXX'), 'zig')) {
+            $zigEnv = Zig::getEnvironment();
+            foreach ($zigEnv as $key => $value) {
+                if ($key === 'PATH') {
+                    self::addPathIfNotExists($value);
+                }
+            }
+        }
     }
 
     public static function putenv(string $val): void
@@ -108,7 +123,7 @@ class GlobalEnvManager
         self::$env_cache[] = $val;
     }
 
-    private static function addPathIfNotExists(string $path): void
+    public static function addPathIfNotExists(string $path): void
     {
         if (is_unix() && !str_contains(getenv('PATH'), $path)) {
             self::putenv("PATH={$path}:" . getenv('PATH'));

src/SPC/util/SPCConfigUtil.php

@@ -6,6 +6,7 @@ namespace SPC\util;
 
 use SPC\builder\BuilderBase;
 use SPC\builder\BuilderProvider;
+use SPC\builder\linux\SystemUtil;
 use SPC\builder\macos\MacOSBuilder;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
@@ -70,6 +71,9 @@ class SPCConfigUtil
         if ($this->builder->hasCpp()) {
             $libs .= $this->builder instanceof MacOSBuilder ? ' -lc++' : ' -lstdc++';
         }
+        if (SystemUtil::getCCType() === 'clang') {
+            $libs .= ' -lunwind';
+        }
         // mimalloc must come first
         if (str_contains($libs, BUILD_LIB_PATH . '/mimalloc.o')) {
             $libs = BUILD_LIB_PATH . '/mimalloc.o ' . str_replace(BUILD_LIB_PATH . '/mimalloc.o', '', $libs);
@@ -145,10 +149,6 @@ class SPCConfigUtil
                 }
             }
         }
-        // patch: imagick (imagemagick wrapper) for linux needs libgomp
-        if (in_array('imagemagick', $libraries) && PHP_OS_FAMILY === 'Linux' && !(getenv('SPC_LIBC') === 'glibc' && str_contains(getenv('CC'), 'devtoolset-10'))) {
-            $short_name[] = '-lgomp';
-        }
         return implode(' ', $short_name);
     }
 

src/globals/patch/swoole_fix_date_time.patch

@@ -0,0 +1,11 @@
+--- a/config.m4
++++ b/config.m4
+@@ -1307,7 +1307,7 @@
+
+     PHP_REQUIRE_CXX()
+
+-    CXXFLAGS="$CXXFLAGS -Wall -Wno-unused-function -Wno-deprecated -Wno-deprecated-declarations"
++    CXXFLAGS="$CXXFLAGS -Wall -Wno-date-time -Wno-unused-function -Wno-deprecated -Wno-deprecated-declarations"
+
+     if test "$SW_OS" = "CYGWIN" || test "$SW_OS" = "MINGW"; then
+         CXXFLAGS="$CXXFLAGS -std=gnu++14"

src/globals/test-extensions.php

@@ -13,9 +13,9 @@ 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.1',
+    // '8.2',
+    // '8.3',
     '8.4',
 ];
 
@@ -26,12 +26,24 @@ $test_os = [
     // 'macos-15',
     // 'ubuntu-latest',
     // 'ubuntu-22.04',
-    // 'ubuntu-24.04',
     // 'ubuntu-22.04-arm',
-    // 'ubuntu-24.04-arm',
-    'windows-latest',
+    'ubuntu-24.04',
+    'ubuntu-24.04-arm',
+    // 'windows-latest',
 ];
 
+$zig = true;
+// temporary!
+if ($zig) {
+    putenv('SPC_LIBC=musl');
+    // putenv('SPC_LIBC_VERSION=2.17');
+    putenv('CC=zig-cc');
+    putenv('CXX=zig-c++');
+    putenv('AR=ar');
+    putenv('LD=ld.lld');
+    exec('ulimit -n 2048');
+}
+
 // whether enable thread safe
 $zts = true;
 
@@ -48,13 +60,13 @@ $prefer_pre_built = true;
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'curl',
+    'Linux', 'Darwin' => 'apcu,ast,bcmath,calendar,ctype,curl,dba,dom,exif,fileinfo,filter,iconv,libxml,mbregex,mbstring,opcache,openssl,pcntl,phar,posix,readline,session,simplexml,sockets,sodium,tokenizer,xml,xmlreader,xmlwriter,zip,zlib,amqp,brotli,bz2,dio,ds,ev,event,ffi,ftp,gd,gettext,gmp,gmssl,igbinary,imagick,inotify,intl,ldap,lz4,memcache,memcached,mongodb,msgpack,mysqli,mysqlnd,odbc,opentelemetry,parallel,pdo,pdo_mysql,pdo_odbc,pdo_pgsql,pdo_sqlite,pdo_sqlsrv,pgsql,protobuf,rar,redis,rdkafka,shmop,spx,sqlite3,sqlsrv,ssh2,swoole,sysvmsg,sysvsem,sysvshm,tidy,uuid,uv,xhprof,xlswriter,xsl,xz,yac,yaml,zstd',
     'Windows' => 'intl',
 };
 
 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
 $shared_extensions = match (PHP_OS_FAMILY) {
-    'Linux' => 'uv',
+    'Linux' => 'amqp,brotli,bz2,dio,ds,ev,event,ffi,ftp,gd,gettext,gmp,gmssl,igbinary,imagick,inotify,intl,ldap,lz4,memcache,memcached,mongodb,msgpack,mysqli,mysqlnd,odbc,opentelemetry,parallel,pdo,pdo_mysql,pdo_odbc,pdo_pgsql,pdo_sqlite,pdo_sqlsrv,pgsql,protobuf,rar,redis,rdkafka,shmop,spx,sqlite3,sqlsrv,ssh2,swoole,sysvmsg,sysvsem,sysvshm,tidy,uuid,uv,xdebug,xhprof,xlswriter,xsl,xz,yac,yaml,zstd',
     'Darwin' => '',
     'Windows' => '',
 };
@@ -156,6 +168,12 @@ if ($shared_extensions) {
         case 'ubuntu-22.04-arm':
             $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
             break;
+        case 'ubuntu-24.04':
+        case 'ubuntu-24.04-arm':
+            if (getenv('SPC_LIBC') === 'glibc') {
+                $shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
+            }
+            break;
         case 'macos-13':
         case 'macos-14':
         case 'macos-15':
@@ -208,6 +226,9 @@ switch ($argv[1] ?? null) {
         passthru($prefix . $down_cmd, $retcode);
         break;
     case 'build_cmd':
+        if ($zig) {
+            passthru("{$prefix}install-pkg zig --debug", $retcode);
+        }
         passthru($prefix . $build_cmd . ' --build-cli --build-micro', $retcode);
         break;
     case 'build_embed_cmd':