Merge branch 'main' into libargon2-support

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= ' .

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 ' .

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) .

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

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']);
+    }
+}