Merge branch 'main' into zig

bin/spc-alpine-docker

@@ -3,7 +3,7 @@
 set -e
 
 # This file is using docker to run commands
-SPC_DOCKER_VERSION=v4
+SPC_DOCKER_VERSION=v5
 
 # Detect docker can run
 if ! which docker >/dev/null; then
@@ -53,9 +53,9 @@ aarch64|arm64)
     exit 1
     ;;
 esac
-# if ALPINE_FROM is not set, use alpine:edge
+# if ALPINE_FROM is not set, use alpine:3.21
 if [ -z "$ALPINE_FROM" ]; then
-    ALPINE_FROM=alpine:edge
+    ALPINE_FROM=alpine:3.21
 fi
 if [ "$SPC_USE_ARCH" != "$CURRENT_ARCH" ]; then
     echo "* Using different arch needs to setup qemu-static for docker !"
@@ -64,7 +64,7 @@ if [ "$SPC_USE_ARCH" != "$CURRENT_ARCH" ]; then
         $DOCKER_EXECUTABLE run --rm --privileged multiarch/qemu-user-static:register --reset > /dev/null
     fi
 else
-    ALPINE_FROM=alpine:edge
+    ALPINE_FROM=alpine:3.21
 fi
 
 if [ "$SPC_USE_MIRROR" = "yes" ]; then

src/SPC/builder/LibraryBase.php

@@ -332,6 +332,15 @@ abstract class LibraryBase
         return false;
     }
 
+    /**
+     * Patch php-config after embed was built
+     * Example: imap requires -lcrypt
+     */
+    public function patchPhpConfig(): bool
+    {
+        return false;
+    }
+
     /**
      * Build this library.
      *

src/SPC/builder/extension/imap.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\builder\linux\SystemUtil;
 use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
@@ -41,4 +42,14 @@ class imap extends Extension
         }
         return $arg;
     }
+
+    public function patchBeforeMake(): bool
+    {
+        if (PHP_OS_FAMILY !== 'Linux' || SystemUtil::isMuslDist()) {
+            return false;
+        }
+        $extra_libs = trim(getenv('SPC_EXTRA_LIBS') . ' -lcrypt');
+        f_putenv('SPC_EXTRA_LIBS=' . $extra_libs);
+        return true;
+    }
 }

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

@@ -7,6 +7,7 @@ namespace SPC\builder\linux\library;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
+use SPC\util\SPCTarget;
 
 class imap extends LinuxLibraryBase
 {
@@ -34,6 +35,15 @@ class imap extends LinuxLibraryBase
         return true;
     }
 
+    public function patchPhpConfig(): bool
+    {
+        if (SPCTarget::getLibc() === 'glibc') {
+            FileSystem::replaceFileRegex(BUILD_BIN_PATH . '/php-config', '/^libs="(.*)"$/m', 'libs="$1 -lcrypt"');
+            return true;
+        }
+        return false;
+    }
+
     /**
      * @throws RuntimeException
      */
@@ -44,6 +54,8 @@ class imap extends LinuxLibraryBase
         } else {
             $ssl_options = 'SSLTYPE=none';
         }
+        $libcVer = SPCTarget::getLibcVersion();
+        $extraLibs = $libcVer && version_compare($libcVer, '2.17', '<=') ? 'EXTRALDFLAGS="-ldl -lrt -lpthread"' : '';
         shell()->cd($this->source_dir)
             ->exec('make clean')
             ->exec('touch ip6')
@@ -51,9 +63,7 @@ class imap extends LinuxLibraryBase
             ->exec('chmod +x tools/ua')
             ->exec('chmod +x src/osdep/unix/drivers')
             ->exec('chmod +x src/osdep/unix/mkauths')
-            ->exec(
+            ->exec("yes | make slx {$ssl_options} EXTRACFLAGS='-fPIC -fpermissive' {$extraLibs}");
-                "yes | make slx {$ssl_options} EXTRACFLAGS='-fPIC -fpermissive'"
-            );
         try {
             shell()
                 ->exec("cp -rf {$this->source_dir}/c-client/c-client.a " . BUILD_LIB_PATH . '/libc-client.a')

src/SPC/builder/unix/UnixBuilderBase.php

@@ -298,6 +298,11 @@ abstract class UnixBuilderBase extends BuilderBase
             $php_config_str = preg_replace('/(libs=")(.*?)\s*(-lstdc\+\+)\s*(.*?)"/', '$1$2 $4 $3"', $php_config_str);
             FileSystem::writeFile(BUILD_BIN_PATH . '/php-config', $php_config_str);
         }
