Revert "fix libheif" (#1154)

Build Unix SQLite with SQLITE_ENABLE_COLUMN_METADATA so the metadata APIs are available on macOS and Linux.

Remove the pdo_sqlite configure override that forced PHP to treat sqlite3_column_table_name() as unavailable, and add sanity checks for both SQLite compile options and PDO column metadata.

config/source.json

@@ -246,7 +246,7 @@
     },
     "ext-rdkafka": {
         "type": "ghtar",
-        "repo": "arnaud-lb/php-rdkafka",
+        "repo": "php-rdkafka/php-rdkafka",
         "path": "php-src/ext/rdkafka",
         "license": {
             "type": "file",
@@ -333,10 +333,9 @@
         }
     },
     "ext-zstd": {
-        "type": "git",
+        "type": "ghtagtar",
+        "repo": "kjdev/php-ext-zstd",
         "path": "php-src/ext/zstd",
-        "rev": "master",
-        "url": "https://github.com/kjdev/php-ext-zstd",
         "license": {
             "type": "file",
             "path": "LICENSE"

src/SPC/builder/extension/password_argon2.php

@@ -26,7 +26,7 @@ class password_argon2 extends Extension
 
     public function getConfigureArg(bool $shared = false): string
     {
-        if ($this->builder->getLib('openssl') !== null) {
+        if ($this->builder->getExt('openssl')?->isBuildStatic() || $this->isBuildShared()) {
             if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
                 return '--without-password-argon2'; // use --with-openssl-argon2 in openssl extension instead
             }

src/SPC/builder/extension/pdo_sqlite.php

@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\store\FileSystem;
-use SPC\util\CustomExt;
-
-#[CustomExt('pdo_sqlite')]
-class pdo_sqlite extends Extension
-{
-    public function patchBeforeConfigure(): bool
-    {
-        FileSystem::replaceFileRegex(
-            SOURCE_PATH . '/php-src/configure',
-            '/sqlite3_column_table_name=yes/',
-            'sqlite3_column_table_name=no'
-        );
-        return true;
-    }
-}

src/SPC/builder/extension/xlswriter.php

@@ -7,7 +7,6 @@ namespace SPC\builder\extension;
 use SPC\builder\Extension;
 use SPC\store\SourcePatcher;
 use SPC\util\CustomExt;
-use SPC\util\GlobalEnvManager;
 
 #[CustomExt('xlswriter')]
 class xlswriter extends Extension
@@ -29,13 +28,6 @@ class xlswriter extends Extension
     public function patchBeforeMake(): bool
     {
         $patched = parent::patchBeforeMake();
-
-        // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
-        if (PHP_OS_FAMILY !== 'Windows') {
-            GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');
-            $patched = true;
-        }
-
         if (PHP_OS_FAMILY === 'Windows') {
             // fix windows build with openssl extension duplicate symbol bug
             SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $this->source_dir);
@@ -48,10 +40,4 @@ class xlswriter extends Extension
         }
         return $patched;
     }
-
-    // Remove when https://github.com/viest/php-ext-xlswriter/pull/560 is merged
-    protected function getExtraEnv(): array
-    {
-        return ['CFLAGS' => '-std=gnu17'];
-    }
 }

src/SPC/builder/unix/UnixBuilderBase.php

@@ -463,9 +463,10 @@ abstract class UnixBuilderBase extends BuilderBase
                 "-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ], ...GoXcaddy::getEnvironment()];
+        $pgo = file_exists("{$frankenphpSourceDir}/caddy/frankenphp/default.pgo") ? "--pgo {$frankenphpSourceDir}/caddy/frankenphp/default.pgo " : '';
         shell()->cd(BUILD_BIN_PATH)
             ->setEnv($env)
-            ->exec("xcaddy build --output frankenphp {$xcaddyModules}");
+            ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddyModules}");
 
         $this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP);
     }

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\store\FileSystem;
 use SPC\util\executor\UnixCMakeExecutor;
 
 trait curl
@@ -32,8 +33,16 @@ trait curl
             )
             ->build();
 
-        // patch pkgconf
         $this->patchPkgconfPrefix(['libcurl.pc']);
