Merge branch 'refs/heads/main' into ext/rdkafka

# Conflicts:
#	config/source.json

src/SPC/builder/macos/library/gettext.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class gettext extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\gettext;
+
+    public const NAME = 'gettext';
+}

src/SPC/builder/macos/library/gmssl.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class gmssl extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\gmssl;
+
+    public const NAME = 'gmssl';
+}

src/SPC/builder/macos/library/icu.php

@@ -4,17 +4,24 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
+use SPC\store\FileSystem;
+
 class icu extends MacOSLibraryBase
 {
+    use \SPC\builder\unix\library\icu;
+
     public const NAME = 'icu';
 
     protected function build(): void
     {
         $root = BUILD_ROOT_PATH;
         shell()->cd($this->source_dir . '/source')
-            ->exec("./runConfigureICU MacOSX --enable-static --disable-shared --prefix={$root}")
+            ->exec("./runConfigureICU MacOSX --enable-static --disable-shared --disable-extras --disable-samples --disable-tests --prefix={$root}")
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")
             ->exec('make install');
+
+        $this->patchPkgconfPrefix(['icu-i18n.pc', 'icu-io.pc', 'icu-uc.pc'], PKGCONF_PATCH_PREFIX);
+        FileSystem::removeDir(BUILD_LIB_PATH . '/icu');
     }
 }

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

@@ -0,0 +1,71 @@
+<?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';
+        }
+        $out = shell()->execWithResult('echo "-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"')[1][0];
+        shell()->cd($this->source_dir)
+            ->exec('make clean')
+            ->exec('touch ip6')
+            ->exec('chmod +x tools/an')
+            ->exec('chmod +x tools/ua')
+            ->exec('chmod +x src/osdep/unix/drivers')
+            ->exec('chmod +x src/osdep/unix/mkauths')
+            ->exec(
+                "yes | make osx {$ssl_options} EXTRACFLAGS='-Wimplicit-function-declaration -Wno-incompatible-function-pointer-types {$out}'"
+            );
+        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
+        }
+    }
+}

src/SPC/builder/macos/library/libargon2.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class libargon2 extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\libargon2;
+
+    public const NAME = 'libargon2';
+}

src/SPC/builder/macos/library/libcares.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class libcares extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\libcares;
+
+    public const NAME = 'libcares';
+}

src/SPC/builder/macos/library/liblz4.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class liblz4 extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\liblz4;
+
+    public const NAME = 'liblz4';
+}

src/SPC/builder/macos/library/libpng.php

@@ -35,7 +35,7 @@ class libpng extends MacOSLibraryBase
      */
     protected function build(): void
     {
-        $optimizations = match ($this->builder->getOption('arch')) {
+        $optimizations = match (php_uname('m')) {
             'x86_64' => '--enable-intel-sse ',
             'arm64' => '--enable-arm-neon ',
             default => '',
@@ -45,7 +45,7 @@ class libpng extends MacOSLibraryBase
             ->exec('chmod +x ./install-sh')
             ->exec(
                 './configure ' .
-                "--host={$this->builder->getOption('gnu-arch')}-apple-darwin " .
+                '--host=' . arch2gnu(php_uname('m')) . '-apple-darwin ' .
                 '--disable-shared ' .
                 '--enable-static ' .
                 '--enable-hardware-optimizations ' .

src/SPC/builder/macos/library/librabbitmq.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class librabbitmq extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\librabbitmq;
+
+    public const NAME = 'librabbitmq';
+}

src/SPC/builder/macos/library/libtiff.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class libtiff extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\libtiff;
+
+    public const NAME = 'libtiff';
+}

src/SPC/builder/macos/library/libuuid.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class libuuid extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\libuuid;
+
+    public const NAME = 'libuuid';
+}

src/SPC/builder/macos/library/libuv.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class libuv extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\libuv;
+
+    public const NAME = 'libuv';
+}

src/SPC/builder/macos/library/libxml2.php

