swoole hooks can be compiled if pgsql/sqlite are not compiled in statically

config/ext.json

@@ -842,11 +842,16 @@
             "nghttp2",
             "zlib"
         ],
+        "lib-suggests": [
+            "zstd",
+            "unixodbc"
+        ],
         "ext-depends": [
             "openssl",
             "curl"
         ],
         "ext-suggests": [
+            "sockets",
             "swoole-hook-pgsql",
             "swoole-hook-mysql",
             "swoole-hook-sqlite"
@@ -859,11 +864,12 @@
         },
         "notes": true,
         "type": "addon",
-        "arg-type": "custom",
+        "arg-type": "none",
         "ext-depends": [
             "mysqlnd",
             "pdo",
-            "pdo_mysql"
+            "pdo_mysql",
+            "swoole"
         ],
         "ext-suggests": [
             "mysqli"
@@ -877,10 +883,11 @@
         },
         "notes": true,
         "type": "addon",
-        "arg-type": "custom",
+        "arg-type": "none",
         "ext-depends": [
             "pgsql",
-            "pdo"
+            "pdo",
+            "swoole"
         ]
     },
     "swoole-hook-sqlite": {
@@ -890,10 +897,11 @@
         },
         "notes": true,
         "type": "addon",
-        "arg-type": "custom",
+        "arg-type": "none",
         "ext-depends": [
             "sqlite3",
-            "pdo"
+            "pdo",
+            "swoole"
         ]
     },
     "swow": {

src/SPC/builder/BuilderBase.php

@@ -268,18 +268,19 @@ public function makeStaticExtensionArgs(): string
     {
         $ret = [];
         foreach ($this->getExts() as $ext) {
-            $arg = $ext->getConfigureArg();
+            $arg = null;
             if ($ext->isBuildShared() && !$ext->isBuildStatic()) {
                 if (
                     (Config::getExt($ext->getName(), 'type') === 'builtin' &&
-                    !file_exists(SOURCE_PATH . '/php-src/ext/' . $ext->getName() . '/config.m4')) ||
+                        !file_exists(SOURCE_PATH . '/php-src/ext/' . $ext->getName() . '/config.m4')) ||
                     Config::getExt($ext->getName(), 'build-with-php') === true
                 ) {
                     $arg = $ext->getConfigureArg(true);
                 } else {
                     continue;
                 }
             }
+            $arg ??= $ext->getConfigureArg();
             logger()->info($ext->getName() . ' is using ' . $arg);
             $ret[] = trim($arg);
         }

src/SPC/builder/Extension.php

@@ -252,12 +252,15 @@ public function getSharedExtensionLoadString(): string
         $order = [];
 
         $resolve = function ($extension) use (&$resolve, &$loaded, &$order) {
+            if (!$extension instanceof Extension) {
+                return;
+            }
             if (isset($loaded[$extension->getName()])) {
                 return;
             }
             $loaded[$extension->getName()] = true;
 
-            foreach ($this->dependencies as $dependency) {
+            foreach ($extension->dependencies as $dependency) {
                 $resolve($dependency);
             }
 
@@ -269,6 +272,9 @@ public function getSharedExtensionLoadString(): string
         $ret = '';
         foreach ($order as $ext) {
             if ($ext instanceof self && $ext->isBuildShared()) {
+                if (Config::getExt($ext->getName(), 'type', false) === 'addon') {
+                    continue;
+                }
                 if (Config::getExt($ext->getName(), 'zend-extension', false) === true) {
                     $ret .= " -d \"zend_extension={$ext->getName()}\"";
                 } else {
@@ -352,6 +358,9 @@ public function validate(): void
      */
     public function buildShared(): void
     {
+        if (Config::getExt($this->getName(), 'type') === 'addon') {
+            return;
+        }
         try {
             if (Config::getExt($this->getName(), 'type') === 'builtin' || Config::getExt($this->getName(), 'build-with-php') === true) {
                 if (file_exists(BUILD_MODULES_PATH . '/' . $this->getName() . '.so')) {

src/SPC/builder/extension/swoole.php

@@ -43,10 +43,12 @@ public function getExtVersion(): ?string
     public function getUnixConfigureArg(bool $shared = false): string
     {
         // enable swoole
-        $arg = '--enable-swoole';
+        $arg = '--enable-swoole' . ($shared ? '=shared' : '');
 
-        // commonly-used feature: coroutine-time, disable-thread-context
-        $arg .= ' --enable-swoole-coro-time --disable-thread-context';
+        // commonly-used feature: coroutine-time
+        $arg .= ' --enable-swoole-coro-time --with-pic';
+
+        $arg .= $this->builder->getOption('enable-zts') ? ' --enable-swoole-thread --disable-thread-context' : ' --disable-swoole-thread --enable-thread-context';
 
         // required feature: curl, openssl (but curl hook is buggy for php 8.0)
         $arg .= $this->builder->getPHPVersionID() >= 80100 ? ' --enable-swoole-curl' : ' --disable-swoole-curl';
@@ -58,17 +60,23 @@ public function getUnixConfigureArg(bool $shared = false): string
             $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : '';
         }
         $arg .= $this->builder->getLib('nghttp2') ? (' --with-nghttp2-dir=' . BUILD_ROOT_PATH) : '';
+        $arg .= $this->builder->getLib('zstd') ? ' --enable-zstd' : '';
+        $arg .= $this->builder->getLib('iouring') ? ' --enable-iouring' : '';
+        $arg .= $this->builder->getExt('sockets') ? ' --enable-sockets' : '';
 
         // additional feature: swoole-pgsql, it should depend on lib [postgresql], but it will lack of CFLAGS etc.
         // so this is a tricky way (enable ext [pgsql,pdo] to add postgresql hook and pdo_pgsql support)
-        $arg .= $this->builder->getExt('swoole-hook-pgsql') ? '' : ' --disable-swoole-pgsql';
+        $arg .= $this->builder->getExt('swoole-hook-pgsql') ? ' --enable-swoole-pgsql' : ' --disable-swoole-pgsql';
+
+        // additional feature: swoole-mysql
+        $arg .= $this->builder->getExt('swoole-hook-mysql') ? ' --enable-mysqlnd' : ' --disable-mysqlnd';
 
         // enable this feature , need remove pdo_sqlite
         // more info : https://wenda.swoole.com/detail/109023
-        $arg .= $this->builder->getExt('swoole-hook-sqlite') ? '' : ' --disable-swoole-sqlite';
+        $arg .= $this->builder->getExt('swoole-hook-sqlite') ? ' --enable-swoole-sqlite' : ' --disable-swoole-sqlite';
 
         // enable this feature , need stop pdo_*
-        // $arg .= $this->builder->getLib('unixodbc') ? ' --with-swoole-odbc=unixODBC,'  : ' ';
+        $arg .= $this->builder->getLib('unixodbc') && !$this->builder->getExt('pdo')?->isBuildStatic() ? ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH : '';
         return $arg;
     }
 }

src/SPC/builder/extension/swoole_hook_mysql.php

@@ -16,26 +16,19 @@ public function getDistName(): string
         return 'swoole';
     }
 
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        // pdo_mysql doesn't need to be disabled
-        // enable swoole-hook-mysql will enable mysqli, pdo, pdo_mysql, we don't need to add any additional options
-        return '';
-    }
-
     public function runCliCheckUnix(): void
     {
         // skip if not enable swoole
         if ($this->builder->getExt('swoole') === null) {
             return;
         }
-        [$ret, $out] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -n' . $this->getSharedExtensionLoadString() . ' --ri "swoole"', false);
+        [$ret, $out] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -n' . $this->getSharedExtensionLoadString() . ' --ri "swoole"');
         $out = implode('', $out);
         if ($ret !== 0) {
             throw new ValidationException("extension {$this->getName()} failed compile check: php-cli returned {$ret}", validation_module: 'extension swoole_hook_mysql sanity check');
         }
         if (!str_contains($out, 'mysqlnd')) {
-            throw new ValidationException('swoole mysql hook is not enabled correctly.', validation_module: 'Extension swoole mysql hook avilability check');
+            throw new ValidationException('swoole mysql hook is not enabled correctly.', validation_module: 'Extension swoole mysql hook availability check');
         }
     }
 }

src/SPC/builder/extension/swoole_hook_pgsql.php

@@ -20,17 +20,11 @@ public function getDistName(): string
     public function validate(): void
     {
         // pdo_pgsql need to be disabled
-        if ($this->builder->getExt('pdo_pgsql') !== null) {
+        if ($this->builder->getExt('pdo_pgsql')?->isBuildStatic()) {
             throw new WrongUsageException('swoole-hook-pgsql provides pdo_pgsql, if you enable pgsql hook for swoole, you must remove pdo_pgsql extension.');
         }
     }
 
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        // enable swoole pgsql hook
-        return '--enable-swoole-pgsql';
-    }
-
     public function runCliCheckUnix(): void
     {
         // skip if not enable swoole

src/SPC/builder/extension/swoole_hook_sqlite.php

@@ -20,17 +20,11 @@ public function getDistName(): string
     public function validate(): void
     {
         // pdo_pgsql need to be disabled
-        if ($this->builder->getExt('pdo_sqlite') !== null) {
+        if ($this->builder->getExt('pdo_sqlite')?->isBuildStatic()) {
             throw new WrongUsageException('swoole-hook-sqlite provides pdo_sqlite, if you enable sqlite hook for swoole, you must remove pdo_sqlite extension.');
         }
     }
 
-    public function getUnixConfigureArg(bool $shared = false): string
-    {
-        // enable swoole pgsql hook
-        return '--enable-swoole-sqlite';
-    }
-
     public function runCliCheckUnix(): void
     {
         // skip if not enable swoole

src/SPC/builder/unix/UnixBuilderBase.php

@@ -13,6 +13,8 @@
 use SPC\store\Downloader;
 use SPC\store\FileSystem;
 use SPC\store\pkg\GoXcaddy;
+use SPC\toolchain\GccNativeToolchain;
+use SPC\toolchain\ToolchainManager;
 use SPC\util\DependencyUtil;
 use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
@@ -259,7 +261,6 @@ protected function buildFrankenphp(): void
             logger()->warning('caddy-cbrotli module is enabled, but brotli library is not built. Disabling caddy-cbrotli.');
             $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',
             hooks: [[CurlHook::class, 'setupGithubToken']],
@@ -280,10 +281,19 @@ protected function buildFrankenphp(): void
         }
 
         $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' : '';
+        if ((str_contains((string) getenv('SPC_DEFAULT_C_FLAGS'), '-fprofile') ||
+                str_contains((string) getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'), '-fprofile')) &&
+            ToolchainManager::getToolchainClass() === GccNativeToolchain::class) {
+            $cflags .= ' -Wno-error=missing-profile';
+            $libs .= ' -lgcov';
+        }
         $env = [
             'CGO_ENABLED' => '1',
-            'CGO_CFLAGS' => $this->arch_c_flags . ' ' . $config['cflags'],
-            'CGO_LDFLAGS' => "{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$config['libs']} {$lrt}",
+            'CGO_CFLAGS' => clean_spaces($cflags),
+            'CGO_LDFLAGS' => "{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs}",
             'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
                 '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' . $debugFlags .
                 '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .

src/SPC/command/BuildPHPCommand.php

@@ -252,7 +252,7 @@ public function handle(): int
                 $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}");
-                } else {
+                } elseif (!str_contains($ext, 'swoole-hook')) {
                     logger()->warning("Shared extension [{$ext}] not found, please check!");
                 }
             }

src/SPC/util/SPCConfigUtil.php

@@ -52,6 +52,15 @@ public function __construct(?BuilderBase $builder = null, array $options = [])
      */
     public function config(array $extensions = [], array $libraries = [], bool $include_suggest_ext = false, bool $include_suggest_lib = false): array
     {
+        $extra_exts = [];
+        foreach ($extensions as $ext) {
+            $extra_exts = array_merge($extra_exts, Config::getExt($ext, 'ext-suggests', []));
+        }
+        foreach ($extra_exts as $ext) {
+            if ($this->builder?->getExt($ext) && !in_array($ext, $extensions)) {
+                $extensions[] = $ext;
+            }
+        }
         [$extensions, $libraries] = DependencyUtil::getExtsAndLibs($extensions, $libraries, $include_suggest_ext, $include_suggest_lib);
 
         ob_start();

src/globals/test-extensions.php

@@ -18,14 +18,14 @@
     // '8.3',
     '8.4',
     // '8.5',
-    'git',
+    // 'git',
 ];
 
 // test os (macos-13, macos-14, macos-15, ubuntu-latest, windows-latest are available)
 $test_os = [
-    // 'macos-13', // bin/spc for x86_64
+    'macos-13', // bin/spc for x86_64
     // 'macos-14',  // bin/spc for arm64
-    // 'macos-15', // bin/spc for arm64
+    'macos-15', // bin/spc for arm64
     'ubuntu-latest', // bin/spc-alpine-docker for x86_64
     // 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
     'ubuntu-24.04', // bin/spc for x86_64
@@ -50,7 +50,7 @@
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => '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',
+    'Linux', 'Darwin' => 'swoole,swoole-hook-mysql,swoole-hook-pgsql,swoole-hook-sqlite',
     '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',
 };
 
@@ -62,7 +62,7 @@
 };
 
 // If you want to test lib-suggests for all extensions and libraries, set it to true.
-$with_suggested_libs = false;
+$with_suggested_libs = true;
 
 // If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true.
 $with_libs = match (PHP_OS_FAMILY) {