Merge branch 'main' into libargon2-support

2026-07-04 07:15:38 +08:00 · 2023-12-19 10:05:45 +01:00
parent fbf5c958d0 3573007485
commit e68f1ce3fe
38 changed files with 993 additions and 297 deletions
--- a/src/SPC/builder/BuilderBase.php
+++ b/src/SPC/builder/BuilderBase.php
@@ -69,7 +69,7 @@ abstract class BuilderBase
        foreach ($libraries as $library) {
            // if some libs are not supported (but in config "lib.json", throw exception)
            if (!isset($support_lib_list[$library])) {
-                throw new RuntimeException('library [' . $library . '] is in the lib.json list but not supported to compile, but in the future I will support it!');
+                throw new WrongUsageException('library [' . $library . '] is in the lib.json list but not supported to compile, but in the future I will support it!');
            }
            $lib = new ($support_lib_list[$library])($this);
            $this->addLib($lib);
@@ -259,6 +259,19 @@ abstract class BuilderBase
        throw new RuntimeException('PHP version file format is malformed, please remove it and download again');
    }

+    public function getPHPVersion(): string
+    {
+        if (!file_exists(SOURCE_PATH . '/php-src/main/php_version.h')) {
+            throw new WrongUsageException('PHP source files are not available, you need to download them first');
+        }
+        $file = file_get_contents(SOURCE_PATH . '/php-src/main/php_version.h');
+        if (preg_match('/PHP_VERSION "(.*)"/', $file, $match) !== 0) {
+            return $match[1];
+        }
+
+        throw new RuntimeException('PHP version file format is malformed, please remove it and download again');
+    }
+
    /**
     * Get build type name string to display.
     *
--- a/src/SPC/builder/extension/imagick.php
+++ b/src/SPC/builder/extension/imagick.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;

 use SPC\builder\Extension;
+use SPC\builder\linux\LinuxBuilder;
 use SPC\util\CustomExt;

 #[CustomExt('imagick')]
@@ -14,7 +15,9 @@ class imagick extends Extension
    {
        // imagick may call omp_pause_all which requires -lgomp
        $extra_libs = $this->builder->getOption('extra-libs', '');
-        $extra_libs .= ' -lgomp ';
+        if ($this->builder instanceof LinuxBuilder) {
+            $extra_libs .= ' -lgomp ';
+        }
        $this->builder->setOption('extra-libs', $extra_libs);
        return true;
    }
--- a/src/SPC/builder/extension/imap.php
+++ b/src/SPC/builder/extension/imap.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\exception\WrongUsageException;
+use SPC\util\CustomExt;
+
+#[CustomExt('imap')]
+class imap extends Extension
+{
+    /**
+     * @throws WrongUsageException
+     */
+    public function getUnixConfigureArg(): string
+    {
+        if ($this->builder->getOption('enable-zts')) {
+            throw new WrongUsageException('ext-imap is not thread safe, do not build it with ZTS builds');
+        }
+        $arg = '--with-imap=' . BUILD_ROOT_PATH;
+        if ($this->builder->getLib('openssl') !== null) {
+            $arg .= ' --with-imap-ssl=' . BUILD_ROOT_PATH;
+        }
+        return $arg;
+    }
+}
--- a/src/SPC/builder/extension/mongodb.php
+++ b/src/SPC/builder/extension/mongodb.php
@@ -5,11 +5,20 @@ declare(strict_types=1);
 namespace SPC\builder\extension;

 use SPC\builder\Extension;