@@ -18,7 +18,7 @@ class libxml2 extends MacOSLibraryBase
      */
     protected function build(): void
     {
-        $enable_zlib = $this->builder->getLib('zlib') ? 'ON' : 'OFF';
+        $enable_zlib = $this->builder->getLib('zlib') ? ('ON -DZLIB_LIBRARY=' . BUILD_LIB_PATH . '/libz.a -DZLIB_INCLUDE_DIR=' . BUILD_INCLUDE_PATH) : 'OFF';
         $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
         $enable_xz = $this->builder->getLib('xz') ? 'ON' : 'OFF';
 
@@ -27,7 +27,10 @@ class libxml2 extends MacOSLibraryBase
             ->exec(
                 'cmake ' .
                 // '--debug-find ' .
-                "{$this->builder->makeCmakeArgs()} " .
+                '-DCMAKE_BUILD_TYPE=Release ' .
+                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
+                '-DCMAKE_INSTALL_LIBDIR=' . BUILD_LIB_PATH . ' ' .
+                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DLIBXML2_WITH_ICONV=ON ' .
                 "-DLIBXML2_WITH_ZLIB={$enable_zlib} " .
@@ -39,6 +42,6 @@ class libxml2 extends MacOSLibraryBase
                 '..'
             )
             ->exec("cmake --build . -j {$this->builder->concurrency}")
-            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+            ->exec('make install');
     }
 }

src/SPC/builder/macos/library/nghttp2.php

@@ -20,51 +20,9 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-
 class nghttp2 extends MacOSLibraryBase
 {
+    use \SPC\builder\unix\library\nghttp2;
+
     public const NAME = 'nghttp2';
-
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     */
-    protected function build(): void
-    {
-        $args = $this->builder->makeAutoconfArgs(static::NAME, [
-            'zlib' => null,
-            'openssl' => null,
-            'libxml2' => null,
-            'libev' => null,
-            'libcares' => null,
-            'libngtcp2' => null,
-            'libnghttp3' => null,
-            'libbpf' => null,
-            'libevent-openssl' => null,
-            'jansson' => null,
-            'jemalloc' => null,
-            'systemd' => null,
-            'cunit' => null,
-        ]);
-
-        [,,$destdir] = SEPARATED_PATH;
-
-        shell()->cd($this->source_dir)
-            ->exec(
-                './configure ' .
-                '--enable-static ' .
-                '--disable-shared ' .
-                "--host={$this->builder->getOption('gnu-arch')}-apple-darwin " .
-                '--enable-lib-only ' .
-                '--with-boost=no ' .
-                $args . ' ' .
-                '--prefix='
-            )
-            ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency}")
-            ->exec("make install DESTDIR={$destdir}");
-        $this->patchPkgconfPrefix(['libnghttp2.pc']);
-    }
 }

src/SPC/builder/macos/library/openssl.php

@@ -23,6 +23,7 @@ namespace SPC\builder\macos\library;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 
 class openssl extends MacOSLibraryBase
 {
@@ -47,6 +48,7 @@ class openssl extends MacOSLibraryBase
         }
 
         shell()->cd($this->source_dir)
+            ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()])
             ->exec(
                 "./Configure no-shared {$extra} " .
                 '--prefix=/ ' . // use prefix=/
@@ -55,8 +57,20 @@ class openssl extends MacOSLibraryBase
                 "darwin64-{$this->builder->getOption('arch')}-cc"
             )
             ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
+            ->execWithEnv("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
             ->exec("make install_sw DESTDIR={$destdir}");
         $this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']);
+        // patch for openssl 3.3.0+
+        if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc'), 'prefix=')) {
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+        }
+        if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc'), 'prefix=')) {
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+        }
+        if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc'), 'prefix=')) {
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+        }
+        FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Libs.private: ${libdir}/libz.a');
+        FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/cmake/OpenSSL/OpenSSLConfig.cmake', '/set\(OPENSSL_LIBCRYPTO_DEPENDENCIES .*\)/m', 'set(OPENSSL_LIBCRYPTO_DEPENDENCIES "${OPENSSL_LIBRARY_DIR}/libz.a")');
     }
 }

src/SPC/builder/macos/library/qdbm.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class qdbm extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\qdbm;
+
+    public const NAME = 'qdbm';
+}

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

src/SPC/builder/macos/library/unixodbc.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class unixodbc extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\unixodbc;
+
+    public const NAME = 'unixodbc';
+}

src/SPC/builder/macos/library/xz.php

@@ -1,20 +1,4 @@
 <?php
-/**
- * Copyright (c) 2022 Yun Dou <dixyes@gmail.com>
- *
- * lwmbs is licensed under Mulan PSL v2. You can use this
- * software according to the terms and conditions of the
- * Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at:
- *
- * http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- *
- * See the Mulan PSL v2 for more details.
- */
 
 declare(strict_types=1);