+        foreach ($this->getLibs() as $lib) {
+            if ($lib->patchPhpConfig()) {
+                logger()->debug("Library {$lib->getName()} patched php-config");
+            }
+        }
     }
 
     /**

src/SPC/store/SourceManager.php

@@ -66,7 +66,7 @@ class SourceManager
             $check = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $source);
             // $check = $lock[$lock_name]['move_path'] === null ? (SOURCE_PATH . '/' . $source) : (SOURCE_PATH . '/' . $lock[$lock_name]['move_path']);
             if (!is_dir($check)) {
-                logger()->debug('Extracting source [' . $source . '] to ' . $check . ' ...');
+                logger()->debug("Extracting source [{$source}] to {$check} ...");
                 $filename = LockFile::getLockFullPath($lock_content);
                 FileSystem::extractSource($source, $lock_content['source_type'], $filename, $check);
                 LockFile::putLockSourceHash($lock_content, $check);
@@ -81,7 +81,14 @@ class SourceManager
 
             // when source already extracted, detect if the extracted source hash is the same as the lock file one
             if (file_exists("{$check}/.spc-hash") && FileSystem::readFile("{$check}/.spc-hash") === $hash) {
-                logger()->debug('Source [' . $source . '] already extracted in ' . $check . ', skip !');
+                logger()->debug("Source [{$source}] already extracted in {$check}, skip !");
+                continue;
+            }
+
+            // ext imap was included in php < 8.4 which we should not extract,
+            // but since it's not simple to compare php version, for now we just skip it
+            if ($source === 'ext-imap') {
+                logger()->debug("Source [ext-imap] already extracted in {$check}, skip !");
                 continue;
             }
 

src/SPC/toolchain/ClangNativeToolchain.php

@@ -22,12 +22,17 @@ class ClangNativeToolchain implements ToolchainInterface
 
     public function afterInit(): void
     {
-        // check clang exists
+        foreach (['CC', 'CXX', 'AR', 'LD'] as $env) {
-        match (PHP_OS_FAMILY) {
+            $command = getenv($env);
-            'Linux' => LinuxSystemUtil::findCommand('clang++') ?? throw new WrongUsageException('Clang++ not found, please install it or manually set CC/CXX to a valid path.'),
+            if (!$command || is_file($command)) {
-            'Darwin' => MacOSSystemUtil::findCommand('clang++') ?? throw new WrongUsageException('Clang++ not found, please install it or set CC/CXX to a valid path.'),
+                continue;
-            'BSD' => FreeBSDSystemUtil::findCommand('clang++') ?? throw new WrongUsageException('Clang++ not found, please install it or set CC/CXX to a valid path.'),
+            }
-            default => throw new WrongUsageException('Clang is not supported on ' . PHP_OS_FAMILY . '.'),
+            match (PHP_OS_FAMILY) {
-        };
+                'Linux' => LinuxSystemUtil::findCommand($command) ?? throw new WrongUsageException("{$command} not found, please install it or set {$env} to a valid path."),
+                'Darwin' => MacOSSystemUtil::findCommand($command) ?? throw new WrongUsageException("{$command} not found, please install it or set {$env} to a valid path."),
+                'BSD' => FreeBSDSystemUtil::findCommand($command) ?? throw new WrongUsageException("{$command} not found, please install it or set {$env} to a valid path."),
+                default => throw new \RuntimeException(__CLASS__ . ' is not supported on ' . PHP_OS_FAMILY . '.'),
+            };
+        }
     }
 }

src/SPC/toolchain/GccNativeToolchain.php

@@ -22,12 +22,17 @@ class GccNativeToolchain implements ToolchainInterface
 
     public function afterInit(): void
     {
-        // check gcc exists
+        foreach (['CC', 'CXX', 'AR', 'LD'] as $env) {
-        match (PHP_OS_FAMILY) {
+            $command = getenv($env);
-            'Linux' => LinuxSystemUtil::findCommand('g++') ?? throw new WrongUsageException('g++ not found, please install it or set CC/CXX to a valid path.'),
+            if (!$command || is_file($command)) {
-            'Darwin' => MacOSSystemUtil::findCommand('g++') ?? throw new WrongUsageException('g++ not found, please install it or set CC/CXX to a valid path.'),
+                continue;
-            'BSD' => FreeBSDSystemUtil::findCommand('g++') ?? throw new WrongUsageException('g++ not found, please install it or set CC/CXX to a valid path.'),
+            }
-            default => throw new \RuntimeException('GCC is not supported on ' . PHP_OS_FAMILY . '.'),
+            match (PHP_OS_FAMILY) {
-        };
+                'Linux' => LinuxSystemUtil::findCommand($command) ?? throw new WrongUsageException("{$command} not found, please install it or set {$env} to a valid path."),
+                'Darwin' => MacOSSystemUtil::findCommand($command) ?? throw new WrongUsageException("{$command} not found, please install it or set {$env} to a valid path."),
+                'BSD' => FreeBSDSystemUtil::findCommand($command) ?? throw new WrongUsageException("{$command} not found, please install it or set {$env} to a valid path."),
+                default => throw new \RuntimeException(__CLASS__ . ' is not supported on ' . PHP_OS_FAMILY . '.'),
+            };
+        }
     }
 }

src/SPC/util/SPCConfigUtil.php

@@ -149,6 +149,9 @@ class SPCConfigUtil
                 }
             }
         }
+        if (in_array('imap', $libraries) && SPCTarget::getLibc() === 'glibc') {
+            $short_name[] = '-lcrypt';
+        }
         return implode(' ', $short_name);
     }
 

src/globals/test-extensions.php

@@ -33,7 +33,7 @@ $test_os = [
 ];
 
 // whether enable thread safe
-$zts = true;
+$zts = false;
 
 $no_strip = false;