+use SPC\store\FileSystem;
 use SPC\util\CustomExt;

 #[CustomExt('mongodb')]
 class mongodb extends Extension
 {
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/mongodb/config.m4', 'if test -z "$PHP_CONFIG"; then', 'if false; then');
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/mongodb/config.m4', 'PHP_MONGODB_PHP_VERSION=`${PHP_CONFIG} --version`', 'PHP_MONGODB_PHP_VERSION=' . $this->builder->getPHPVersion());
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/mongodb/config.m4', 'PHP_MONGODB_PHP_VERSION_ID=`${PHP_CONFIG} --vernum`', 'PHP_MONGODB_PHP_VERSION_ID=' . $this->builder->getPHPVersionID());
+        return true;
+    }
+
    public function getUnixConfigureArg(): string
    {
        $arg = ' --enable-mongodb ';
--- a/src/SPC/builder/extension/opcache.php
+++ b/src/SPC/builder/extension/opcache.php
@@ -5,11 +5,25 @@ declare(strict_types=1);
 namespace SPC\builder\extension;

 use SPC\builder\Extension;
+use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
 use SPC\util\CustomExt;

 #[CustomExt('opcache')]
 class opcache extends Extension
 {
+    /**
+     * @throws WrongUsageException
+     * @throws RuntimeException
+     */
+    public function getUnixConfigureArg(): string
+    {
+        if ($this->builder->getPHPVersionID() < 80000) {
+            throw new WrongUsageException('Statically compiled PHP with Zend Opcache only available for PHP >= 8.0 !');
+        }
+        return '--enable-opcache';
+    }
+
    public function getDistName(): string
    {
        return 'Zend Opcache';
--- a/src/SPC/builder/extension/sodium.php
+++ b/src/SPC/builder/extension/sodium.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('sodium')]
+class sodium extends Extension
+{
+    public function patchBeforeBuildconf(): bool
+    {
+        // bypass error: unknown warning option '-Wno-logical-op' for macOS
+        return $this->removeLineContainingString();
+    }
+
+    private function removeLineContainingString(): bool
+    {
+        $path = SOURCE_PATH . '/php-src/ext/sodium/config.m4';
+        $search = '-Wno-logical-op';
+        if (!file_exists($path)) {
+            return false;
+        }
+        $content = file_get_contents($path);
+        $lines = preg_split('/\r\n|\n/', $content);
+        $filteredLines = array_filter($lines, function ($line) use ($search) {
+            return strpos($line, $search) === false;
+        });
+        $newContent = implode("\n", $filteredLines);
+        file_put_contents($path, $newContent);
+        return true;
+    }
+}
--- a/src/SPC/builder/extension/swoole.php
+++ b/src/SPC/builder/extension/swoole.php
@@ -16,8 +16,9 @@ class swoole extends Extension
        // pgsql hook is buggy for static php
        $arg .= ' --disable-swoole-pgsql';
        $arg .= $this->builder->getLib('openssl') ? ' --enable-openssl' : ' --disable-openssl --without-openssl';
-        $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : '';
-        $arg .= $this->builder->getExt('curl') ? ' --enable-swoole-curl' : ' --disable-swoole-curl';
+        $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : ' --disable-brotli';
+        // swoole curl hook is buggy for php 8.0
+        $arg .= $this->builder->getExt('curl') && $this->builder->getPHPVersionID() >= 80100 ? ' --enable-swoole-curl' : ' --disable-swoole-curl';
        return $arg;
    }
 }