+        // On glibc <2.28 without built-in pthreads, FindThreads sets
+        // INTERFACE_LINK_LIBRARIES to '-lpthread'
+        // curls .pc generator walks and prepends '-l' to each
+        // entry, resulting in -l-lpthread
+        FileSystem::replaceFileRegex(
+            BUILD_LIB_PATH . '/pkgconfig/libcurl.pc',
+            '/-l(-l\S+)/',
+            '$1'
+        );
         shell()->cd(BUILD_LIB_PATH . '/cmake/CURL/')
             ->exec("sed -ie 's|\"/lib/libcurl.a\"|\"" . BUILD_LIB_PATH . "/libcurl.a\"|g' CURLTargets-release.cmake");
     }

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

@@ -10,7 +10,12 @@ trait sqlite
 {
     protected function build(): void
     {
-        UnixAutoconfExecutor::create($this)->configure()->make();
+        UnixAutoconfExecutor::create($this)
+            ->appendEnv([
+                'CFLAGS' => '-DSQLITE_ENABLE_COLUMN_METADATA=1',
+            ])
+            ->configure()
+            ->make();
         $this->patchPkgconfPrefix(['sqlite3.pc']);
     }
 }

src/SPC/store/SourcePatcher.php

@@ -129,6 +129,15 @@ class SourcePatcher
             FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/configure', '/have_capstone="yes"/', 'have_capstone="no"');
         }
 
+        // PHP 8.2 and below: bcmath libbcmath uses K&R style C function
+        if (is_unix() && $builder->getPHPVersionID() < 80300) {
+            FileSystem::replaceFileStr(
+                SOURCE_PATH . '/php-src/configure',
+                "for ac_arg in '' -std=gnu23",
+                "for ac_arg in '' -std=gnu17",
+            );
+        }
+
         if (file_exists(SOURCE_PATH . '/php-src/configure.ac.bak')) {
             // restore configure.ac
             FileSystem::restoreBackupFile(SOURCE_PATH . '/php-src/configure.ac');

src/SPC/store/pkg/GoXcaddy.php

@@ -85,7 +85,7 @@ class GoXcaddy extends CustomPackage
                 'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
                 'GOPATH' => "{$pkgroot}/go",
             ])
-            ->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
+            ->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master');
     }
 
     public static function getEnvironment(): array

src/SPC/util/executor/UnixCMakeExecutor.php

@@ -182,7 +182,7 @@ class UnixCMakeExecutor extends Executor
         $target_arch = arch2gnu(php_uname('m'));
         $cflags = getenv('SPC_DEFAULT_C_FLAGS');
         $cc = getenv('CC');
-        $cxx = getenv('CCX');
+        $cxx = getenv('CXX');
         $include = BUILD_INCLUDE_PATH;
         logger()->debug("making cmake tool chain file for {$os} {$target_arch} with CFLAGS='{$cflags}'");
         $root = BUILD_ROOT_PATH;

src/globals/ext-tests/pdo_sqlite.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+$pdo = new PDO('sqlite::memory:');
+$pdo->exec('CREATE TABLE spc_column_metadata_test (id INTEGER)');
+
+$stmt = $pdo->query('SELECT id FROM spc_column_metadata_test');
+if ($stmt === false) {
+    throw new RuntimeException('Failed to query SQLite metadata test table.');
+}
+
+$metadata = $stmt->getColumnMeta(0);
+if (($metadata['table'] ?? null) !== 'spc_column_metadata_test') {
+    throw new RuntimeException('PDO SQLite column metadata does not include the origin table.');
+}

src/globals/ext-tests/sqlite3.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+$sqlite = new SQLite3(':memory:');
+$enabled = $sqlite->querySingle("SELECT sqlite_compileoption_used('ENABLE_COLUMN_METADATA')");
+
+if ((int) $enabled !== 1) {
+    throw new RuntimeException('SQLite was not built with SQLITE_ENABLE_COLUMN_METADATA.');
+}

src/globals/test-extensions.php

@@ -14,7 +14,7 @@ declare(strict_types=1);
 // test php version (8.1 ~ 8.4 available, multiple for matrix)
 $test_php_version = [
     // '8.1',
-    '8.2',
+    // '8.2',
     // '8.3',
     // '8.4',
     '8.5',
@@ -24,11 +24,11 @@ $test_php_version = [
 // test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
 $test_os = [
     // 'macos-15-intel', // bin/spc for x86_64
-    'macos-15', // bin/spc for arm64
+    // '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-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-2022', // .\bin\spc.ps1
     // 'windows-2025',
@@ -50,7 +50,7 @@ $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' => 'swoole,mongodb',
+    'Linux', 'Darwin' => 'curl,gd',
     'Windows' => 'bcmath,brotli,bz2,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,iconv,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_pgsql,pgsql,session,simdjson,simplexml,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,zip,zlib',
 };