--- a/src/SPC/builder/linux/library/imap.php
+++ b/src/SPC/builder/linux/library/imap.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+
+class imap extends LinuxLibraryBase
+{
+    public const NAME = 'imap';
+
+    /**
+     * @throws FileSystemException
+     */
+    public function patchBeforeBuild(): bool
+    {
+        $cc = getenv('CC') ?: 'gcc';
+        // FileSystem::replaceFileStr($this->source_dir . '/Makefile', '-DMAC_OSX_KLUDGE=1', '');
+        FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', 'CC=cc', "CC={$cc}");
+        /* FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', '-lcrypto -lz', '-lcrypto');
+        FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', '-lcrypto', '-lcrypto -lz');
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/src/osdep/unix/ssl_unix.c',
+            "#include <x509v3.h>\n#include <ssl.h>",
+            "#include <ssl.h>\n#include <x509v3.h>"
+        );
+        // SourcePatcher::patchFile('1006_openssl1.1_autoverify.patch', $this->source_dir);
+        SourcePatcher::patchFile('2014_openssl1.1.1_sni.patch', $this->source_dir); */
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'SSLINCLUDE=/usr/include/openssl', 'SSLINCLUDE=' . BUILD_INCLUDE_PATH);
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'SSLLIB=/usr/lib', 'SSLLIB=' . BUILD_LIB_PATH);
+        return true;
+    }
+
+    /**
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        if ($this->builder->getLib('openssl')) {
+            $ssl_options = 'SPECIALAUTHENTICATORS=ssl SSLTYPE=unix.nopwd SSLINCLUDE=' . BUILD_INCLUDE_PATH . ' SSLLIB=' . BUILD_LIB_PATH;
+        } else {
+            $ssl_options = 'SSLTYPE=none';
+        }
+        shell()->cd($this->source_dir)
+            ->exec('make clean')
+            ->exec('touch ip6')
+            ->exec(
+                "yes | make slx {$ssl_options}"
+            );
+        try {
+            shell()
+                ->exec("cp -rf {$this->source_dir}/c-client/c-client.a " . BUILD_LIB_PATH . '/libc-client.a')
+                ->exec("cp -rf {$this->source_dir}/c-client/*.c " . BUILD_LIB_PATH . '/')
+                ->exec("cp -rf {$this->source_dir}/c-client/*.h " . BUILD_INCLUDE_PATH . '/')
+                ->exec("cp -rf {$this->source_dir}/src/osdep/unix/*.h " . BUILD_INCLUDE_PATH . '/');
+        } catch (\Throwable) {
+            // last command throws an exception, no idea why since it works
+        }
+    }
+}
--- a/src/SPC/builder/linux/library/tidy.php
+++ b/src/SPC/builder/linux/library/tidy.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class tidy extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\tidy;
+
+    public const NAME = 'tidy';
+}
--- a/src/SPC/builder/macos/library/imap.php
+++ b/src/SPC/builder/macos/library/imap.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+use SPC\store\SourcePatcher;
+
+class imap extends MacOSLibraryBase
+{
+    public const NAME = 'imap';
+
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    public function patchBeforeBuild(): bool
+    {
+        $cc = getenv('CC') ?: 'clang';
+        SourcePatcher::patchFile('0001_imap_macos.patch', $this->source_dir);
+        // FileSystem::replaceFileStr($this->source_dir . '/Makefile', '-DMAC_OSX_KLUDGE=1', '');
+        FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', 'CC=cc', "CC={$cc}");
+        /* FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', '-lcrypto -lz', '-lcrypto');
+        FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', '-lcrypto', '-lcrypto -lz');
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/src/osdep/unix/ssl_unix.c',
+            "#include <x509v3.h>\n#include <ssl.h>",
+            "#include <ssl.h>\n#include <x509v3.h>"
+        );
+        // SourcePatcher::patchFile('1006_openssl1.1_autoverify.patch', $this->source_dir);
+        SourcePatcher::patchFile('2014_openssl1.1.1_sni.patch', $this->source_dir); */
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'SSLINCLUDE=/usr/include/openssl', 'SSLINCLUDE=' . BUILD_INCLUDE_PATH);
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'SSLLIB=/usr/lib', 'SSLLIB=' . BUILD_LIB_PATH);
+        return true;
+    }
+
+    /**
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        if ($this->builder->getLib('openssl')) {
+            $ssl_options = 'SPECIALAUTHENTICATORS=ssl SSLTYPE=unix.nopwd SSLINCLUDE=' . BUILD_INCLUDE_PATH . ' SSLLIB=' . BUILD_LIB_PATH;
+        } else {
+            $ssl_options = 'SSLTYPE=none';
+        }
+        shell()->cd($this->source_dir)
+            ->exec('make clean')
+            ->exec('touch ip6')
+            ->exec(
+                "yes | EXTRACFLAGS='-Wimplicit-function-declaration -include $(xcrun --show-sdk-path)/usr/include/poll.h -include $(xcrun --show-sdk-path)/usr/include/time.h -include $(xcrun --show-sdk-path)/usr/include/utime.h' make osx {$ssl_options}"
+            );
+        try {
+            shell()
+                ->exec("cp -rf {$this->source_dir}/c-client/c-client.a " . BUILD_LIB_PATH . '/libc-client.a')
+                ->exec("cp -rf {$this->source_dir}/c-client/*.c " . BUILD_LIB_PATH . '/')
+                ->exec("cp -rf {$this->source_dir}/c-client/*.h " . BUILD_INCLUDE_PATH . '/')
+                ->exec("cp -rf {$this->source_dir}/src/osdep/unix/*.h " . BUILD_INCLUDE_PATH . '/');
+        } catch (\Throwable) {
+            // last command throws an exception, no idea why since it works
+        }
+    }
+}
--- a/src/SPC/builder/macos/library/tidy.php
+++ b/src/SPC/builder/macos/library/tidy.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class tidy extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\tidy;
+
+    public const NAME = 'tidy';
+}
--- a/src/SPC/builder/unix/library/freetype.php
+++ b/src/SPC/builder/unix/library/freetype.php
@@ -26,6 +26,7 @@ trait freetype
        $suggested .= ' ';

        shell()->cd($this->source_dir)
+            ->exec('sh autogen.sh')
            ->exec(
                './configure ' .
                '--enable-static --disable-shared --without-harfbuzz --prefix= ' .
--- a/src/SPC/builder/unix/library/imagemagick.php
+++ b/src/SPC/builder/unix/library/imagemagick.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\unix\library;

 use SPC\builder\linux\library\LinuxLibraryBase;
+use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
@@ -39,8 +40,12 @@ trait imagemagick
        }

        $ldflags = $this instanceof LinuxLibraryBase ? ('LDFLAGS="-static" ') : '';
+
+        // libxml iconv patch
+        $required_libs .= $this instanceof MacOSLibraryBase ? (' -liconv') : '';
        shell()->cd($this->source_dir)
            ->exec(
+                'PKG_CONFIG="$PKG_CONFIG --static" ' .
                $ldflags .
                "LIBS='{$required_libs}' " .
                './configure ' .
--- a/src/SPC/builder/unix/library/ldap.php
+++ b/src/SPC/builder/unix/library/ldap.php
@@ -15,6 +15,8 @@ trait ldap
        $alt .= $this->builder->getLib('gmp') ? '--with-mp=gmp ' : '';
        // libsodium support
        $alt .= $this->builder->getLib('libsodium') ? '--with-argon2=libsodium ' : '';
+        f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
+        f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
        shell()->cd($this->source_dir)
            ->exec(
                $this->builder->makeAutoconfFlags(AUTOCONF_LDFLAGS | AUTOCONF_CPPFLAGS) .
--- a/src/SPC/builder/unix/library/postgresql.php
+++ b/src/SPC/builder/unix/library/postgresql.php
@@ -20,17 +20,22 @@ trait postgresql
    {
        $builddir = BUILD_ROOT_PATH;
        $envs = '';
-        $packages = 'openssl zlib readline libxml-2.0 zlib';
+        $packages = 'zlib openssl readline libxml-2.0';
        $optional_packages = [
            'zstd' => 'libzstd',
-            'ldap' => 'ldap',
-            'libpam' => 'libpam',
+            // 'ldap' => 'ldap',
            'libxslt' => 'libxslt',
            'icu' => 'icu-i18n',
        ];
+
+        f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
+        f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
+
        foreach ($optional_packages as $lib => $pkg) {
            if ($this->getBuilder()->getLib($lib)) {
                $packages .= ' ' . $pkg;
+                $output = shell()->execWithResult("pkg-config --static {$pkg}");
+                logger()->info(var_export($output[1], true));
            }
        }

@@ -59,8 +64,8 @@ trait postgresql
        # 有静态链接配置  参考文件： 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 "293 s/^/#$/"  ../src/Makefile.shlib')
-            ->exec('sed -i.backup "441 s/^/#$/"  ../src/Makefile.shlib');
+            ->exec('sed -i.backup "278 s/^/# /"  ../src/Makefile.shlib')
+            ->exec('sed -i.backup "402 s/^/# /"  ../src/Makefile.shlib');

        // configure
        shell()->cd($this->source_dir . '/build')
@@ -73,25 +78,24 @@ trait postgresql
                '--with-readline ' .
                '--with-libxml ' .
                ($this->builder->getLib('icu') ? '--with-icu ' : '--without-icu ') .
-                ($this->builder->getLib('ldap') ? '--with-ldap ' : '--without-ldap ') .
-                ($this->builder->getLib('libpam') ? '--with-pam ' : '--without-pam ') .
+                '--without-ldap ' .
                ($this->builder->getLib('libxslt') ? '--with-libxslt ' : '--without-libxslt ') .
                ($this->builder->getLib('zstd') ? '--with-zstd ' : '--without-zstd ') .
                '--without-lz4 ' .
                '--without-perl ' .
                '--without-python ' .
+                '--without-pam ' .
                '--without-bonjour ' .
                '--without-tcl '
            );
+        // ($this->builder->getLib('ldap') ? '--with-ldap ' : '--without-ldap ') .

        // build
        shell()->cd($this->source_dir . '/build')
            ->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/backend/port install')
            ->exec($envs . ' make -C src/port install')
-            ->exec($envs . ' make -C src/backend/libpq install')
            ->exec($envs . ' make -C src/interfaces/libpq install');

        // remove dynamic libs
--- a/src/SPC/builder/unix/library/tidy.php
+++ b/src/SPC/builder/unix/library/tidy.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+
+trait tidy
+{
+    /**
+     * @throws RuntimeException
+     * @throws FileSystemException
+     */
+    protected function build(): void
+    {
+        FileSystem::resetDir($this->source_dir . '/build-dir');
+        shell()->cd($this->source_dir . '/build-dir')
+            ->exec(
+                'cmake ' .
+                "{$this->builder->makeCmakeArgs()} " .
+                '-DBUILD_SHARED_LIB=OFF ' .
+                '-DSUPPORT_CONSOLE_APP=OFF ' .
+                '..'
+            )
+            ->exec("cmake --build . -j {$this->builder->concurrency}")
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+        $this->patchPkgconfPrefix(['tidy.pc']);
+    }
+}